From nobody Mon Dec 29 01:01:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdGL3tsSz6LQ3C for ; Mon, 29 Dec 2025 01:01: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdGL38Vkz3WW0 for ; Mon, 29 Dec 2025 01:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ZQ4GyMxRuG4p0JV0DGcbSR6P028Wlgp0NA6ht1v8cg=; b=kpZnj510UMpYXeGbeViOw1MjvbassvAu7cfaNTmWd9a/r+Jtx+Hcj/2k1nbef1uFtKD45D r2gzlfhxj8plADZTJuJEiBCi4sNNM7VNZk9R0RqQWHmSeL00Dx6skptXAXUffBNuNmzLZT YivpDrquoA0F7OonpxFBiGpT/qJLC338uH52gEnkI6wHOXDgWoNARQlWlJ+5bSIoHoYhDm adlIR7OO17ErQhrbFJ1p3ExgZMbWK3QFTVmMKgcLuoxIUXkDiID6EXMf73aJdxFbFtiUwi Cn8Xrkpg9qeC631cmNcNZFd7Qa1AiRCG50m5SD4jWtwxslkmRXVZi52RQaa86g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ZQ4GyMxRuG4p0JV0DGcbSR6P028Wlgp0NA6ht1v8cg=; b=WohZ/9QUljCjkUo1PByZpLo1yZSgfx66XcaxZNU0DHOUIuwjqIMcCQwOo5Hwz6iUd3KjAp 3U1x+zg/padN5qqqjA80r7I8Dcxe+6JINibpfs1VewJo/5In3maBsHNa6zZ/nCWqcN7OCn UIblbZd1K5+pFOFLMtH0Qv8wCKBhcR03QHEIg7YafyFnt5VonlyRcGdeRxXAgxpKqUs/Vc Z2+u+DvjJiKG08GG432KANRO4IsV6oIu6NCIIpO17D2M/GmQBUEdToKYPhfAlw1itXB7zS bm6MbvKMCM47KGmR1luIc5sHapW/LeHeHKjI1lPrJZlqlmlmZS1sOC6xJHj63g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970106; a=rsa-sha256; cv=none; b=hbPpfwaUfrP9hzmckyvEoainOn0ZoXaM2mg0tKQjvt4VdeF9BzQas2VSoTLbgGupoKglEx xl+oOA2GXrpzhFf43CF2e8FF8NdiL5tiFFer/8MeIp6R8bT6PO6mCq3Q7Rr+UyC6504k8B 57CFweOBK4Dqml97x+OjJaANjLSB+wk7xoH1zzB+T1TIVOwJssuQVjKfzbnEJ+DIvlAWwJ Iqk7QS8pDObJG/DJW64CKx85EPVzt364G07KWHhcMvNx/hUEl956Bb9TQcKXMua3Ymy21w JosbjlpD09z5msCXSIT/LXsc9MMRSQg5adjDdjN35qPxY5fYBBOA3/pMLiB1ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdGL2fqXz17bf for ; Mon, 29 Dec 2025 01:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:01:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b86fc3284bf8 - stable/15 - sys/netipsec: ensure sah stability during input callback processing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b86fc3284bf8eff23cc2606bf7ab0c8117e6023e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:01:46 +0000 Message-Id: <6951d2fa.379bd.5b3e126@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b86fc3284bf8eff23cc2606bf7ab0c8117e6023e commit b86fc3284bf8eff23cc2606bf7ab0c8117e6023e Author: Konstantin Belousov AuthorDate: 2025-12-09 08:55:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 00:57:03 +0000 sys/netipsec: ensure sah stability during input callback processing (cherry picked from commit 183513d15f2290a42b542753aaffe9de2152575b) --- sys/net/if_ipsec.c | 12 ++++++++++-- sys/netipsec/ipsec.h | 7 +++++-- sys/netipsec/ipsec6.h | 5 ++++- sys/netipsec/ipsec_input.c | 17 +++++++++++++---- sys/netipsec/xform_ah.c | 16 ++++++++++++++-- sys/netipsec/xform_esp.c | 10 ++++++++-- sys/netipsec/xform_ipcomp.c | 16 ++++++++++++++-- 7 files changed, 68 insertions(+), 15 deletions(-) diff --git a/sys/net/if_ipsec.c b/sys/net/if_ipsec.c index df10af66471c..fd4fb37debfa 100644 --- a/sys/net/if_ipsec.c +++ b/sys/net/if_ipsec.c @@ -450,7 +450,8 @@ ipsec_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, } int -ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) +ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af, + struct rm_priotracker *sahtree_tracker) { IPSEC_RLOCK_TRACKER; struct secasindex *saidx; @@ -459,13 +460,16 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) if (sav->state != SADB_SASTATE_MATURE && sav->state != SADB_SASTATE_DYING) { + ipsec_sahtree_runlock(sahtree_tracker); m_freem(m); return (ENETDOWN); } if (sav->sah->saidx.mode != IPSEC_MODE_TUNNEL || - sav->sah->saidx.proto != IPPROTO_ESP) + sav->sah->saidx.proto != IPPROTO_ESP) { + ipsec_sahtree_runlock(sahtree_tracker); return (0); + } IPSEC_RLOCK(); CK_LIST_FOREACH(sc, ipsec_idhash(sav->sah->saidx.reqid), idhash) { @@ -487,6 +491,7 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) } if (sc == NULL) { IPSEC_RUNLOCK(); + ipsec_sahtree_runlock(sahtree_tracker); /* Tunnel was not found. Nothing to do. */ return (0); } @@ -494,6 +499,7 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || (ifp->if_flags & IFF_UP) == 0) { IPSEC_RUNLOCK(); + ipsec_sahtree_runlock(sahtree_tracker); m_freem(m); return (ENETDOWN); } @@ -503,6 +509,8 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) */ m->m_pkthdr.rcvif = ifp; + ipsec_sahtree_runlock(sahtree_tracker); + m_clrprotoflags(m); M_SETFIB(m, ifp->if_fib); BPF_MTAP2(ifp, &af, sizeof(af), m); diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 44e7d9667d5b..b8969e88abbe 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -330,12 +330,14 @@ VNET_DECLARE(int, natt_cksum_policy); struct inpcb; struct ip; struct m_tag; +struct rm_priotracker; struct secasvar; struct sockopt; struct tcphdr; union sockaddr_union; -int ipsec_if_input(struct mbuf *, struct secasvar *, uint32_t); +int ipsec_if_input(struct mbuf *, struct secasvar *, uint32_t, + struct rm_priotracker *); struct ipsecrequest *ipsec_newisr(void); void ipsec_delisr(struct ipsecrequest *); @@ -357,7 +359,8 @@ void ipsec_setspidx_inpcb(struct inpcb *, struct secpolicyindex *, u_int); void ipsec4_setsockaddrs(const struct mbuf *, const struct ip *, union sockaddr_union *, union sockaddr_union *); -int ipsec4_common_input_cb(struct mbuf *, struct secasvar *, int, int); +int ipsec4_common_input_cb(struct mbuf *, struct secasvar *, int, int, + struct rm_priotracker *sahtree_tracker); int ipsec4_check_pmtu(struct ifnet *, struct mbuf *, struct ip *ip1, struct secpolicy *, int); int ipsec4_process_packet(struct ifnet *, struct mbuf *, struct ip *ip1, diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h index a7410733c43f..0747b88059ab 100644 --- a/sys/netipsec/ipsec6.h +++ b/sys/netipsec/ipsec6.h @@ -60,12 +60,15 @@ VNET_DECLARE(int, ip6_ipsec_ecn); #define V_ip6_ipsec_ecn VNET(ip6_ipsec_ecn) struct inpcb; +struct rm_priotracker; + struct secpolicy *ipsec6_checkpolicy(const struct mbuf *, struct inpcb *, int *, int); void ipsec6_setsockaddrs(const struct mbuf *, union sockaddr_union *, union sockaddr_union *); -int ipsec6_common_input_cb(struct mbuf *, struct secasvar *, int, int); +int ipsec6_common_input_cb(struct mbuf *, struct secasvar *, int, int, + struct rm_priotracker *sahtree_tracker); int ipsec6_check_pmtu(struct ifnet *, struct mbuf *, struct secpolicy *, int); int ipsec6_process_packet(struct ifnet *, struct mbuf *, struct secpolicy *, struct inpcb *, u_long); diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 221ac879cb18..34767420086a 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -339,7 +339,7 @@ ipsec4_ctlinput(ipsec_ctlinput_param_t param) */ int ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, - int protoff) + int protoff, struct rm_priotracker *sahtree_tracker) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); struct epoch_tracker et; @@ -492,7 +492,9 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, /* Handle virtual tunneling interfaces */ if (saidx->mode == IPSEC_MODE_TUNNEL) - error = ipsec_if_input(m, sav, af); + error = ipsec_if_input(m, sav, af, sahtree_tracker); + else + ipsec_sahtree_runlock(sahtree_tracker); if (error == 0) { error = netisr_queue_src(isr_prot, (uintptr_t)sav->spi, m); if (error) { @@ -507,6 +509,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, bad: NET_EPOCH_EXIT(et); bad_noepoch: + ipsec_sahtree_runlock(sahtree_tracker); key_freesav(&sav); if (m != NULL) m_freem(m); @@ -590,7 +593,7 @@ extern ipproto_input_t *ip6_protox[]; */ int ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, - int protoff) + int protoff, struct rm_priotracker *sahtree_tracker) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); struct epoch_tracker et; @@ -734,7 +737,9 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, } /* Handle virtual tunneling interfaces */ if (saidx->mode == IPSEC_MODE_TUNNEL) - error = ipsec_if_input(m, sav, af); + error = ipsec_if_input(m, sav, af, sahtree_tracker); + else + ipsec_sahtree_runlock(sahtree_tracker); if (error == 0) { error = netisr_queue_src(isr_prot, (uintptr_t)sav->spi, m); @@ -748,6 +753,9 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, key_freesav(&sav); return (error); } + + ipsec_sahtree_runlock(sahtree_tracker); + /* * See the end of ip6_input for this logic. * IPPROTO_IPV[46] case will be processed just like other ones @@ -787,6 +795,7 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, return (0); bad: NET_EPOCH_EXIT(et); + ipsec_sahtree_runlock(sahtree_tracker); key_freesav(&sav); if (m) m_freem(m); diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 8f08872eb38a..65c67db983d6 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -692,6 +692,7 @@ ah_input_cb(struct cryptop *crp) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); unsigned char calc[AH_ALEN_MAX]; + struct rm_priotracker sahtree_tracker; struct mbuf *m; struct xform_data *xd; struct secasvar *sav; @@ -711,6 +712,14 @@ ah_input_cb(struct cryptop *crp) nxt = xd->nxt; protoff = xd->protoff; cryptoid = xd->cryptoid; + ipsec_sahtree_rlock(&sahtree_tracker); + if (sav->state >= SADB_SASTATE_DEAD) { + /* saidx is freed */ + DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); + AHSTAT_INC(ahs_notdb); + error = ESRCH; + goto bad; + } saidx = &sav->sah->saidx; IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET || saidx->dst.sa.sa_family == AF_INET6, @@ -808,12 +817,14 @@ ah_input_cb(struct cryptop *crp) switch (saidx->dst.sa.sa_family) { #ifdef INET6 case AF_INET6: - error = ipsec6_common_input_cb(m, sav, skip, protoff); + error = ipsec6_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif #ifdef INET case AF_INET: - error = ipsec4_common_input_cb(m, sav, skip, protoff); + error = ipsec4_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif default: @@ -823,6 +834,7 @@ ah_input_cb(struct cryptop *crp) CURVNET_RESTORE(); return error; bad: + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); if (sav) key_freesav(&sav); diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 7aec10549e6c..be8c18da60b3 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -492,6 +492,7 @@ static int esp_input_cb(struct cryptop *crp) { IPSEC_DEBUG_DECLARE(char buf[128]); + struct rm_priotracker sahtree_tracker; uint8_t lastthree[3]; const struct auth_hash *esph; struct mbuf *m; @@ -507,6 +508,7 @@ esp_input_cb(struct cryptop *crp) xd = crp->crp_opaque; CURVNET_SET(xd->vnet); sav = xd->sav; + ipsec_sahtree_rlock(&sahtree_tracker); if (sav->state >= SADB_SASTATE_DEAD) { /* saidx is freed */ DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); @@ -527,6 +529,7 @@ esp_input_cb(struct cryptop *crp) if (ipsec_updateid(sav, &crp->crp_session, &cryptoid) != 0) crypto_freesession(cryptoid); xd->cryptoid = crp->crp_session; + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); return (crypto_dispatch(crp)); } @@ -658,12 +661,14 @@ esp_input_cb(struct cryptop *crp) switch (saidx->dst.sa.sa_family) { #ifdef INET6 case AF_INET6: - error = ipsec6_common_input_cb(m, sav, skip, protoff); + error = ipsec6_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif #ifdef INET case AF_INET: - error = ipsec4_common_input_cb(m, sav, skip, protoff); + error = ipsec4_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif default: @@ -673,6 +678,7 @@ esp_input_cb(struct cryptop *crp) CURVNET_RESTORE(); return error; bad: + ipsec_sahtree_runlock(&sahtree_tracker); if (sav != NULL) key_freesav(&sav); if (m != NULL) diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index 737d4a50098a..778cd955310a 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -283,6 +283,7 @@ static int ipcomp_input_cb(struct cryptop *crp) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); + struct rm_priotracker sahtree_tracker; struct xform_data *xd; struct mbuf *m; struct secasvar *sav; @@ -300,6 +301,14 @@ ipcomp_input_cb(struct cryptop *crp) skip = xd->skip; protoff = xd->protoff; cryptoid = xd->cryptoid; + ipsec_sahtree_rlock(&sahtree_tracker); + if (sav->state >= SADB_SASTATE_DEAD) { + /* saidx is freed */ + DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); + IPCOMPSTAT_INC(ipcomps_notdb); + error = ESRCH; + goto bad; + } saidx = &sav->sah->saidx; IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET || saidx->dst.sa.sa_family == AF_INET6, @@ -365,12 +374,14 @@ ipcomp_input_cb(struct cryptop *crp) switch (saidx->dst.sa.sa_family) { #ifdef INET6 case AF_INET6: - error = ipsec6_common_input_cb(m, sav, skip, protoff); + error = ipsec6_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif #ifdef INET case AF_INET: - error = ipsec4_common_input_cb(m, sav, skip, protoff); + error = ipsec4_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif default: @@ -380,6 +391,7 @@ ipcomp_input_cb(struct cryptop *crp) CURVNET_RESTORE(); return error; bad: + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); if (sav != NULL) key_freesav(&sav); From nobody Mon Dec 29 01:16:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbN380kz6LR1h for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbN2Dqsz3Xcj for ; Mon, 29 Dec 2025 01:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TYOk0XilNFzNgCrEYYi13y/HDJWNxZg4ytQfuTeo35w=; b=fJlO/3m2mqdww3eMo1+0a3i3StQN+/DYk8wcnFLHqZyuC0Y4tj+I5CIY3M9skqt5XU1br8 AN3yB+vKlcjLHMapYq83qflzYzQTkJ9N9l03KxxM5zEg1e85CzwUaE3FEy6Z0afSttwNBr 2b5Sg20Her3mabS0gGtQXxGhTP247UbG3dDHJO3bTxQXbBSrqHxPKi0+AyCNh9R2eJxvij EvlGGmPgzHfieQEA0gsbWgKoQEuCQpRMeGzfCJeq/VjxlGORbn+2wznuogvz3c8Fsd2icC YawLvjeLq8zSv0K9ZF7WClBtWdHtzKadXYKeii4af4W6gdsW4vI5UcStMlfO8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TYOk0XilNFzNgCrEYYi13y/HDJWNxZg4ytQfuTeo35w=; b=h5gZSh9bDOGCGyeEi9lX9Mu5LOxv170NL12pFQEaAQIElJSfdqKfnkFQYQ+mCg7D797qDQ mLgxNMbbtsz1D6embRLTsH3fvlmXsp+tyD1T1wnf428Igb4kS3UpiGbjuzImuA9ATNrTI4 7QxLP7QWOxZEidQHDmPdaQFBEiP4ZF6lcSsz8cmqcz/0ERm6J+04GnIAnljqcYoFfhNZfy MvEFoHGmsCtolfEd0deYqoeXJEJLj6zf9ouAbDEOpaYVfhMFPT0lHmN86y462AYYzF2c5+ JT/RM93cEEjuNj4I5nxPC+JZia29rf50qMLQeZK0rdXaF6cg9fii9df/2U3Yfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970992; a=rsa-sha256; cv=none; b=lHiEWGCL8GsZVbLTv7IoDdh4RPRrdveB3nxmd21Pf8NaaKeae3yOY9uUsENu7a/9IuWfZs +pA5tFolaukSI1LrAaw55l3ThMZ33NAu3NXfMFUkMYXPzQGm7yZIEcnWVdGSa138jblUk+ /dVOoVoMO1DoznsRTFJl4H2QXHYZhRZ/EawzXp1cNG4xFxNKXvZyiy+Fco4wQ8iKQKF3kJ a/BXSM/rIeESHObXUXqYPDPI0f0ChKvOr9tUZWWHzYs0rPuXNeQ4H8NCfWzfoXa1h+wEon EdSJJWhAtvQmK21ZVHPH+SkG4hEAuxawlzm3K70lp9O4QZRWVFdIhObxCk0kKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbN1Y2Tz186Z for ; Mon, 29 Dec 2025 01:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 37ddbbe5535c - main - libc/gen/err.c: remove 'extended error' herald from extended error output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ddbbe5535cb6c27b8a026b2f28d64319b9f802 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:32 +0000 Message-Id: <6951d670.38b28.6154193b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=37ddbbe5535cb6c27b8a026b2f28d64319b9f802 commit 37ddbbe5535cb6c27b8a026b2f28d64319b9f802 Author: Konstantin Belousov AuthorDate: 2025-12-27 13:53:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 libc/gen/err.c: remove 'extended error' herald from extended error output Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/err.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index 16cbe27693e7..793bf7522e42 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -120,7 +120,7 @@ vexterr(bool doexterr, int code, const char *fmt, va_list ap) } fprintf(err_file, "%s", strerror(code)); if (doexterr && extstatus == 0 && exterr[0] != '\0') - fprintf(err_file, " (extended error %s)", exterr); + fprintf(err_file, " (%s)", exterr); fprintf(err_file, "\n"); } From nobody Mon Dec 29 01:16:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbP6QhZz6LR75 for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbP27mDz3XZK for ; Mon, 29 Dec 2025 01:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaS1OtD0VCRSvFC8FTf8WgTS1mlcdHs8lHq8n4GEK/Q=; b=KivcPHcNEN32jZ1p5ydXEsDKq7ZjA5MKgGteCz6OHO2qX2hZtrMdh2KZRg+wxTTJW+Iivq JyoVC7aNixJsa6ZRLyr5VxsUGvq9n2VMncarHtQGJsr7yOo87t1GX0YT2VvaPEHGpl6zs8 DMe7abD7rmNX4x9o22hpic7l8MH6YKkRdEGQ1RqrESCSgDmSqAtVBXJgLUDr6iP069Z1K+ 5uk9AGZCTg22gwgEPThAi07P90CN0I7Lj4+6jDOZcazzd6vm7vIuWfCL6WWTtWXrDV10u1 VUnz02D60U5qZKAV0SsHkkla/P4vBV8Dt3zBbfAh5fdwK4nUG3F6xDYWFSsDEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaS1OtD0VCRSvFC8FTf8WgTS1mlcdHs8lHq8n4GEK/Q=; b=P0bGzh+AHYuhGgFtpYPDmwDuOd+3Q7CilaqECqlcH+vWJVpHGc3x9eaNtw9V1C6Z100Dm4 oDNsSGbUB/ercYjJU3EtEnnqPESOiDgo0I9SCppCqh0S09MpV0hvjcJ9PDBCPjNbEeWi5k kZuQs+J4a+D1tycWm2uiTpbZnlqyvMnpneX8TurSjvuoLVJzbJZFJMdaaXPlQ0kjDK8RmL QrTcUKnZ2A+2bWy67us2F00tuiIyXPqaOdvPKfyM4poUWGpBOodFpJ4dI06tfzluvtxwMR nMrWrPnUdTeX32UbPVNqJSClh0g9NZNSELn3ZV8QozoDe0Y8KfYOrLT4XgcoOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970993; a=rsa-sha256; cv=none; b=Kf/XYpq2KIhm1njBoTSu++0K8i9JSNPCDg54pczqXZcW+9LqkPPcXNCpQqSZRhLU0eP37U nulehN1XD6T1AZrpWRNhWZmfME+V3Gc/hhhMqHP2QzXkk1nmHjt7uU162BTyV+3mw/xeWh lxCozVaL5S01aJaOle8ONSLRLpz1Kq79QZeI/S0q8gVA/FKuiGL17AyRD8UrP2Br+DO0aF rcUReDSY0Ivmzkoebjltgfvzs8aunRaBawIBEhTVaq/qDWaQGmqrL7ahsKf2so4+d6mVVW OLotssSY/BMLVrpga8XUvXxk1ykjP4zoJ3aD3NGs7Dn2BuV4ECcT9jCPoT2cnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbP1ch8z17Th for ; Mon, 29 Dec 2025 01:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 378b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8bff95f3ce03 - main - exterror: add support for the format specifiers in the extended error msg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bff95f3ce0396ff40b4f7d943ea856ac3f846c3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:33 +0000 Message-Id: <6951d671.378b7.63c3b626@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8bff95f3ce0396ff40b4f7d943ea856ac3f846c3 commit 8bff95f3ce0396ff40b4f7d943ea856ac3f846c3 Author: Konstantin Belousov AuthorDate: 2025-12-27 13:54:42 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror: add support for the format specifiers in the extended error msg Note that we trust kernel code to only request the printout of integer types, and use the 'j' modifier always. Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index e8ddfbd578e3..68cd2abfe312 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -29,7 +29,8 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) ue->error, ue->cat, ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); } else { - strlcpy(buf, ue->msg, bufsz); + snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, + (uintmax_t)ue->p2); } return (0); } From nobody Mon Dec 29 01:16:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbQ421Zz6LQgB for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbQ2yyRz3XTp for ; Mon, 29 Dec 2025 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfnGfCh9uf0m3WfYZbulu/FGAH/VlYVYdz3JWPDHKL4=; b=T7PPWFV2uyEYGtJxwkI2xLxcFQUQXYC9dASl6LMHWhfK4c6AP+CHh9iUTuqpsU880SG3WT iPFukaCwChX+Xmo8DWH1sW6Ts7Fy31zu3AkNkLnFhwofycdida3mKmT36ZSlKK35flyHLN 6uzo6TCULE1ipi0j/ceY8749XrrCYWFBNuOQWaeTw34Mj3rP//MtJmbvlnc5XpRCdl+p64 YjybfU0STVd4cj/qw4LRX/HyCcM1AFc9g48Xfgh84nt59wR1E1z/aSEtUX5ejPiJh/7pfP jao0JReit9UKJ9bxwZlgmaVqJT5ajI+VVEn/6OXYy/WxxTLc5MuZAqHAH8blCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfnGfCh9uf0m3WfYZbulu/FGAH/VlYVYdz3JWPDHKL4=; b=Q3KYnvevO+gqUgrDZ9kL8cudrNoR/r94KYARP2ez4fzvFBDYAbQoxq8Hwas82o1GQx20Lr gUh55kp1DiMppu7yxQTxTVN9m1zu5yc/Pk/BEwUtJ70XZCiuYpgN5WJxnG3/YHBle7oXgm H5s9gwrB2zvKTa/81UePBHpCaufDvHQ0yyD29mLpVGHgQcm5mj7sDP2pnzC9QYw9oTfhVU Oc6M0pjyD6SFbW23bYxjP//f3Lb/P3Ex/DmfE3Gw8vXvkQJmg2N/usJ68PJP/ehONyfYel pvecO+nUzoDLuA5BhcGO/auqCVJJvd/FQ+xNmhZL/+e2XHLE/gMXuIki0KI/QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970994; a=rsa-sha256; cv=none; b=CXy2Lz0a4HWX9KEvN7qrJUQ0Y9XGKTECGl0MKLMw4kjRZChPeqhX7jdJZgvwVw4jZ8vVRU ltC2TnhSfPYWxTkh5T3yRV3HjTV3MdejrwTy1DLUPsJabFKQuY6/jac/5JFCKtszEryXSl mdtXfU9sAY4W1P0TMKPLXy1114ipEhg5ItOzvkMA7bf9OxO3p3kG6JXaexzTik3UrDm+xY v6CcFZtrXLM9J1xgAAbLgzX+5CtJwWmh3K8Dv1ShzNn9jxCs1WPiQlazwjjxPToIhQfHsA noYtcDJMTxQ6mztlWFEvXvOBQysjtrHtQdifnjwpGwO6kmCksI+QGHxtstk17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbQ2BPGz18Bw for ; Mon, 29 Dec 2025 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 387a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 42210fe8dcd4 - main - exterror: Add EXTERROR_VERBOSE env variable to control 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 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: 42210fe8dcd4684a45e0e4db1b8194e291dc8fda Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:34 +0000 Message-Id: <6951d672.387a6.60c78188@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42210fe8dcd4684a45e0e4db1b8194e291dc8fda commit 42210fe8dcd4684a45e0e4db1b8194e291dc8fda Author: Konstantin Belousov AuthorDate: 2025-12-28 00:23:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror: Add EXTERROR_VERBOSE env variable to control verbosity If the variable is set and the process is not suid, __uexterr_format(), used by err(3), prints errno/category/source line/pX always, not only when there is no kernel message provided. Requested by: mckusick Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 53 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 68cd2abfe312..3321fd80616d 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -11,26 +11,69 @@ #include #include #include +#include #include +#include #include +#include + +static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; +enum exterr_verbose_state { + EXTERR_VERBOSE_UNKNOWN = 100, + EXTERR_VERBOSE_DEFAULT, + EXTERR_VERBOSE_ALLOW, +}; +static enum exterr_verbose_state exterror_verbose = EXTERR_VERBOSE_UNKNOWN; + +static void +exterr_verbose_init(void) +{ + /* + * No need to care about thread-safety, the result is + * idempotent. + */ + if (exterror_verbose != EXTERR_VERBOSE_UNKNOWN) + return; + if (issetugid()) { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } else if (getenv(exterror_verbose_name) != NULL) { + exterror_verbose = EXTERR_VERBOSE_ALLOW; + } else { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } +} int __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) { + bool has_msg; + if (bufsz > UEXTERROR_MAXLEN) bufsz = UEXTERROR_MAXLEN; if (ue->error == 0) { strlcpy(buf, "", bufsz); return (0); } - if (ue->msg[0] == '\0') { - snprintf(buf, bufsz, + exterr_verbose_init(); + has_msg = ue->msg[0] != '\0'; + + if (has_msg) { + snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, + (uintmax_t)ue->p2); + } else { + strlcpy(buf, "", bufsz); + } + + if (exterror_verbose == EXTERR_VERBOSE_ALLOW || !has_msg) { + char lbuf[128]; + + snprintf(lbuf, sizeof(lbuf), "errno %d category %u (src line %u) p1 %#jx p2 %#jx", ue->error, ue->cat, ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); - } else { - snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, - (uintmax_t)ue->p2); + if (has_msg) + strlcat(buf, " ", bufsz); + strlcat(buf, lbuf, bufsz); } return (0); } From nobody Mon Dec 29 01:16:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbS4LHHz6LR5t for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbR4fgzz3Xd9 for ; Mon, 29 Dec 2025 01:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLa5ji8Q32Yapk59wA8X+sPsg5Vie9XDAyiBQ4n+V4A=; b=BXD7LBc0RAwA3WBMlnDI9QFqsBFVw8ug+HiYKz2r0146rnP9LyX58D3592Qu7Fel5d0/xA yu9UGQrq70QL2FAtjQSPAmgO3ntNkF9hilmdiz6VGRMoXZ9NtJHMSrRuhK4WaKRulGEi37 JoIoPrfSsuhEX7m0Ed59y/zr4gOs7CbIks0KTMuXSOG1RvW1SkRHH6y3cHBvd5qoMLNUG5 1CmMf8hy/hDm7h2GqEEDw0k6LiA7CBT4fBxIKCOj3VvcueWY/e1a0WraJEg9hN79um2oqt iGZcG2emC7BCgpCjK7oWykmGkt/pjglTmUDv2kZG9uokgX3IkWjzb23TtTnYpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLa5ji8Q32Yapk59wA8X+sPsg5Vie9XDAyiBQ4n+V4A=; b=TTQY3eVEYmQqQZo55/b3TI6jBcHgo4Jf7gX8nIRQrmdcOnBrUzg77PMZANyN0gAOZIuZN6 JA42VFUlB30WuJIMAzU2kz34Jemns9bLMcJ7+RAvvDSQNI62JJuObSpKns+/rsbi5lFNvj a0nvY3sglett/rxLQ6amtetHPHdXgXQDKpQdZxnJ+Mk5mD/dkpwpT69FTisinbZjt29UU7 bgr+C3GzydcvhDf8SI27N4o32KFsSUo/Ddn1qFqptMjWQs8+aHUdXR523BW2zpUPFrfik1 0reMPd3DG5o4je4n9ybhv1b4Myvcx05TyqOD/L9zd0dreu+kkgdDFhcdhhyNcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970995; a=rsa-sha256; cv=none; b=xcygwH+WwZbsQR7KLu6pnrwaY2ikj/X7RVv5LGVIefnpY54LTXwBj6REodnCohxvji6wP8 s5j24z3oZ5FhhK+YWQxjnbhA4Va0ESNuuMaZYZnPDl7oBYY+jgsQ1H/85vFiGtMbE6iT4N D4NXWrQyZOM2FSiXbMyLzXKy9fuhGE8fUwj1kaNpVwyOm8Rlq0kIigKaC3VcqRv3socobz bu2+W64iVQlhGum1rKcMoxgaYlxay37nWf6mmZARBO6G7UxPmV++6mQ4wxXdfWFQl1Qey0 AqTW59NwnDvJ7cNkI5pGNnMBNT91asigNHoLVS5/my5KcLG2JBryyXmjz2ueKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbR32Csz186c for ; Mon, 29 Dec 2025 01:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3909a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2904edaf2f09 - main - vm/vm_mmap.c: inline erronous argument values for extended errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2904edaf2f09934142f9f6a6d2886879395145cc Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:35 +0000 Message-Id: <6951d673.3909a.5747197e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2904edaf2f09934142f9f6a6d2886879395145cc commit 2904edaf2f09934142f9f6a6d2886879395145cc Author: Konstantin Belousov AuthorDate: 2025-12-27 13:56:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 vm/vm_mmap.c: inline erronous argument values for extended errors Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- sys/vm/vm_mmap.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 501ace32bd11..234586893b59 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -197,12 +197,14 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) check_fp_fn = mrp->mr_check_fp_fn; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) { - return (EXTERROR(EINVAL, "unknown PROT bits")); + return (EXTERROR(EINVAL, "unknown PROT bits %#jx", prot)); } max_prot = PROT_MAX_EXTRACT(prot); prot = PROT_EXTRACT(prot); if (max_prot != 0 && (max_prot & prot) != prot) { - return (EXTERROR(ENOTSUP, "prot is not subset of max_prot")); + return (EXTERROR(ENOTSUP, + "prot %#jx is not subset of max_prot %#jx", + prot, max_prot)); } p = td->td_proc; @@ -236,7 +238,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if ((len == 0 && p->p_osrel >= P_OSREL_MAP_ANON) || ((flags & MAP_ANON) != 0 && (fd != -1 || pos != 0))) { return (EXTERROR(EINVAL, - "offset not zero/fd not -1 for MAP_ANON", + "offset %#jd not zero/fd %#jd not -1 for MAP_ANON", fd, pos)); } } else { @@ -247,8 +249,8 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (flags & MAP_STACK) { if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) { - return (EXTERROR(EINVAL, "MAP_STACK with prot < rw", - prot)); + return (EXTERROR(EINVAL, + "MAP_STACK with prot %#jx < rw", prot)); } flags |= MAP_ANON; pos = 0; @@ -257,18 +259,21 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ | MAP_GUARD | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0) { - return (EXTERROR(EINVAL, "reserved flag set")); + return (EXTERROR(EINVAL, "reserved flag set (flags %#jx)", + flags)); } if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) { - return (EXTERROR(EINVAL, "EXCL without FIXED")); + return (EXTERROR(EINVAL, "EXCL without FIXED (flags %#jx)", + flags)); } if ((flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) { - return (EXTERROR(EINVAL, "both SHARED and PRIVATE set")); + return (EXTERROR(EINVAL, + "both SHARED and PRIVATE set (flags %#jx)", flags)); } if (prot != PROT_NONE && (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) { - return (EXTERROR(EINVAL, "invalid prot", prot)); + return (EXTERROR(EINVAL, "invalid prot %#jx", prot)); } if ((flags & MAP_GUARD) != 0 && (prot != PROT_NONE || fd != -1 || pos != 0 || (flags & ~(MAP_FIXED | MAP_GUARD | MAP_EXCL | @@ -295,7 +300,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (align != 0 && align != MAP_ALIGNED_SUPER && (align >> MAP_ALIGNMENT_SHIFT >= sizeof(void *) * NBBY || align >> MAP_ALIGNMENT_SHIFT < PAGE_SHIFT)) { - return (EXTERROR(EINVAL, "bad alignment", align)); + return (EXTERROR(EINVAL, "bad alignment %#jx", align)); } /* @@ -310,8 +315,8 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) */ addr -= pageoff; if ((addr & PAGE_MASK) != 0) { - return (EXTERROR(EINVAL, "fixed mapping not aligned", - addr)); + return (EXTERROR(EINVAL, + "fixed mapping at %#jx not aligned", addr)); } /* Address range must be all in user VM space. */ @@ -321,7 +326,8 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) } if (flags & MAP_32BIT && addr + size > MAP_32BIT_MAX_ADDR) { return (EXTERROR(EINVAL, - "fixed 32bit mapping does not fit into 4G")); + "fixed 32bit mapping of [%#jx %#jx] does not fit into 4G", + addr, addr + size)); } } else if (flags & MAP_32BIT) { /* @@ -1495,7 +1501,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, handle, &foff, &object, &writecounted); break; default: - error = EXTERROR(EINVAL, "unsupported backing obj type", + error = EXTERROR(EINVAL, "unsupported backing obj type %jd", handle_type); break; } @@ -1578,7 +1584,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, * exec). */ if ((foff & PAGE_MASK) != 0) { - return (EXTERROR(EINVAL, "offset not page-aligned", foff)); + return (EXTERROR(EINVAL, "offset %#jx not page-aligned", foff)); } if ((flags & MAP_FIXED) == 0) { @@ -1587,7 +1593,8 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, } else { if (*addr != trunc_page(*addr)) { return (EXTERROR(EINVAL, - "non-fixed mapping address not aligned", *addr)); + "non-fixed mapping address %#jx not aligned", + *addr)); } fitit = false; } @@ -1599,7 +1606,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, } if (foff != 0) { return (EXTERROR(EINVAL, - "anon mapping with non-zero offset")); + "anon mapping with non-zero offset %#jx", foff)); } docow = 0; } else if (flags & MAP_PREFAULT_READ) @@ -1702,6 +1709,6 @@ vm_mmap_to_errno(int rv) } if ((curthread->td_pflags2 & (TDP2_UEXTERR | TDP2_EXTERR)) == TDP2_UEXTERR) - EXTERROR(error, "mach error", rv); + EXTERROR(error, "mach error %jd", rv); return (error); } From nobody Mon Dec 29 01:16:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbV0nTLz6LR9X for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbT56bTz3XQ7 for ; Mon, 29 Dec 2025 01:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2DbiyI3fCau2vCAvx1aoX3ai4mG0hsOUVHU1O2KG/c=; b=bRnZ3b9d0miTvKipFJQVv8q8QxRj+hmvc2PZ38AqHHTEt2jcR1t9G4S6XElx6IGLcqqvX8 o+c9JARLhQ/+SiOlnbzQlMIj+uAuVEPC3BgLmEXIyjPngAoaXfKrEyR4LAWk9qORbxtMDg AjP6QLSZu7peehmIHXaQCi3Gt9rXZ3usGppY+JouqPTMAzUjHKpvU5WDFv+W53t34aMFhf xwLUfRKryIvTaHNFqHYG8PTdgC/Y4V5E9L537USNRi+Cw28x7Tl+0oKMDDnHaujaNMAtjQ BWWgVUMpe1iw4TQ+qq+T+78Eh4HRD6wcjUtiK1oJUZPOrIb4etThfRVgDvCAFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2DbiyI3fCau2vCAvx1aoX3ai4mG0hsOUVHU1O2KG/c=; b=J76iDCMevwkgsG3LI5uYnwcT0dQbz3TnNBD9VMoISxNhS4MVaOFSp+m434Q7bZ010m48KR Kh1aesUiy2H4IfTpJMbYlHykzr4xFrkJ39Fq/83Krlho/YEvwoZ2wT43v1DiltTVq8IHqB kNdZqmr22yrYEdYCerp5StmeZhk3j/HuoAmf4m5wTadAni49ORKZMfBHAn1h04o5PLJJ5o 3SYy+bRZjlefCbqsYCqVYqyA68EGcFK5GXlGlq5QpRpRPBnHwDn7ZaQJ07ahmnCabpERRT 90ywBf2ddhijDdoIsJnXUKc+E1Me0Mmm9VoXD+x9E8jcVnf86yEQJi+sP6+how== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970997; a=rsa-sha256; cv=none; b=xekbt4aw9nmBXZi99Q+6H+S7eG2iocmau74FU/+DwN+hqvRokDV+DHbsscXNUHnnL+MiPk uek8qkosOj4jF4fYuFN5aaX15PzGehUmQPsFuGP/LDbb3tvJ8AFgHI5t7CcavZfCAmOF6E KwUwsy/v1W7FrwKY/5+BNiM/EcpfaDE0i4ZDExdXDqcDUOe2XnaJSQ+QnoPd8jP/QfCYVc WkwbwZhAA7ewINo7zX17r4iaOLdNes6rTLsB78eohcOK6MeO5t4liTY0X+ZBMB+Wgb0uzE 8tnYrlXxrvDhrmcmws7qAe0gX9H6BsYOG6YLrYgSUQMSwz5ZIExulIDumjoh+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbT4clBz17b8 for ; Mon, 29 Dec 2025 01:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3907d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 543c86636f73 - main - exterr_test: loosen the error string pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 543c86636f73119fa1dab860f07396df5a1884d4 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:37 +0000 Message-Id: <6951d675.3907d.543bab2f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=543c86636f73119fa1dab860f07396df5a1884d4 commit 543c86636f73119fa1dab860f07396df5a1884d4 Author: Konstantin Belousov AuthorDate: 2025-12-28 03:35:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterr_test: loosen the error string pattern After addition of the prot and max_prot values, the old error substring no longer satisfy the check. Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- tests/sys/kern/exterr_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/exterr_test.c b/tests/sys/kern/exterr_test.c index 17c84c1f8ed4..b4746a485f58 100644 --- a/tests/sys/kern/exterr_test.c +++ b/tests/sys/kern/exterr_test.c @@ -51,7 +51,7 @@ ATF_TC_BODY(gettext_extended, tc) ATF_CHECK_EQ(0, r); printf("Extended error: %s\n", exterr); /* Note: error string may need to be updated due to kernel changes */ - ATF_CHECK(strstr(exterr, "prot is not subset of max_prot") != 0); + ATF_CHECK(strstr(exterr, " is not subset of ") != 0); } ATF_TC(gettext_noextended); From nobody Mon Dec 29 01:16:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbT1ylbz6LR9W for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbS4SlSz3XgQ for ; Mon, 29 Dec 2025 01:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y9/Pfbs75E8hhyMbYMRqC1z1Ppik2tyC3ZXtssXu4gU=; b=HB+gv2F9+zjS/zdedpgDNVidcURRpECcr8TISJRppkuvtuCokXHngNtjKPY+ymX5WsIYPQ c8fVbnb1NaPd4o2ce6sPfhNS0DmULAZYgY4MeGwIydg7wD+Rgc5+4UdxQ5GSnuuoJIulfE +BPalErgffWgCn3mrw8XqW2++RB2J1Ad2iKPzY+VzC22w8cs+dez7qKm4DMLwM0uwWXIaQ 48Moi4PUiVBYv44wkQG0E0ocJdZvxWxGum+D9m9etawYHydBM2TLt8nd7iYEWXFUiQtSli s8psw5ztslupQhs2MP3rZXJd3hWEq9Lp6Mtxl1HQja4asjd14/6MGA1pnC0cTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y9/Pfbs75E8hhyMbYMRqC1z1Ppik2tyC3ZXtssXu4gU=; b=PCGyaLu5a8Isa1/MOr1iGqQU+h3kO3gwr5xSuPJMmT560DmPiCrVfXFglJtb60VZj5Zqwg vxT8ruGQx3oVRu/rFSnbhETmy2YRFev7Dk7pR5bArwqqIo3IHomR8v0f7Yq4v44pCWunKG FOWnC8axFLYUmc6fHJzD5nU1WllZbl/HWh9lA+anEBMpYsk0KFlt3+RDdQadeYKy8z3vdt GgI2dQZGqyxghg408uLIOnFOrV+uRwwrSk5tWSvdKZ/T3MiBv30850Vf9bos9hTqoKM0A8 MqIN6KgReBxg49gBVmSdo+vAC3aGOpIg/02LIYI6mXs3Wukgmo+f/MYxEQC2/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970996; a=rsa-sha256; cv=none; b=gEB/+jTa2a2ySfQ1e7iyrDzY1i/ydl+mp8/cVoeMgWtyYf2sKn7EJ4gBjSqwQGPvlBu8vP pkOi5EZWdi57oCJ06njQE653qZ2TCnTa0UeC3Xqi9qn6TJqNxfZp46LGpMEvLkS6xUZE8q jZb7UWtXEz8VapSIjwvMXxHcZE2WU4Ll2W1T5OkNc4TnF/OGfCXAkIa0YliA7v16eVdQE2 XwvnwVZmNl8BbszjnpM1LiabXIwdE0XrXqkaGUBAKmMJf3a4HyTR78t7BTkqGhoV03sZI3 diQznyrhwTAp4oUQU1TJWR8NlOUyjqByPbokhRuO9w7Kv2pt/zQVsrFLgLnwPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbS3qn7z186d for ; Mon, 29 Dec 2025 01:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 14bd57d0a78d - main - exterror.9: describe formatting of optional arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14bd57d0a78dcd98449597fd3e19749799e36935 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:36 +0000 Message-Id: <6951d674.395d1.337d55f3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=14bd57d0a78dcd98449597fd3e19749799e36935 commit 14bd57d0a78dcd98449597fd3e19749799e36935 Author: Konstantin Belousov AuthorDate: 2025-12-27 16:21:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror.9: describe formatting of optional arguments Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- share/man/man9/exterror.9 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 index fd4b732b8213..a7c7a11d1315 100644 --- a/share/man/man9/exterror.9 +++ b/share/man/man9/exterror.9 @@ -90,6 +90,16 @@ The .Fn EXTERROR macro can take two optional 64-bit integer arguments, whose meaning is specific to the subsystem. +The format string may include up to two printf-like format +specifiers to insert the optional argument values in the +user output, which is done in userspace. +.Pp +The format specifier must be for an integer type, and include the +.Dq j +format modifier to accept only the types +.Vt intmax_t +or +.Vt uintmax_t . .El .Pp The strings passed as the second argument are only retained From nobody Mon Dec 29 01:16:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbW3Dmfz6LRD6 for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbV5yPtz3XbJ for ; Mon, 29 Dec 2025 01:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4nwxAC/tMVvXEAcl8v6ssJM2b8AM5i08qL67gRvNcGs=; b=ySgfiJF51T+uVrHluIJpRUSZxWuCrNHf7KowmCs0gKkOZIuESjx692ZqhqNxTdAYRUKpfQ i3IebkBDyOPIbL67bduTQiPR5zJ7Qlwtotn0t5SEAr+IoOCocyWd7mvkd1SyBHCP8uR4lB B64wRLlI9ks8mCwygyTo1mZOHsIfzv4YhWnpVhCnmNcQ5nf0lKL1DAYHS9VSk3RwqJ5Cw5 lCsjJzxq8YDe5VHRff58JHvlGMRRRL7DL1cCC1gqEjFvBZ7XfuTkbtPQCZ42jPt+W54MsP Dsn0e6X5mz5xKFNaqIUTstiWds4YAiMo463q54geoWOAgM5Xnc5NwnergnsZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4nwxAC/tMVvXEAcl8v6ssJM2b8AM5i08qL67gRvNcGs=; b=E5e1CvTJzdzAL6UZLzZ0BqA9loI2LwP17dE0dIARU7uGGLDN4rxb7gA3rT+qAfrTH8BNmv 2q4Xi0EwaZ5Z9LFSJH2jr2fpVPvCtMI9JJ/rV+lZFq3Uj3WGPYe6XvIAHqZo/lyWBrrEy7 N4UPgP0hPLFYfjHHHj3aWxwy5lTFJBhu+sdDFtWnAIhWTeX+A9T3P4XzQgjNXtGJvewm5o KNsIFheF3vpEtS5pQwV0Y0ZBP9RYu52Q5AnV3wkIZRKlCMp/MpMWMTSrNFMDOnod4awaka 2da3eynijcvNBTFWtn/b2AZVBEZ0yjT14ALXMUwJhPv9PMEIKzRkf7JSXXADPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970998; a=rsa-sha256; cv=none; b=NVUkCcBHg44aNa4RBY4hWLBNc7zlUUPFJjG38TJTB+Ds0a+S7nyGlQ0tfwI3F+Z/6mmDfC blrIapCxm4fF4pFm/3FWxtU/pVCMj48NewrAqXSwXZHecDEHihJWcJoD1jUMA7qJ4cxnNU c1hu/GvdwaBcq0XkxBeb0WIS5alZqHwVgDVbd+tpHc6/oi7J0B5QkU9rUhezROClJ8O6gU 9EtlrFluvolkKRDb3k3/Txn8vG8BSjrkC4xm0dr8OTNOSkl/2Htksd3AImQy+lpuCwuiIa ocUv7zpSMfSNCUMtkigRUKxr0uECcRzdJKd4KNoGCE5n7f3NKOFYwR/qn1h4Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbV5RtZz18C0 for ; Mon, 29 Dec 2025 01:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38caf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 54b52f655e0f - main - fs/fuse: use dedicated category per source file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b52f655e0fdaef21c3cde85e8bf030efa7b86e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:38 +0000 Message-Id: <6951d676.38caf.154fc88@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=54b52f655e0fdaef21c3cde85e8bf030efa7b86e commit 54b52f655e0fdaef21c3cde85e8bf030efa7b86e Author: Konstantin Belousov AuthorDate: 2025-12-28 14:22:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 fs/fuse: use dedicated category per source file Submitted by: mckusick Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- sys/fs/fuse/fuse_device.c | 2 +- sys/fs/fuse/fuse_vfsops.c | 2 +- sys/fs/fuse/fuse_vnops.c | 2 +- sys/sys/exterr_cat.h | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index cee477865c42..41387de3ce71 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -82,7 +82,7 @@ #include #include #include -#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#define EXTERR_CATEGORY EXTERR_CAT_FUSE_DEVICE #include #include "fuse.h" diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index b617925c4e5f..0ff79913128a 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -81,7 +81,7 @@ #include #include #include -#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#define EXTERR_CATEGORY EXTERR_CAT_FUSE_VFS #include #include "fuse.h" diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index ef5aee5de34c..0e049b1f07a9 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -89,7 +89,7 @@ #include #include #include -#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#define EXTERR_CATEGORY EXTERR_CAT_FUSE_VNOPS #include #include diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 318e774542ca..7492fc31662a 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -15,7 +15,7 @@ #define EXTERR_CAT_FILEDESC 2 #define EXTERR_KTRACE 3 /* To allow inclusion of this file into kern_ktrace.c */ -#define EXTERR_CAT_FUSE 4 +#define EXTERR_CAT_FUSE_VNOPS 4 #define EXTERR_CAT_INOTIFY 5 #define EXTERR_CAT_GENIO 6 #define EXTERR_CAT_BRIDGE 7 @@ -24,6 +24,8 @@ #define EXTERR_CAT_VFSBIO 10 #define EXTERR_CAT_GEOMVFS 11 #define EXTERR_CAT_GEOM 12 +#define EXTERR_CAT_FUSE_VFS 13 +#define EXTERR_CAT_FUSE_DEVICE 14 #endif From nobody Mon Dec 29 01:16:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbX2TMKz6LQf6 for ; Mon, 29 Dec 2025 01:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbW6pgnz3XYQ for ; Mon, 29 Dec 2025 01:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yd2XFKa+iFMVAxe6E6E2wFj1g/5ytx18MQ51cy2sBUc=; b=Oum+f658siLFaZ6nklCI4Qv2uuSma3bnFUL8b30j6Nb7jBOd6nnBCqTjczwfybS8UGtp4i 3oFM6qopC3WdLwZIK6UB2L5thiPZy1UMbg2+jBw6OrN2ggVIfFQgPxnXktkNqr46ed3egX fbnZtJFGYv0wzllG7wseWbbdJ+EzEiSFgbW8ODlDB92SZxiZj2nFX4GtrnMsx3s1/RYq8D LSMxKuB6GjJCxVz/q++2nbayLFHzHZFEsnnCX9+gaq5HSvfw2YTs+ydIGfUAKjcqEi06Mn +FIbU9LUHTBNq2NWT5mXOHrN4uyYYqwAVSfHFGqpDVuS8/dKDGwwamaAztCwRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yd2XFKa+iFMVAxe6E6E2wFj1g/5ytx18MQ51cy2sBUc=; b=oFMqmfjwGlstlvXDFVvqLlP5bAWk9LgfV0SD85/fPCQZ8kQ19WjfFFCwE9rUb83TK0c5RT Q/RhNQzyfsMUVN4K7FkXXWOJhy9XgF79ZY42VDJF+Xh+k433iDR15Bh+TRUi9Y9Fq4UTUJ pLlP2+7D1KsoD8BCtHAiu3SpWiKrcdZVyCxiE9P7WSuxkPGCW/fz0W6V+WLufgfXBhtIo4 drdRwg8PNGPeWBhbiwvf7jH6uquKq9d363qPIqk7FVQbqOZp+1uyi/Nc4Dvyt2avk0BdKr IP66ME92iUnAvdPqL4gtv/O3TupIeKLRaG+ishzqLmtD8eiPgFmB5J3r+8TA2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971000; a=rsa-sha256; cv=none; b=AVux0bYahLikTgfGH1O8DFdkLbXm5LLBTyzNUhl5jhBGzah453hZoTUnZjLuFJEMweUAga y/KvO/+t3xl53+43T/I4+69k3VQXDNd9svLINj74c+wMoDKXRjTPxUqeW8AxMM9Uxzw1Fu xHLML0N+ioYviTJ9YAmsubpuZH+djz+oudjAIeqaWSDw1q11rc1jfYuXumxuWofWpuxHCK /6oZO8S399klRfpaKs8dYQMdurdBri+4bD8kV2cOAP1es7eryZTiSwfusQYs5nnu/2lfXO eh+Wi+zaQpaHaJVB4rRpyWYBGFcX/skt5ccIfmLQxfbco9K/KhGo6On+wE5b6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbW66t3z17Tm for ; Mon, 29 Dec 2025 01:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38f20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3ef25acf3600 - main - Add a script to auto-generate mapping from exterr category to source file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ef25acf3600fb822bdf1487036184b4978d737f Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:39 +0000 Message-Id: <6951d677.38f20.78a9a953@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef25acf3600fb822bdf1487036184b4978d737f commit 3ef25acf3600fb822bdf1487036184b4978d737f Author: Konstantin Belousov AuthorDate: 2025-12-28 14:04:28 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 Add a script to auto-generate mapping from exterr category to source file Reviewed by: emaste, mkusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- tools/build/make_libc_exterr_cat_filenames.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/build/make_libc_exterr_cat_filenames.sh b/tools/build/make_libc_exterr_cat_filenames.sh new file mode 100755 index 000000000000..fbde85891200 --- /dev/null +++ b/tools/build/make_libc_exterr_cat_filenames.sh @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +check="lib/libc/gen/uexterr_format.c" +target="lib/libc/gen/exterr_cat_filenames.h" + +if [ \! -f "${check}" ] ; then + echo "Script must be run from the top of the full source tree" + exit 1 +fi + +echo "/*" >"${target}" +printf " * Automatically %sgenerated, use\\n" \@ >>"${target}" +echo " * tools/build/make_libc_exterr_cat_filenames.sh" >>"${target}" +echo " */" >>"${target}" + +(find sys -type f -name '*.c' | \ + xargs grep -E '^#define[[:space:]]+EXTERR_CATEGORY[[:space:]]+EXTERR_CAT_' | \ + sed -E 's/[[:space:]]+/:/g' | \ + awk -F ':' '{filename = $1; sub(/^sys\//, "", filename); + printf("\t[%s] = \"%s\",\n", $4, filename)}') \ + >>"${target}" From nobody Mon Dec 29 01:16:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbY3M9pz6LRDD for ; Mon, 29 Dec 2025 01:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbY0JWmz3XYc for ; Mon, 29 Dec 2025 01:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hc7QVKVfRQDwXTXuGIfCmlbWzbU43pGJ9vatdepbXow=; b=GGuOf5SFhVFVK34ZHhtoNUzL1aW7bZVdbYgMgsRaEsn4SDe1lvrBV9iKAjUybGe3H6J7Se HpwyAcvEv6N12NBq8OsT2xfYREnjGMa6cMf34uBiIpqEHeqkVzqn3vsAVmkd+otMdElhOV Xeyw7wL9XuegKo3StLKdpZoCdVZASakSf5bUBVW6XPssrAXG+jIpq2H5BmllV+QFTFGazx XzKmNa3MC15RO2eM1jIK2sLG68kFpMlaMgscWaG9/YUX83lXg6kypIjnLNd0JuBWPCdMpV DhJnHaql9Yo3KgE3MabSUhAFgNdtAX188AK2XqptVNDKhFtGa/ffrYJFoXwz8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hc7QVKVfRQDwXTXuGIfCmlbWzbU43pGJ9vatdepbXow=; b=Y2DegC1Z9nmZ0equGGvTpx9NqBjHCG0N3nN058zk+FlVrvRA0906cORU1qzyS6NXYEOVDG WWPiSNAbxjC/stq047i8QYFBDIttQbsT1osXYG1NnQdcXViVHBd5zQLMzYxiX0Yxjti1pk UJP9a6Qx4xAnc+PxBzMYYEIgrJozdiufUjJlzv+m+weFFpHUmN3pvUf0cPj30Oh5iCa9ZB //3WUPCCfQ3O3jKuD61+wyKWMmvb326M65K/fz78uuvsLiQy8Fq7BjglNdbPl5QVdpHMoI ZQMEjnMFZa12AYVBxVj34hwKFb3Y/uXrinOMTYHwdVQvxGtMtnaydRAi1h917Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971001; a=rsa-sha256; cv=none; b=p03pkpYcHXhgYZEeJ+HMxyGfe2SJub1Q0hF+s9OmT/SXHjmdPTKGMRW9PFAmSgv8HvZ/xr vrXBEHulgi7KHTo5RTy61x4o4weCzjbjSKeaI/JhOP+ag5+fc8Hbcxe7My7kx22EiRmR9W +wGfEVPg4aPJc5J74LDf9C8bbrWRDAsAPVcj+muU6yWOKS9VCVmPGemYFpPD2Q62In3s+P UGmRono9uxNOID3B8D75I3eYB49UXOs3JqHvezIdZ4OdX0Sbr5afZrp5PWdv9Z+RqLWQhO nRfiVkGKlNuaJEkonZrnbyizBU9LYJEtmao/q6qHQscA/qiStzzX7+ItincXmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbX6wxXz18C2 for ; Mon, 29 Dec 2025 01:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5685c07b5a8e - main - Add automatically generated file libc/gen/exterr_cat_filenames.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 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: 5685c07b5a8e4ccc19140eeaa5987a38dca7c668 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:40 +0000 Message-Id: <6951d678.370fb.552aab6f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5685c07b5a8e4ccc19140eeaa5987a38dca7c668 commit 5685c07b5a8e4ccc19140eeaa5987a38dca7c668 Author: Konstantin Belousov AuthorDate: 2025-12-28 14:23:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 Add automatically generated file libc/gen/exterr_cat_filenames.h MFC after: 1 week --- lib/libc/gen/exterr_cat_filenames.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/libc/gen/exterr_cat_filenames.h b/lib/libc/gen/exterr_cat_filenames.h new file mode 100644 index 000000000000..883dd98289cd --- /dev/null +++ b/lib/libc/gen/exterr_cat_filenames.h @@ -0,0 +1,17 @@ +/* + * Automatically @generated, use + * tools/build/make_libc_exterr_cat_filenames.sh + */ + [EXTERR_CAT_FUSE_DEVICE] = "fs/fuse/fuse_device.c", + [EXTERR_CAT_FUSE_VFS] = "fs/fuse/fuse_vfsops.c", + [EXTERR_CAT_FUSE_VNOPS] = "fs/fuse/fuse_vnops.c", + [EXTERR_CAT_GEOM] = "geom/geom_subr.c", + [EXTERR_CAT_GEOMVFS] = "geom/geom_vfs.c", + [EXTERR_CAT_FILEDESC] = "kern/kern_descrip.c", + [EXTERR_CAT_INOTIFY] = "kern/vfs_inotify.c", + [EXTERR_CAT_GENIO] = "kern/sys_generic.c", + [EXTERR_CAT_VFSBIO] = "kern/vfs_bio.c", + [EXTERR_CAT_VFSSYSCALL] = "kern/vfs_syscalls.c", + [EXTERR_CAT_BRIDGE] = "net/if_bridge.c", + [EXTERR_CAT_SWAP] = "vm/swap_pager.c", + [EXTERR_CAT_MMAP] = "vm/vm_mmap.c", From nobody Mon Dec 29 01:16:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbZ4Yy0z6LR62 for ; Mon, 29 Dec 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbZ1343z3XYn for ; Mon, 29 Dec 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hbUyzofiBZSu/3+S8IN5ZoT/yBHPHHRYT7jmHhuUmNk=; b=ESG5NAc3mbwwSeq1W19Bk2YVZWssFJJ04rNj3TJWN1fhWpg1MNyPB6UrYSLZr+yQ0XGaFb +7HFfCxLuuhXK7NCHn47Ujog+cY9358yZ7oZojB/ILQXFqzbUQoxraHJOd/0yPaeA86Hx2 JtGm6hIpSZZ+4omUOb3Vay24iOuVSNUsXwesK+pQPAj04zU5PIB5+fpOT0W3JkaJhKE3OZ Eq03OGzYpsso2KfDRs8E9TNgWa4On9tLlxmvBKJCt6UPoPA7gaWI2lWm+nKyzlxaL1Ihwt imNZ1J9H16qoRuiE4XZgyMMvjW7UOqzVQhIT0j1tgmSj9igIRcCNjeiLROY0Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hbUyzofiBZSu/3+S8IN5ZoT/yBHPHHRYT7jmHhuUmNk=; b=khT2tRCuK+c8YYSwaOLChbDHbPZkBYLjfkp0LzRYANOr7M+leSvXRFSNNeMkU8GPdEXsMX dW5nqdJrcKEHoUyovi0ZlqIAuNZq8eFa2a4R3MBNAOu7ER4fqW9k81Mwj4nSMHXGGjnO9k OZCpR+ExS87PNCPWTF6Clb4zM/F5V3QyyagXNaqpOfmDd6Fh6CDsV58cEDVBd8K1ACzcpj BJM+k1l9kpba5aAwtEA4P2Um4M5mUeSr2CetOAr5QwplutJPgMnD/oUGXmf40lvpsij+bu IzbK/UcXvY/QrNxC/uJemetC8+K25tVCwPsVhuXqpOboCuETJ1FvCk75KefihA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971002; a=rsa-sha256; cv=none; b=grAEKDNbqPLEPvzSLCWQebXAWZYZ8TTi/xflU+cUpYy6/69u83Ovk8GMNn1wuRiNz6iIIk VvFrbHHKWuM6ipKCIdlXaghAVwrKyu1gcEuaYaNJ/5NkANHdRBYHRtMs04+5FERoP/IN7d DvKtQKRoV6SwWe0MHlpA/xmr+4j8KRyF35LfQkfneZ8YGhwuoeCvu4KJdNq8tUsXsVHQ6C kx7OKEp4kxugUbYyC+Cg8IFKEAPfyrQFUVZCXuyH3Yz9CcsVJjdkCfQmkHtUIG+rj05htd csGhyvFIE07/rFcnrlagXi06fj7tWAUDOyoM0OW3IanyLxSJOuLzrGKjAT7ZoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbZ0f7Fz186f for ; Mon, 29 Dec 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 874cdf6af695 - main - exterr: in verbose mode, print the source file name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 874cdf6af695c42d561647f7165c99c2d3df0faa Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:42 +0000 Message-Id: <6951d67a.38cb3.262cba79@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=874cdf6af695c42d561647f7165c99c2d3df0faa commit 874cdf6af695c42d561647f7165c99c2d3df0faa Author: Konstantin Belousov AuthorDate: 2025-12-28 14:13:49 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterr: in verbose mode, print the source file name Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 21 +++++++++++++++++---- sys/sys/exterr_cat.h | 11 +++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 3321fd80616d..8d3b458ca9f2 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -8,7 +8,7 @@ * under sponsorship from the FreeBSD Foundation. */ -#include +#include #include #include #include @@ -17,6 +17,19 @@ #include #include +static const char * const cat_to_filenames[] = { +#include "exterr_cat_filenames.h" +}; + +static const char * +cat_to_filename(int category) +{ + if (category < 0 || category >= nitems(cat_to_filenames) || + cat_to_filenames[category] == NULL) + return ("unknown"); + return (cat_to_filenames[category]); +} + static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; enum exterr_verbose_state { EXTERR_VERBOSE_UNKNOWN = 100, @@ -68,9 +81,9 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) char lbuf[128]; snprintf(lbuf, sizeof(lbuf), - "errno %d category %u (src line %u) p1 %#jx p2 %#jx", - ue->error, ue->cat, ue->src_line, - (uintmax_t)ue->p1, (uintmax_t)ue->p2); + "errno %d category %u (src sys/%s:%u) p1 %#jx p2 %#jx", + ue->error, ue->cat, cat_to_filename(ue->cat), + ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); if (has_msg) strlcat(buf, " ", bufsz); strlcat(buf, lbuf, bufsz); diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 7492fc31662a..24f07539fe35 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -8,6 +8,17 @@ * under sponsorship from the FreeBSD Foundation. */ +/* + * The category identifiers for the extended errors. + * The ids participate in ABI between kernel and libc, so they must + * never be reused or changed. Only new ids can be added. + * + * After adding a new category id, run + * tools/build/make_libc_exterr_cat_filenames.sh + * from the top of the source tree, and commit updated file + * lib/libc/gen/exterr_cat_filenames.h + */ + #ifndef _SYS_EXTERR_CAT_H_ #define _SYS_EXTERR_CAT_H_ From nobody Mon Dec 29 01:16:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbb5HfTz6LRB1 for ; Mon, 29 Dec 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbb22stz3Xmf for ; Mon, 29 Dec 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Of75UDRbwo6X8pBVm4KGccUTBuLI7jbByckk/AmrIc=; b=xm7r9X18HYns4CByfdEkhm4wY+IIhNEujWhrvkzLSAeNtf4Zev5wIekJThZSOoBcsRTipW I5+BVb6kD08srCL8fjEAjbE9MZCurcn6DMfbeE/0lMDNVmSXlD//nXGH+wrpk7oEu9h9gX VICreW31vPUyRscLzw2eQqUbYLlteEDk3VTknoVR2dqASwCIiPSyt420Ng3W8pEk56098S f2MuyL6NqIFFy04AJUbGLR56YXgF70QJfVhXrwuPAJReZKH4epTE5xJXRmL7kJjyc4gpx7 ov9u+3mG5YOvfbh9kQotyMbHItBCuBrvcgaqZ6WeM4BvBjmWPTRxddzJxOqT7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Of75UDRbwo6X8pBVm4KGccUTBuLI7jbByckk/AmrIc=; b=dTSvuF1oVr/zrqYuuzdDAb54AV6S3n86vUpX3GaKNucA3GE23QWuF2+vmnU8Ls+aKKII8j s6Mwnz9Uoq3PZV5792ekBcLZXp4iwPWydn0l5KJUVv+dL1n2uohWGPycl7dp7X5K8rgDHg Zq2WEHHglL4JWawKZm5nVH+804+oI+Ce4XKb+EZoswcD+AurMMlPlfQuic5cG6aVeqPd4c sKkwNS6K+wTAAlvXuzgmU+a2MybD+I5KPYbMiFPxFDGKhQ1g6XnU+QyXZedggKjRoq1XzZ uGPR3We5LSVF3ITM99205ypigXFtSqktoysnWm0B+LMC2Y/QGrKBCoB1uENe9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971003; a=rsa-sha256; cv=none; b=ITxUzBOS3FsjVKhe3L7/kmmK0vFoasIk/aeyUzYwrwt11wDq1qaMr3lKbgtQ+fPJTBc1uQ L2fNg3QX09qZQvq1DdusOsUIq3TUvxdihDnQbCMabuwT83K5x9nXH6agfio3qYNWmDHsSF NisvtSlitTsCjKEIeISEO5kzO7mtZleXcsOvBOQ+osLommHM7M24SR4wJOkoYTs0VJvvnf g1WqVVQ6djfeG+Wa9p5P0F9NDQceI3b7BDWzq+s3LDNgIOtepudvlZER+ReGAKQ6NMTCl5 efR4qOhj2Jq2CO5TGe7JmHNZA6LzgzIbJ3pV1ZnPlJu53Slf5mciwqAUsS8gYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbb1SDmz17Tn for ; Mon, 29 Dec 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 378bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3088263177da - main - man pages: provide some description for extended errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3088263177da2813dd09364171feadd0e31d1fc3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:43 +0000 Message-Id: <6951d67b.378bb.514f81a1@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3088263177da2813dd09364171feadd0e31d1fc3 commit 3088263177da2813dd09364171feadd0e31d1fc3 Author: Konstantin Belousov AuthorDate: 2025-12-28 20:41:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 man pages: provide some description for extended errors , related functions, and the EXTERROR_VERBOSE environment variable. Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/err.3 | 16 ++++++++++++++++ share/man/man7/environ.7 | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3 index 088ead71239b..70a214152a19 100644 --- a/lib/libc/gen/err.3 +++ b/lib/libc/gen/err.3 @@ -114,6 +114,22 @@ preceded by another colon and space unless the argument is .Dv NULL . .Pp +If the kernel returned an extended error string in addition to the +.Va errno +code, the +.Fn err +function prints the string with interpolated values for parameters, +as provided to the corresponding invocation of +.Xr EXTERROR 9 . +If the extended error string was not provided, but extended error +information was, or even if string was provided and the +.Ev EXTERROR_VERBOSE +environment variable is present, an additional report is printed. +The report includes at least the category of the error, the name of +the source file (if known by the used version of libc), +the source line number, and parameters. +The format of the printed string is not contractual and might be changed. +.Pp In the case of the .Fn errc , .Fn verrc , diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7 index 51fb6544fc5a..ada2cc45a650 100644 --- a/share/man/man7/environ.7 +++ b/share/man/man7/environ.7 @@ -114,6 +114,18 @@ A startup list of commands read by .Xr ex 1 and .Xr vi 1 . +.It Ev EXTERROR_VERBOSE +Request the +.Xr err 3 +and +.Xr uexterr_gettext +functions to unconditionally report additional information, +mostly useful for the (kernel) developer to diagnose the issue. +See +.Xr err 3 +and +.Xr exterror 9 +for more details. .It Ev HOME A user's login directory, set by .Xr login 1 @@ -298,6 +310,7 @@ built-in command in .Xr cd 1 , .Xr csh 1 , .Xr env 1 , +.Xr err 3 , .Xr ex 1 , .Xr login 1 , .Xr printenv 1 , @@ -311,7 +324,8 @@ built-in command in .Xr system 3 , .Xr termcap 3 , .Xr termcap 5 , -.Xr simd 7 +.Xr simd 7 , +.Xr exterror 9 .Sh HISTORY The .Nm From nobody Mon Dec 29 02:05:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffgQ3lswz6LVCH for ; Mon, 29 Dec 2025 02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffgQ3H0Vz3gs7 for ; Mon, 29 Dec 2025 02: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=1766973906; 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=XEKYbEW4GuynMkGT8fmgbBN9MyffzUbohv6YqVGu7w8=; b=op0qYA8Bzmlk2kyrysoBuSAcujir74/eEP7571xOC9WDCweC/liYj4F9qIOCmZJu1hnlhh gjJZ5wkw7x3iBMCLWBZ8WIcNoWAMoBG4m46y8Sh9+16nCn/WNrvvhFmCQBKRnH4TcnqO2X a+c+WhcYceN2UUO+S/tXDkex4Ssm/I224B7L+vHlaq+KFAMy7PXqqJ42dNJL8ySLA4JDjZ kwCv3WJvazXSEL4YibQhxmgyRnG2SvTv3xQOWStXoEcv0YAetfIvdQxfPtJg3S9IVDsUTM HCSol0Ip8jJG2dKqqt6aE6tcU7YSXansQONhStmma1hlaNU/BGoJOESRDhAm4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766973906; 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=XEKYbEW4GuynMkGT8fmgbBN9MyffzUbohv6YqVGu7w8=; b=NIeSfnLbbPbuiDwEm1cDrpN5+KbzdYWSx+HTq5POcAEtps1p3dYofWRk5XGieUScSJyykI YCLs0OlUjUIBd4lHbb85lYtA1O+cFXlGyMjPZWiXCe5vtAt8O5Sb5RkOM+8Ouu9ShJhkS3 yN5rOgyVZi58hGetF00GnIRH65tcXjMbUSBB37ByFzAVwN08dwfvqo6BogQOjl9qWS2iBe hXTYNIad1DLAr9oixWcK5l0OtsC8iToZNnMoQed7XgtA4XCs8iid3W4WLSjJsDhVzIvQ0e tREEg1AZUqyLK9YFzsylTuwjwi7FTAX3+u8Xtn2OzW/TsSuH0AJpmzchb2+QGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766973906; a=rsa-sha256; cv=none; b=w3zMQ+ho9qKeiSDokOpptPBr6GYpkAog9g4cXQVpU4boluRl7TQnrTnFq7XinINWx2iSJE aO779HUeEAFuCpbHTF9WEvvsJCvILmpAUXOZzwE5GZbgHZAoC158A/fvj+A5b4yCCg6xQF m37GSGHWNOzLNbFI/iU5lHuXa8OKVX1HyS4d/6nA5OyQpXvi0LHHmuDWaSbLJgQz+8EixD Jf4gu3Oc1mczaPP1B3TkezZWM27kdG4eySfVa/LsC29lTj/YFHZAM7j1fiPs38P5SKbI8J +hQaqeiv+VvgxZtOmwTUPnmmbnyuSNdKOe+YYsklV03/6Kvu1h7c2bKY1PQzmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffgQ2XZPz194H for ; Mon, 29 Dec 2025 02:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: b6672803a1cf - main - cross-build: Avoid adding to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6672803a1cf10dd1c912fe6571a8d426b8868bd Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:05:06 +0000 Message-Id: <6951e1d2.3d905.f3b3a4b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b6672803a1cf10dd1c912fe6571a8d426b8868bd commit b6672803a1cf10dd1c912fe6571a8d426b8868bd Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:04:45 +0000 cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 8017d776fd55..1eb539f06607 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -351,10 +351,12 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h 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/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/_nv.h From nobody Mon Dec 29 02:12:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqb0VFpz6LVhc for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqZ6fn2z3hNk for ; Mon, 29 Dec 2025 02:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ua4PJ106v3elkJ7cux9bhKsztkomvH1uHPGliIAzqBg=; b=khjV9G0jrFcjTgS6inKu39NvUDF5diw0H+NG/SrgIZ5zPIsxxG/VwSxKxtwnRlPbwRSgZu LBVQikaaxWqbWXYQbFIutDP5FN85CJPGm/MnRFoyhoxZMFMzCxspbbJfpVCSdiTrdwxovp Xcvs6hScayOmxUY6eVMlRALk4LzVsPqq3TJqocogplqQRxZur7rGFiLJeqt8gNWKzAiAgY 8NWqzEyyPvSDxYkvOTnH0UVXgJ6K0NRFEW3PponlHraA3jXZARGL1A9nj7rbkPJyKEvXsf mieSpTkPN+8k29zrZtSdEfrOexmIR/d8f9iHgW2UurXL2T+FyXCKbk+zfMhrhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ua4PJ106v3elkJ7cux9bhKsztkomvH1uHPGliIAzqBg=; b=cVQWCifRDdhpUHYw+JDU/W0Vj8ifl0jnwL0UoL0hli+vqLqLTlENMDlxuBeCaCKTK1FDfp BTFl/biQjIA4axSwbczlaou39qQ5jvAVm+OD9bHiBeRncLc/tnoaSIvBP5P9j7bL/U56sp jtkfKvwKvGqDi8N6p++Fa23xpyyaxtVodVFiuX4jnSeR2vpNw75j1PgCAosvJ6BPTvtGbt avd9M1qRE46jrhQihJFJwdZZUXFm7kso0O/cDUMbsLMx4pFuH2Tvrecb/P5BxP2aVwWuxn YWXd4JU6j0Hy9UYG6YGVa7RRT4m2bcaaR/0SZM3Ki2XliccwNu5ATLHbCv3aAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974331; a=rsa-sha256; cv=none; b=Aa7gSXBXy4Zd0nexeXaU6K3u5SQcHNfSNdUcfoGo9yaXgEf/fe54+L7rYveL9qGTp4l3Xd OIeMScs4JXLqBD+ljeX044Z9Cg7TpUYai+Qu8ipLJJj8BJyxj3G1NL646unrZbio3jV3hk GiXydPIroY/m1IZf6xiHk7C6S4bZraaLXkhey4rUoxMUq+EsCUpwYKJzhhA5o465+fwJIJ 3NmvOiPG6TZ8y40/SqubDGgyQNQZqEu6ixUqUehFAN9CD647DPZUM1ZKyAzlORPOFEzz+6 2yW9XrUq4zarg1rPe7sGXQxdg68cFArCksEOUQCEPIWyt2q8nycMz2nTE9OMcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqZ6Clmz19JR for ; Mon, 29 Dec 2025 02:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8f7dfa4fe2b7 - stable/15 - cuse(3): annotate cuse_init() to suppress thread safety analysis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f7dfa4fe2b79b3fdf096fa26dc7e2b743e1f208 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:10 +0000 Message-Id: <6951e37a.3ed94.2184f8af@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7dfa4fe2b79b3fdf096fa26dc7e2b743e1f208 commit 8f7dfa4fe2b79b3fdf096fa26dc7e2b743e1f208 Author: Dimitry Andric AuthorDate: 2025-12-25 18:02:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:06:47 +0000 cuse(3): annotate cuse_init() to suppress thread safety analysis This avoids warnings from clang 21, similar to: /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 111 | TAILQ_INIT(&h_cuse); | ^ /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 112 | TAILQ_INIT(&h_cuse_entered); | ^ /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] MFC after: 3 days (cherry picked from commit 5629b5cf79934e0b94ddbbd93b7756f74fe4050a) --- lib/libcuse/cuse_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcuse/cuse_lib.c b/lib/libcuse/cuse_lib.c index 3f040d0eeeda..48c72258106d 100644 --- a/lib/libcuse/cuse_lib.c +++ b/lib/libcuse/cuse_lib.c @@ -93,7 +93,7 @@ static struct cuse_vm_allocation a_cuse[CUSE_ALLOC_UNIT_MAX] pthread_mutex_unlock(&m_cuse) int -cuse_init(void) +cuse_init(void) __no_lock_analysis { pthread_mutexattr_t attr; From nobody Mon Dec 29 02:12:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqc2S1Qz6LVmc for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqc1Grhz3hRJ for ; Mon, 29 Dec 2025 02:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rGKlmmXP6dB5RqgDmA1PBARxSPzwAYaH+PzDChgUCmQ=; b=uoFV9FKAUaUQuyjLlXHa899G3pzoxdJtxZUfxFsBlrUNthHekcx8pZdQ/NJZWmyczUXSQx YKaw1rET+0BMFjImzDgOzikiAdF6mhew/ukIGMe+Oi6Ykjdk+xfYqvscWXCc1W/ueAdQez p2dSYZNRljvdY7qlt9fT5owpmLdI/QqLss2UOfW5GByhO451TWeRFm/oK1sgmLSLuQwitd DSeQvM5yNVgXEyrI/t4MguGKXZI1liFRgiixJU3/i3nlF6AEPYPzHdZVpWNReQPfRLtKHD ohOcbG0KUFPVEkjMj/bLvlXa/jf3WDr9mCnFwcix5MgW6DsH5wJ5HFRhqFihmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rGKlmmXP6dB5RqgDmA1PBARxSPzwAYaH+PzDChgUCmQ=; b=TWEzlyRcvVCb5Ls3ZLVbBUIbn+ZiXyJwFSeIHyqHkYocyAhBOVemmVLcWfZHutyLJQsHl+ IkZkg5OuWPns8anQukX8Ped66zaBq51icY9+QX0fCqQqLPY2w0NPBbSYfo0zYZZLRwxLoI qmbAH6yWCjoYz2DaDnE7LE59fWDLa69W7z4H3OoHsQPY7QCZcQR1A32ohHdbB5Z3yxPqPb C89vJlpVEk3EKh5oWH0/A1qtw6SXG1PaClbRlN1gsRTDy4Sfws307vlJHMKKPE9+Ym60YO dllmp2f4KvhHlpVCp7ywM+6WaeJq5FWKAxRnAkQ4f/wOU+2g4hwBr7Mj/t+z+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974332; a=rsa-sha256; cv=none; b=UkPGEOhuLgtzvHRfviamjZq9KTuaw9AW5G3hQb286QGtWT8teYSMg/z0rlZOGsI3/HDJ7X lrjSYt7fOywJLPn2BujApDcWYyOYepqEgd+/KOrYD3NrlGif7usTIOmhJZRSS1YCKCvBYm hJRp7cW7Q54lQS9gHS0GzmahSoBnJvhn5QJMzkYw0G1arlsqIPGs9oifcZ4jqtqLsoTN+1 mweBayXjYQ18g279xgN2jpEpcFxuZiXm6kQQ6fqO55t96tSvAozGFwlqa1KldWNb9yju+s m+MV+qdTjeldBXzU3YH/+ZnjTV+BZ8vwDvkFLw0NiTZ6QocEZPG7MaHNhxXVlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqb724cz19pJ for ; Mon, 29 Dec 2025 02:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d9b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5c5e2a0a7be8 - stable/15 - Reduce number of external symbols in libllvm, libclang and liblldb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5c5e2a0a7be849c7a557a026352008190f8bf10b Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:11 +0000 Message-Id: <6951e37b.3d9b4.33ba0388@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5c5e2a0a7be849c7a557a026352008190f8bf10b commit 5c5e2a0a7be849c7a557a026352008190f8bf10b Author: Dimitry Andric AuthorDate: 2025-12-21 21:37:57 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:09:11 +0000 Reduce number of external symbols in libllvm, libclang and liblldb In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, upstream builds the shared libraries using several visibility options, which reduces the number of external symbols, and makes the libraries a bit smaller. On my test machine: * libprivatellvm.so goes from 75643 to 34706 symbols (~54% reduction) * libprivateclang.so goes from 53250 to 33531 symbols (~37% reduction) * libprivatelldb.so goes from 27242 to 18798 symbols (~31% reduction) Note: to get the full benefit, a clean build is required. Incremental builds should still work, but I didn't want to force a full rebuild on everybody. MFC after: 1 week (cherry picked from commit cf1eaaf41cefe7e3aef45f6dab862191a3939ed8) --- lib/clang/libllvm/Makefile | 12 ++++++++++++ lib/clang/llvm.build.mk | 1 + 2 files changed, 13 insertions(+) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 810eac08d8d5..7c45375b8fbf 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -48,6 +48,8 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB + SRCDIR= llvm/lib # Explanation of different SRCS variants below: @@ -2050,6 +2052,16 @@ SRCS_ALL+= ${SRCS_COV} SRCS+= ${GENSRCS} SRCS+= ${SRCS_ALL:O} +# Optimization: for all source files under Target/*/*, use -fvisibility=hidden, +# which reduces the number of external symbols in the resulting shared library. +# This is also what upstream does. +.for src in ${SRCS} +. if "${src:MTarget/*/*}" +CFLAGS.${src:T}+= -fvisibility=hidden +.info ${src}: CFLAGS.${src:T} +. endif +.endfor + llvm/CodeGen/GenVT.inc: ${LLVM_SRCS}/include/llvm/CodeGen/ValueTypes.td ${LLVM_MIN_TBLGEN} -gen-vt \ -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index e88b2ff1033e..f6e51129e9fa 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -122,6 +122,7 @@ LDFLAGS+= -Wl,-m,elf64lriscv_fbsd CXXSTD= c++17 CXXFLAGS+= -fno-exceptions CXXFLAGS+= -fno-rtti +CXXFLAGS+= -fvisibility-inlines-hidden .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) CXXFLAGS.clang+= -stdlib=libc++ .else From nobody Mon Dec 29 02:12:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqd4HLHz6LW64 for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqd19Knz3hNr for ; Mon, 29 Dec 2025 02:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ng5QFlChdOJF9el1vLmPf+Grkm/D0D8MGbEhSI21NL8=; b=WCWSGK/Zv1UdAB5zQKdnseRrV6NJa4lrc+WMTwZQ8yvIgE/UKs/BZJolWlZGtFypnAkb3S FaZfxB3MwhNpmK0tFOEcDkMpXOsF4gwJQM9Z8u+DX2I94aP2Sw/HJjQJrmVisOOKZlTc9w D45072vAHWNmArYf4qkD+DlZJWfYlK1+60VPHI7yvkHGFNduCYE4oNYHlXCvBuybUkmuMN v4XEai8DldIIOowS93lBmEqqznu1cGXts4m/rEIZ34cikqITfWxMI53FHiKaGSLNnB0LzV KRED2rsFPSnEZR/+2+r1BuNfOOVu8KHwK+b1bmdOArpH4Pity/rc8CBM2PNtjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ng5QFlChdOJF9el1vLmPf+Grkm/D0D8MGbEhSI21NL8=; b=o+Esh1IltFndar/fr2vkWNeCHGx0Kjv7cvp2eDHQV6F5xHW/ts09OwPFwl1oEKOpOt50RQ hqWcAGFbUqqEPD+BkQo6nu0QnCXcB3NicI8YEroX+hbF9jCCbxbXO5gXWww7VrFXyoe2oR 8juKUD+pkuekWFFqJ3kYgM7iL6xUtPkVwbVAvOlzGCyHMyVPssfA5KsbHdZz1faE5+jdf9 n0IG6qQ9IC8644TRo0sx28JdYlsEnrpLaJabyIjODhYOUPtcDI+bBETfyQFNlAsE93dnWb chefsXfXHjbTRHKQCO/n5ZtjQRK0/H4TlNCplWG3yBsDU2TVbKlrjSC8KTJ+0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974333; a=rsa-sha256; cv=none; b=M3FC2IKY/WBer8aFu3nnseomEXCVfWHlv8xDqZNnVTfzZMK/4NfmX7nIambo8dFC9+Wic0 hoEpqhYZQ8swIdlwV7UHDUuKgI2FTQ4gDJuHGmhm42k7Pe4uz5mDaidG+h315qTkCB4dJN uirWf4Ahx1yKzm76V0dE5CseD4ssnWVHCUdtaQPoPJ8ug6Xfxn09tO5V2DSi0ZTiD6rlnX /veV+ERmC4ouuK84JxPg5SYE+sF3nFT/jqeYZY7uI9vDC4UeJfeRlvYSYIFtQM41ULvFAA HWeJoljF8PVOTJsSDD45bxvHK9Oyy3WBrY3Jnt0cnJAjm57gGiPI1Gi0L5JXZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqd0lFbz19lv for ; Mon, 29 Dec 2025 02:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e3a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1eea0671cc85 - stable/15 - Remove debug crutch I accidentally left 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1eea0671cc8527114bec915406d6dd96239c85ff Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:13 +0000 Message-Id: <6951e37d.3e3a2.19bc2758@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1eea0671cc8527114bec915406d6dd96239c85ff commit 1eea0671cc8527114bec915406d6dd96239c85ff Author: Dimitry Andric AuthorDate: 2025-12-22 11:49:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:09:28 +0000 Remove debug crutch I accidentally left in Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 3b1126208f44a90c7dc04a87207e54b22d45893c) --- lib/clang/libllvm/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 7c45375b8fbf..a4e9c628d99e 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2058,7 +2058,6 @@ SRCS+= ${SRCS_ALL:O} .for src in ${SRCS} . if "${src:MTarget/*/*}" CFLAGS.${src:T}+= -fvisibility=hidden -.info ${src}: CFLAGS.${src:T} . endif .endfor From nobody Mon Dec 29 02:12:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqf3RXtz6LVpy for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqf24pDz3hfy for ; Mon, 29 Dec 2025 02: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=1766974334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pV0ONvZFhQs42UUXTkEo3ptXh3N+fGarFPN+3P5KxoQ=; b=DtqC1byc6QCw4YW6nCGSPU0dYpiAhemzVqvXcbRtlIW+Oa5m65ltpEU2K+xdJ+dh+hjHt8 brfVSYNeG4oxM8wS1Fa1Y354A1Zw/74d5r8JaX/Hg5uUoKlDWmOz0OfifaAw9yrpqUFp9O zhOxYJbTDIiLhp6Xkx1woxsYclSda2obqVehirvDoZ/ioQXUgaInwGJdkLLr4bIFbAfe2a B8pO5ev5+dfDbfc9Odd91K8/9lGBDw20+u3gDCr/0CEGmubCzJ+6lh4xJbYDf1NhhDObXv qY2O8Yh70EkUvSgOuqAz7idSc0wPYYidHE1KXfpcFoUXLeHbbx3wDS7eJS5aTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pV0ONvZFhQs42UUXTkEo3ptXh3N+fGarFPN+3P5KxoQ=; b=ybRQI9tP/WKiz0YUZmnqfzl+cP6llkp9M1CyjrN156AjISGgpXPsCWvznxi8xEoPZV3m7l C86dW7CfzpqG9DpzEWUFpQ3pOVGYg7iwwb9p4oMiPT0wuj/bRyjY7XlD6fLetJDfJEanU0 uaiYfenJdArOztrINOw5kq+xQVKx0ZJ27PqqlDYtkDr9ytMybppNbO2Su8cECYzaUbBHo+ aKmiKLihCjKY9xiuSKUAhc44ymAVh5nPRiqkYBl923bIcF0Nl2NbYsbk1HB2q5tsyFL8fX OyV/nW7ehIzP1q71Pp2qQ26VngH7VFJAHXNSQ8JXKHIpsBlEeRu7uKqTCXFLKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974334; a=rsa-sha256; cv=none; b=r3rTJPhHOtCKSGDzziSqhiUp3/PjMFD0Hk87HEJq5Va0IAKXA3pPWrwDEiKT01dwDh0NUx Wc+g6CNUc/82Iupd22B3e778XPezW+1SZkZN3XSaxTxLKKSMLJQNwBt4DB8zP9EysN4ZCr 6s8LPKjQqMaXRUbdGV3juPasvUAeqA5seIe2Noqv7hPALmAC6TlC0BqRYQ8rCPcScII8j0 tgYTWfW9wnux3Sud/c1F8wwrhTxyVCQ53GtZn1/ZlrbWJhKiBq50/zKnK46SbJ85XEziRf D2YDerJcNEESaGinL2Cdb8avMY0spivz5yUySgkkp1bzeI8SdAef+XaMcEmHvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqf1f4Nz19g9 for ; Mon, 29 Dec 2025 02:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ea9ce3875759 - stable/15 - pmcannotate: avoid accessing uninitialized local variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea9ce38757594252558d27152fb7173ad1510aa7 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:14 +0000 Message-Id: <6951e37e.3d4b8.2e9d8fa4@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9ce38757594252558d27152fb7173ad1510aa7 commit ea9ce38757594252558d27152fb7173ad1510aa7 Author: Dimitry Andric AuthorDate: 2025-12-26 13:37:47 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:09:43 +0000 pmcannotate: avoid accessing uninitialized local variables Initialize `tbfl` and `tofl` to NULL, and check whether they are non-NULL before calling remove(3) on them, to avoid warnings from clang 21 similar to: usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tbfl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:57:9: note: expanded from macro 'FATAL' 57 | remove(tbfl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:12: note: initialize the variable 'tbfl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tofl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:58:9: note: expanded from macro 'FATAL' 58 | remove(tofl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:19: note: initialize the variable 'tofl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL MFC after: 3 days (cherry picked from commit cd880010c49a5d4ec529f4204d4e88cd27727255) --- usr.sbin/pmcannotate/pmcannotate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c index 5958ff615e4b..6f3e121b4729 100644 --- a/usr.sbin/pmcannotate/pmcannotate.c +++ b/usr.sbin/pmcannotate/pmcannotate.c @@ -54,8 +54,10 @@ if ((ptr) != NULL) \ perror(ptr); \ fprintf(stderr, ##x); \ - remove(tbfl); \ - remove(tofl); \ + if (tbfl != NULL) \ + remove(tbfl); \ + if (tofl != NULL) \ + remove(tofl); \ exit(EXIT_FAILURE); \ } while (0) @@ -702,6 +704,8 @@ main(int argc, char *argv[]) uintptr_t tmppc, ostart, oend; int cget, asmsrc; + tbfl = NULL; + tofl = NULL; exec = argv[0]; ofile = NULL; bin = NULL; From nobody Mon Dec 29 02:12:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqw1ZVqz6LW7V for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqv3Dxwz3hsc for ; Mon, 29 Dec 2025 02:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fksin+0iPFd7JIABswDJ1zKpcA6tsEcfTHae8g2csm8=; b=XBJnLO2dPdweWalRT6sZvVaIAOU7Ivbwc25Hl581hqWYpSaxcHv5MdehIhfFD9HmvNkzZF jV7j1GY8kstIoPoGMladduTtFibLNaVJgCj+/OyBlxZee0hXNIEA5osJe4DmYoUFfF+C7f xrkM7jD0xl8UrmXZVh/AvWfkfHj+OJqkzHxXENIW6se5zYNB+HlaaR23yn/ypTrqnj93Qx NQ4Ffq0/bSIZ0YEf2LBACvhs+KBQKS9uj6y6dhzmjjTogzh5nUDlCOMGyJgXiawpqcC4IB ABejVC7945MwyR7TQaUXSXyaeFfEdB+cc3s4DBUgNLReSp6kXn12v6OUoXrDXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fksin+0iPFd7JIABswDJ1zKpcA6tsEcfTHae8g2csm8=; b=W1gIEQewUhAwTLJPld1yTwcuK0vSJ4a6iyZ2tnC0dnHx/VWkT0kTyMlJdRf3wXUsg0IGAy brdpvsDJuxDyT4AnXWxEwefXMkcRASA3LWuBp1uSD+f2qOF+MzdIGoFaPtwLmFWNFDmYLI Qa6uLH8JC/xpm8VGYZKmuHP5i5uVQUTSkUtHbcOKNYg1VmX2mB8UnOuus3Rnu5/LfKOLr0 2TolvvzX0+rBY2ZOqHt0TTZuhCX8qC9vXgiwzMXkVgau762DmbQpbQyYlbW7aJ17FSQ5MM zIHfGNyHBQoq1JBUyfxjUJ5NEmDahvQuRI4wd+8orrJm3BV5O+fsK9SjPy2FYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974347; a=rsa-sha256; cv=none; b=bibedChoFwZl19n14yblzw4KrNXEaNFr/KsiRVhnh6f2d7oAPuKi0DBAg8iD7xb+LCOMRz ZU2B5EOijF1eq+aJwwJx4pcPR6APBuX4xRe4Dj6EflbzFXJTTYfRC5p2l3BIlmRw9mTWsI NCc3jhduswawQAF7p3A2qD2vSNhslUg7QYkSh2W4+5pMNrEHQzzqoCHAb+/0VR/FNSZTNc na1FjgxgkGQ+GNOseVE0F3ivU05N8NJ7SO8vF2aBQLjtL6F4lxfdQNvoAqA9WqIDVmh+2S GZBPpNk3HcdpLyj8BcYp8Vw2jJvEhZKLuiDuNnIiSluROBDO+yeQ3XY5B3FgeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqv2rN6z19RG for ; Mon, 29 Dec 2025 02:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c5fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c55bd9b27275 - stable/14 - cuse(3): annotate cuse_init() to suppress thread safety analysis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c55bd9b2727595b170d25c87d0561477952cce54 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:27 +0000 Message-Id: <6951e38b.3c5fb.3cf4a895@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c55bd9b2727595b170d25c87d0561477952cce54 commit c55bd9b2727595b170d25c87d0561477952cce54 Author: Dimitry Andric AuthorDate: 2025-12-25 18:02:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:07:08 +0000 cuse(3): annotate cuse_init() to suppress thread safety analysis This avoids warnings from clang 21, similar to: /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 111 | TAILQ_INIT(&h_cuse); | ^ /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 112 | TAILQ_INIT(&h_cuse_entered); | ^ /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] MFC after: 3 days (cherry picked from commit 5629b5cf79934e0b94ddbbd93b7756f74fe4050a) --- lib/libcuse/cuse_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcuse/cuse_lib.c b/lib/libcuse/cuse_lib.c index 3f040d0eeeda..48c72258106d 100644 --- a/lib/libcuse/cuse_lib.c +++ b/lib/libcuse/cuse_lib.c @@ -93,7 +93,7 @@ static struct cuse_vm_allocation a_cuse[CUSE_ALLOC_UNIT_MAX] pthread_mutex_unlock(&m_cuse) int -cuse_init(void) +cuse_init(void) __no_lock_analysis { pthread_mutexattr_t attr; From nobody Mon Dec 29 02:12:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqw5P6Kz6LVlh for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqw4NmLz3jpX for ; Mon, 29 Dec 2025 02:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rkeaubJO5nD5RB0q2HG+9pNfRJeflndXQxifzBHV220=; b=tpGYWuYjMF58HUvou1pxU9/lkgSW4sDnm4CDLVkDJKxoBZ2Ma8AseA6GjNkxvWvghZWeqq 097TnRz4+wHeTzHQOR0/Tpl/U6VmQcp4+p6uvD1cgQwTuOBGBxrv8j1rfuOHM58URO1l2Y 4xHm9pO87a0459E2FyShWb+1hH4c0eUKtISIMvbPFNHB9HG7hYI4Qw++H1Yi7E4voZEOpP yKtoyutdzJKqWConO2jT67P1lqths2PQqrlVVq6Dj3MT7CVtmAxJeJ1NYpqe87tdjnD+t8 TCpfxu9QBjDA8WSpfHfeJ//BlHHtdpLPeDpBM9LruYYK9spBUD/tLh6qDwnTsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rkeaubJO5nD5RB0q2HG+9pNfRJeflndXQxifzBHV220=; b=WjPEYrSHFTU8rp2c5E9IIlGPxcSsyqGoo+bprQ8AWjfC4bkT01h0XaxqC9EMTcS29JedrY iJGApqdTBIJ5k0gTDArYc5SPQnc9KkvHt4n0GO5iuu2SpAiWwTtdF98hB0dkDAYI/XSpNu HgcOnfyDexZz9ZeGiP6rRG3GeJupY08x0cqxF+TY1Ij811oIezxuI7BlN6HJ8m9JaouTQB ZPbM33JCYkNr7Cz7jXKiHMlt7yZHsNz5WZ8QCfhiBcBOD1KPDQ1cRfXliIKmGLmvQtBkbL h2BgXRJIIfg/ia3SSUkvIqfj4FSSQi8hkCxjtue0wqIetTq/Pbki08uQCPH5Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974348; a=rsa-sha256; cv=none; b=sNuAD5xyxKjDr6IUC17WZeyvRL+FfGQ7+Li0SJ0Zi4CzLxH52o8R22w+L0kF3yoVsKtf0o iYGkRhjSUwh2qHrf6WvdyZkJt4sWniqhH8kuZ3IKKSgeMkSoDWgBYABJqr6Ww3RtiKXBr+ ApaCFbxmuSe29Jq+mOMEPnUyoLFEPhUYE2vW/LPSKwHV463jxUazfhtI/Kp7qDmsf2WhUS wurHNAGrKOgaKXsWm2QqxpDEQZfltU2/6c6BdmHc/Bc7GqVFfIgjvT6FaZ42d0mziZsjnZ DySikvqW5ih3pMDpHRpwPIuIM+CLE5vlQmiiG1dniS4XkwO3tDlLYD0f2K4sxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqw3gKRz19m0 for ; Mon, 29 Dec 2025 02:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4660accec8d3 - stable/14 - Reduce number of external symbols in libllvm, libclang and liblldb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4660accec8d3e31b513bcbcf57d3a3a532ea60ca Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:28 +0000 Message-Id: <6951e38c.3e9d7.5d081105@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4660accec8d3e31b513bcbcf57d3a3a532ea60ca commit 4660accec8d3e31b513bcbcf57d3a3a532ea60ca Author: Dimitry Andric AuthorDate: 2025-12-21 21:37:57 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:11:13 +0000 Reduce number of external symbols in libllvm, libclang and liblldb In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, upstream builds the shared libraries using several visibility options, which reduces the number of external symbols, and makes the libraries a bit smaller. On my test machine: * libprivatellvm.so goes from 75643 to 34706 symbols (~54% reduction) * libprivateclang.so goes from 53250 to 33531 symbols (~37% reduction) * libprivatelldb.so goes from 27242 to 18798 symbols (~31% reduction) Note: to get the full benefit, a clean build is required. Incremental builds should still work, but I didn't want to force a full rebuild on everybody. MFC after: 1 week (cherry picked from commit cf1eaaf41cefe7e3aef45f6dab862191a3939ed8) --- lib/clang/libllvm/Makefile | 12 ++++++++++++ lib/clang/llvm.build.mk | 1 + 2 files changed, 13 insertions(+) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 2060f5f52c91..9ea816fd4e10 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -49,6 +49,8 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB + SRCDIR= llvm/lib # Explanation of different SRCS variants below: @@ -2051,6 +2053,16 @@ SRCS_ALL+= ${SRCS_COV} SRCS+= ${GENSRCS} SRCS+= ${SRCS_ALL:O} +# Optimization: for all source files under Target/*/*, use -fvisibility=hidden, +# which reduces the number of external symbols in the resulting shared library. +# This is also what upstream does. +.for src in ${SRCS} +. if "${src:MTarget/*/*}" +CFLAGS.${src:T}+= -fvisibility=hidden +.info ${src}: CFLAGS.${src:T} +. endif +.endfor + llvm/CodeGen/GenVT.inc: ${LLVM_SRCS}/include/llvm/CodeGen/ValueTypes.td ${LLVM_MIN_TBLGEN} -gen-vt \ -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 2520637e2d06..aeee2467e4be 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -122,6 +122,7 @@ LDFLAGS+= -Wl,-m,elf64lriscv_fbsd CXXSTD?= c++17 CXXFLAGS+= -fno-exceptions CXXFLAGS+= -fno-rtti +CXXFLAGS+= -fvisibility-inlines-hidden .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) CXXFLAGS.clang+= -stdlib=libc++ .else From nobody Mon Dec 29 02:12:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqy0449z6LWFt for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqx55Mvz3jgQ for ; Mon, 29 Dec 2025 02:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7b+5SfFPdq+Fmnq+ETzoVdmzmb7qclQjMRebETVJoI=; b=hg4nG7C+8Yx1ySObxaX3csE4aMWwPiXY14P7On8JEu8Yu79eTj+FGQQvFGd+lBoS9hxBga dfBRNrYpu+vY4pm4so0zW9C7EElnr25GSXnONDhYxM0ZOtY8kuU0RoDcEFPY0Jlc9fzK68 TGzO0yUgAr1Nydb/L1jQORPhgazsWBP1+jQC07asqdQUnVUp39HLfLFTzfCfGkCgACllcC JrZHFBGhBc1dG6nGHvtM24aMRywaoSzS6kUT3vOin57TWpVRubMhlrxNOObpl0r7qwcWn8 5D/iNgtvgnROdH82PioCOy1pJF8gpVfpO2jStDXmW/xADg6yRnc+EZrFN6PXLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7b+5SfFPdq+Fmnq+ETzoVdmzmb7qclQjMRebETVJoI=; b=PU7rMzejPLvDQNW7xFSGzzVXw4W7EAUq0nW2COA6x/+J7V1iojdSB2trb11asaeMfOxLZW FZsvpHrL0smrw4fOzbFdHd+/SD86blumV2VtCTTKZkp0i1Zg9zsoBVqP1V8mSIad+9QOLs D0d2hbSa93Ddx6d9pcemsn5z5cmwfd8NsOSmi0glKB06mLp2iEvazQih+DXB2g9pP0x8XW cSUfYC+hUSDvpB+sorHWv8QOTIl4EtTmdH/nnzfbVxQFBJltEXz/Q8UBF4l+Kf80ZxCZkZ I7rq7C35BeSBbVrt2UKg0ygFgKC7/DPnLZ5AfUYlskVk4ADUpevNnGdWOfJhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974349; a=rsa-sha256; cv=none; b=TksedjvyCVn+frBP4RbOeG6fsQthrWBJN//pYn/M7nUNdhrR2nrJniNQuKC3i9EOQpF5Sg UPiGuHM8/v8COr4vgTyPkvQvnxqlKUilpDzUVO2n6LYvvLgnl4UlsmC6nQdzJy17DWIoS6 L1o5zhNINjigfrikBbCUpMsl0I8/5B2eEoYULMuH7LE7xTt7wSyUKAYQK9/d0BgJIEsnKp Y7eQ1V6sWs+GzzgRKrnWzb5EsmlGSepGVI3wX7wm5ftwuf4Z6uBuh+9MVXnnP7dUexuEbx o9e8LmHmgb37tvhwxL6uY2YjIZs1T2xyLxMp3eTiRFhf32z+r55fSQ10lY8kIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqx4RVDz19JZ for ; Mon, 29 Dec 2025 02:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d44b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ecb101967370 - stable/14 - Remove debug crutch I accidentally left 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ecb101967370cb1dedef5c46109011a93eeb1aa1 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:29 +0000 Message-Id: <6951e38d.3d44b.52dedb99@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ecb101967370cb1dedef5c46109011a93eeb1aa1 commit ecb101967370cb1dedef5c46109011a93eeb1aa1 Author: Dimitry Andric AuthorDate: 2025-12-22 11:49:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:11:30 +0000 Remove debug crutch I accidentally left in Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 3b1126208f44a90c7dc04a87207e54b22d45893c) --- lib/clang/libllvm/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 9ea816fd4e10..835da5545e81 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2059,7 +2059,6 @@ SRCS+= ${SRCS_ALL:O} .for src in ${SRCS} . if "${src:MTarget/*/*}" CFLAGS.${src:T}+= -fvisibility=hidden -.info ${src}: CFLAGS.${src:T} . endif .endfor From nobody Mon Dec 29 02:12:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffqz2C0fz6LW7c for ; Mon, 29 Dec 2025 02:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffqy5sWFz3jll for ; Mon, 29 Dec 2025 02:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zz7ncSqz9lIHVqwO2/bUdZ7JeP6py88N4gNEPv8SoX8=; b=iqFsk0SRfFfFMpuXSq33LIMhJaCElOiMlUZI3XGsl5JPpikmuUsNbbpAwPhPrcVZrn3RdE F79DSDQr/W9r1jkfiULe5jBBn4ceSBeTk4BXzxkymIjCl16Rs7sBrRAhS7fYFOAqq1lLk+ 7sVBydfClBrlyBYKyF8Cl8ISAxEr/LIBdq6IuzURr8sPd4KkuZ0lQZqNYhI88+w9HJe/Ew wtuqG9i1KNVfxTfxW92OtLKvS1N5Iv2Ed1Q6TY3bHJHMTBdnCdrLU3ZaKYBmW+yWPs/dgB EywI4++HE/peWduEqWFElC6sefgAIDxPr31XmuIwR3ygLzk+zhUo9uIiZFh3EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zz7ncSqz9lIHVqwO2/bUdZ7JeP6py88N4gNEPv8SoX8=; b=dG/1UApnCMAjC4eijbKNUKclB8QC/wkGz+Nuf2PIWi455tqF9vBoOZGCl6FaFjr+pQHW+b eivVFGVosHB2wGrMetMPZMtgzO0L/p1fpqyUrWfqNzvanZ3MEStPWMxMKjUFgkxT/pvt1o /bt7u3rwqWiFwCJuV6A44A46YsTBBQiBXY/qBUJJIwN8RQrX3QSFjwNIb6wEhlK8WcgqPm dVnLiG3JAPi7iPFEfi2phTTmvsB9engHdz5CU7frQDykIoSikB7HuVs65CDt3z6jcia8bw mLaV1XMRcDGdaU33LNO5lLlnlNA93A4SFau6LbGjJ6zk72d4OZ3D5HBT+rlq4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974350; a=rsa-sha256; cv=none; b=KTOLdgi8T0XooJjqsUVi8TU1mCqrWqch3idW1XNmLDIhzVfHAH3sqMXwtdD9HbeombLVHQ ddTWtpROK2+49qNwc6yI2XKgxZ43PVpqA+pGNfNFgUdRsMXy8vqzZCk8KespHqZo53juMp GQQrluGmq9epjDR4aiTFci69GjYkMedbmOsJvpsqoO//WmYVJzVQ9k+yk9L7H94pUaIKs6 kAhKyFNGyJtQfA9e0ADVMDQx+UFGebbImvKFDSuqrht1JC/Ye5g8BxDjYbag6XR5hGk9SL AsBjAQ3HLcWt++JPW948NIRvxF9aTB1Lxl4I41547hAx0wFPu0XFAO/+ktMY2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffqy5GFhz19gJ for ; Mon, 29 Dec 2025 02:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c75a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:12:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5143ea18e510 - stable/14 - pmcannotate: avoid accessing uninitialized local variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5143ea18e51042811bfb8be2b14e57befbde10fe Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:12:30 +0000 Message-Id: <6951e38e.3c75a.2237d33d@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5143ea18e51042811bfb8be2b14e57befbde10fe commit 5143ea18e51042811bfb8be2b14e57befbde10fe Author: Dimitry Andric AuthorDate: 2025-12-26 13:37:47 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:11:35 +0000 pmcannotate: avoid accessing uninitialized local variables Initialize `tbfl` and `tofl` to NULL, and check whether they are non-NULL before calling remove(3) on them, to avoid warnings from clang 21 similar to: usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tbfl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:57:9: note: expanded from macro 'FATAL' 57 | remove(tbfl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:12: note: initialize the variable 'tbfl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tofl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:58:9: note: expanded from macro 'FATAL' 58 | remove(tofl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:19: note: initialize the variable 'tofl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL MFC after: 3 days (cherry picked from commit cd880010c49a5d4ec529f4204d4e88cd27727255) --- usr.sbin/pmcannotate/pmcannotate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c index c00e4b2a33bc..9c11018135c3 100644 --- a/usr.sbin/pmcannotate/pmcannotate.c +++ b/usr.sbin/pmcannotate/pmcannotate.c @@ -55,8 +55,10 @@ if ((ptr) != NULL) \ perror(ptr); \ fprintf(stderr, ##x); \ - remove(tbfl); \ - remove(tofl); \ + if (tbfl != NULL) \ + remove(tbfl); \ + if (tofl != NULL) \ + remove(tofl); \ exit(EXIT_FAILURE); \ } while (0) @@ -703,6 +705,8 @@ main(int argc, char *argv[]) uintptr_t tmppc, ostart, oend; int cget, asmsrc; + tbfl = NULL; + tofl = NULL; exec = argv[0]; ofile = NULL; bin = NULL; From nobody Mon Dec 29 02:13:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffrj74YCz6LWGG for ; Mon, 29 Dec 2025 02:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffrj4c55z3l9y for ; Mon, 29 Dec 2025 02:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rdjEyNTRQ2sqZXN5FjWF6v9zxsSpnKE8Pxl6Ro4T5M=; b=BYWC2xj8XlAgCahaBEE3bmF4R84+XxRPJFYbFwNRbPu63uFHbVCULmIEOUQHvJ11ohgQVi Hu1ZtpGDscNNUTcGxIp0uHOXLgHuSbGzlf6Flzp2aQ5C5mxGDTXsUBdWSkSvJxVvS9189h 7H2KolKgaA6+6t/OGDna2Xbqzccyo8qaB/mSp+l4iFfpJLZeKqpJ40KD9Xwb86eJMxRlsD WdzM/vp0vcNfj4sek8Z7XqLY9x9O6vIR1dmabEGSnExIEOIEpgVzHUdMgXKGBsAthEo7Rb iyvVIvuVFQHWqejAyU5rhUG3iCKU1Qken230FI5h6iDNtV/y//q3KQidZGijJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rdjEyNTRQ2sqZXN5FjWF6v9zxsSpnKE8Pxl6Ro4T5M=; b=hYckGTXp770cDKsRTVVOZpVtlOh0yF04YTdeK0JYG7ecfiJmPwFP989HeRITHcmRghfZ0z DEQfurUht/+76niEX9Uecv8ukIcN32CZpbAhHYggGxPXrXJwSN2RbL7K300cLNpGGZJlMB RlAoc8XnUSWt0RsoYAGqWwOwgLfKwJ0H4MXZDjQtCPdW9aBjhCVGvlHREVsjTfeObGMbxu hJkDrAZyZ2cNo5kND5vZ9M630LnAipSdgdwwhhKyqH8KfNVDzuPwfOy7Cn/m2FSuczrHfh cjbS+jqvzA99I7tf51UrTbl64bdBvpGXGJum8b/yrbFrzZCa3gVuItUD7Wt16A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974389; a=rsa-sha256; cv=none; b=iBJqYQBsa2u1lgUHl2dZxF0gz7H1XzbbrWzGBBDetguoM5PqeiMAR+sff+3Caar1xz2Ui8 TiFZYSXcc4a+inEBWvYpjDePOePGWwTf1E9TtC3ZLj5zCsdZ8zOV/q1nPzbsCU7aiumkYo y65K+igVmMPM/HRu+bKBmS0mgwH5BKkGtInqfMZTJu1DqCHkm1UcXT2YBFN8HlG/y2tKvB jkvEuVgYdcqMVEuT+WbT1iHagbkQ5Oa1cInniqArroduwSwa5yHqjqO7QUlzkBRmFRx4+0 AW/yA0mJGFoYECWJhcJYQu/sN6j1NZ3t1/G4/nNr/O2ZNThFRdQmKaMoSfAf9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffrj4CRHz19RK for ; Mon, 29 Dec 2025 02:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f334 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:13:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1f5a55504f09 - stable/13 - cuse(3): annotate cuse_init() to suppress thread safety analysis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1f5a55504f09ff4b236dc3d414d30e42b7826336 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:13:09 +0000 Message-Id: <6951e3b5.3f334.7bfd974a@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1f5a55504f09ff4b236dc3d414d30e42b7826336 commit 1f5a55504f09ff4b236dc3d414d30e42b7826336 Author: Dimitry Andric AuthorDate: 2025-12-25 18:02:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:07:14 +0000 cuse(3): annotate cuse_init() to suppress thread safety analysis This avoids warnings from clang 21, similar to: /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 111 | TAILQ_INIT(&h_cuse); | ^ /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 112 | TAILQ_INIT(&h_cuse_entered); | ^ /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] MFC after: 3 days (cherry picked from commit 5629b5cf79934e0b94ddbbd93b7756f74fe4050a) --- lib/libcuse/cuse_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcuse/cuse_lib.c b/lib/libcuse/cuse_lib.c index 3f040d0eeeda..48c72258106d 100644 --- a/lib/libcuse/cuse_lib.c +++ b/lib/libcuse/cuse_lib.c @@ -93,7 +93,7 @@ static struct cuse_vm_allocation a_cuse[CUSE_ALLOC_UNIT_MAX] pthread_mutex_unlock(&m_cuse) int -cuse_init(void) +cuse_init(void) __no_lock_analysis { pthread_mutexattr_t attr; From nobody Mon Dec 29 02:13:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffrk6xrwz6LWCv for ; Mon, 29 Dec 2025 02:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffrk5HF4z3kv6 for ; Mon, 29 Dec 2025 02:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8CMkBSHpKTl2aqC0G/x4gvIsNTfle0F4qvcO85sFvA=; b=xjni197JQ+vbgSnw85C2zk2Oq3ZTF69hYoQvNELa56KwOHiZgc3DIOQqWv5WLDvVtvv7gT AbDJvQmuskI3q7GCkUvLuyJuLkaoV/qcuMNCay3bTSHr8DGEH8vcRRaQH/727vSjLWsqh6 xsFc2ECNix6s7QuD/YOW92+Ft1D7BLk8FKAF0E+4+SOPJXHBeLVNfkLontRteFA1BM1NLD ZD8Tp8OJ5BzkqJt90Aa7kVXiCAb7DwNSHftC3UYlCw848k3s4oFsOEWNM6ytja333wyF6M fRx6fDdY0wvOvgcWV8f2LPTcvf24ol6KJ96Lq45C/uMn+fLULmq3SrPBwfUnNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8CMkBSHpKTl2aqC0G/x4gvIsNTfle0F4qvcO85sFvA=; b=vmoupjhewxUfMNbrtBHbgtxX6Zy0KZDSmP9ZYRM1U1NsvVvlGRejOKDwYpwlakEJ9S41R8 zbwxVfr4gcROL45q2MjIVhCwfyV61pTiS1Il6RleMDYRdQm12hqM+Y5iih/ijm7Cndya08 9aWBKg05xGF/M8zUSqt+h9PopxJrVW4z1rdxjFsBL1I7a9SS5rzH1uuPkTaBofUBNZKlO7 gOvvp1rM78GsB+tmGE7JwOgzjnm3MIkFLd/dM0nUfc+bY8f/CbpFQWukG37nLCVvaUOw8O BXBXV6bqwsHnc29QdvQIwHCiwS7/ysbuMFLRjqrkBuwg1WtCL+QGjFN5+VKhKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974390; a=rsa-sha256; cv=none; b=we0gy1Z6M9pgiRDBEm+d1yKVfIx63ZbtEHBw4obKKip9W6Vbqz38zTH2Ou4Fb14B9sdqsY BWq/NGInO7nXdZ9cJ6qRxBmXNknnFUJ9HwbgbZxCaGkbgIjNy69EcgCju5/dTSb/R0Ny9m Buf/WYmqNkznv10fbs5IXN6M9UAcK5LlNWsU0Bi7IM81tek2qOksxyYU1fm09DM6EFlwS9 I0AnwkdmXW6CgUdZGXpXb7w0HUzdKenH7cFWus4OsCPCEFEHjxu5QQB9/DVc64ooGUBANg ztSdfuutX674Wo1V/IbKE58sb9qjEldhnBaH8uwoNRBWVX73tb04/VIJBKLGrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffrk4lzWz19T6 for ; Mon, 29 Dec 2025 02:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:13:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d56ebf78c5a4 - stable/13 - Reduce number of external symbols in libllvm, libclang and liblldb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d56ebf78c5a4a6fdc1fd79666d9bdfa55326bbbf Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:13:10 +0000 Message-Id: <6951e3b6.3e9db.52d677b@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d56ebf78c5a4a6fdc1fd79666d9bdfa55326bbbf commit d56ebf78c5a4a6fdc1fd79666d9bdfa55326bbbf Author: Dimitry Andric AuthorDate: 2025-12-21 21:37:57 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:11:42 +0000 Reduce number of external symbols in libllvm, libclang and liblldb In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, upstream builds the shared libraries using several visibility options, which reduces the number of external symbols, and makes the libraries a bit smaller. On my test machine: * libprivatellvm.so goes from 75643 to 34706 symbols (~54% reduction) * libprivateclang.so goes from 53250 to 33531 symbols (~37% reduction) * libprivatelldb.so goes from 27242 to 18798 symbols (~31% reduction) Note: to get the full benefit, a clean build is required. Incremental builds should still work, but I didn't want to force a full rebuild on everybody. MFC after: 1 week (cherry picked from commit cf1eaaf41cefe7e3aef45f6dab862191a3939ed8) --- lib/clang/libllvm/Makefile | 12 ++++++++++++ lib/clang/llvm.build.mk | 1 + 2 files changed, 13 insertions(+) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 2060f5f52c91..9ea816fd4e10 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -49,6 +49,8 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB + SRCDIR= llvm/lib # Explanation of different SRCS variants below: @@ -2051,6 +2053,16 @@ SRCS_ALL+= ${SRCS_COV} SRCS+= ${GENSRCS} SRCS+= ${SRCS_ALL:O} +# Optimization: for all source files under Target/*/*, use -fvisibility=hidden, +# which reduces the number of external symbols in the resulting shared library. +# This is also what upstream does. +.for src in ${SRCS} +. if "${src:MTarget/*/*}" +CFLAGS.${src:T}+= -fvisibility=hidden +.info ${src}: CFLAGS.${src:T} +. endif +.endfor + llvm/CodeGen/GenVT.inc: ${LLVM_SRCS}/include/llvm/CodeGen/ValueTypes.td ${LLVM_MIN_TBLGEN} -gen-vt \ -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 2d8d9a2b0fcb..af7e501c007d 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -124,6 +124,7 @@ LDFLAGS+= -Wl,-m,elf64lriscv_fbsd CXXSTD?= c++17 CXXFLAGS+= -fno-exceptions CXXFLAGS+= -fno-rtti +CXXFLAGS+= -fvisibility-inlines-hidden .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) CXXFLAGS.clang+= -stdlib=libc++ .else From nobody Mon Dec 29 02:13:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffrm0vMHz6LWLy for ; Mon, 29 Dec 2025 02:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffrl5x0zz3lFx for ; Mon, 29 Dec 2025 02:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Vyt3Lx0haNtr4gOo3QwDmiPgiEiVUd40SBnljhau20=; b=AvKM/wWJzSMA95Hn5gQaZyHi6743hM4t1lEo0tiGEX1GDjX0AoNPtUaVP6RFL8cecfxjl7 e/1bml4nchas6DcoHyAEWaYE4B8xVJdZGSTxZ3CGlYZ4yz1H4QDZSb93JyWbiu4dV6hi0Y PZDTLnxfPt0P3pvXX+9Moe9DitCAQSME006AuYZQbo9PKyej97Zq8Mk2YD5HnO3fEugPn4 5bXwWAxcPvNhCsOILIpVySPMN65z1q5Ar59V4mJwYUCLvnHEF8Be4rCET2pOyWdeuCbRBN ITPHPLAhaM9wvF44kgOczRk9UNoslSepxSv8BMCxAT3UUSsFFeGRi4ERxg4Crg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Vyt3Lx0haNtr4gOo3QwDmiPgiEiVUd40SBnljhau20=; b=HlTVRHxHKv4AjAmAM8zuvQajJnbUuhi7N9h9t7YPRNJliSP6jFbaTq3XWugo0hV9m/Gnum aYdRFFxg6jEThY7/qDgfPiYmLAH78bHES6moo2eAAqJq/DVYHvNo0PWW6/ZEJK5G3wZz+h 5epARnXVysMNScJJOLgjZggB6U/GlsyuUyxud4n585PW/gm889TzZa4/K9Uj5eElALpX0m o2SVO4Ltcb06KOHVrOgXsxX2JDqzQG3P01ACvHHgJlbjLpJiNU48CmP/OgpTcKpS+gNP8Z XM1K7Qcs/h+iHBS0h7wzEFgiIUGILEzX4AqnUGMrrT0YIQjHjE3poQb6CCRCvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974391; a=rsa-sha256; cv=none; b=fEtILaLLfpJX+ai54jP4wCSUDGlgk0guvosoPLz12ejq4SxfsD/sJNx/w3PieI71eszO01 THBI9C+uHq3NLDw/mmiVZRGj+ez4PgivvT8Alx21bo7gAKS5vfX3/CpZ2HFO8ZgJW7Uvuj SBDOtv/I4Ad1NHKjy2jxUKedX+fX6fpYj+mj1iNu7K+pnCPB4GehKB0/HAnc8/l3wrbaky X4GIvsRbvXE8KU2YeOydD1jIe1ElYzMmAlzeqTXGmZ1qpN1ASKU06DmEOrsSftz4jhCxdk GG8tpXTv6USeWqbQsVOtvxvZSyBRiF9jk3UPGcBpyGfNvNmi7nkUmImGmiE+9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffrl5Qskz19jh for ; Mon, 29 Dec 2025 02:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c853 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:13:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 61383038bc77 - stable/13 - Remove debug crutch I accidentally left 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 61383038bc7709d9262bfc2e9f65e3d6837650c1 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:13:11 +0000 Message-Id: <6951e3b7.3c853.22130dac@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=61383038bc7709d9262bfc2e9f65e3d6837650c1 commit 61383038bc7709d9262bfc2e9f65e3d6837650c1 Author: Dimitry Andric AuthorDate: 2025-12-22 11:49:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:11:53 +0000 Remove debug crutch I accidentally left in Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 3b1126208f44a90c7dc04a87207e54b22d45893c) --- lib/clang/libllvm/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 9ea816fd4e10..835da5545e81 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2059,7 +2059,6 @@ SRCS+= ${SRCS_ALL:O} .for src in ${SRCS} . if "${src:MTarget/*/*}" CFLAGS.${src:T}+= -fvisibility=hidden -.info ${src}: CFLAGS.${src:T} . endif .endfor From nobody Mon Dec 29 02:13:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffrn1mrrz6LW7m for ; Mon, 29 Dec 2025 02:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffrm6mVbz3l89 for ; Mon, 29 Dec 2025 02:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aCQa5a/+nsTmv9Mdszu5lbNsQae1kqZuL5E/7fXpBTA=; b=G+Y27S5qF5VYb2tQMQK2w4wfA5hCcOtBnvkqty3e7c3RXlC59CgQ4EIMieoM4nphPudNou HvK7u2xpxuiVT4rFoiFJY8JabxRT32+3ICEoMNR2mHX9L0x218h/hqPKvfao9JiGYdw97y 3npX2h0Cx1juTd4Kvs5SGfDa9kDpLBhXLeaHTl3g2S1NdOwzhUfaaOjHuyUx2kX1spSdh3 7QTC+ay8+sZa6nqu+mGGAEnSHdqk+BZYXJB0vfqTR/NbaMHXH2wvWjcGhamE6vjKu27lRo ZtiPJL0GZ5itbcofWVkcCHurBt7PMKbCu+42Bd4rHoGVePdQn7xByRuDzCUe6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766974392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aCQa5a/+nsTmv9Mdszu5lbNsQae1kqZuL5E/7fXpBTA=; b=t2b/inryg9spMwgOIW9/aQfZwJYSu4NwEDjDiJdx7Jo6iOsWB5Y7T9667Ktj9AILXw3jgu IaeApvajD67QhXgTcvjeyzt89n8WNxnhJPy9CH7IGLuIJnyGRAjO7vzSGdq/z2nhzN/Cpj NR52CGf5MPLdt7yxv5QtNjRZRM5s8lSCPutZ7deyCqb+LzmZHYIygGr6+bk/AmD4/VYvEQ LZ5rWHUNImWsssbQRNKcTIHCOwybaLyiWP9GXUk+9SkBQIbl8Mtq2I5j7OIAHBY3KEpQNr 55s7nDK5aZdVAlJLDuzwpZlvGxF+kdHw0v2x1FoeXZYgQld3lwDSbpyr0AUteA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766974392; a=rsa-sha256; cv=none; b=wul9jMhERJzjfvKymwo5pVP0bi1PgFex8zwIp/YTbNa+VKYN+eQB+sBA0uF7spKJ3/vdke k5cS+MK/nfPm7hz4jqNeTfM/oyPnr3Cz3z+dBoxctBynIv048csiV2zLwMAixR8/UoTAR9 D/KTKxu4nXyaz4qQWWhixbNR3dnSABt015zjyY1lUFHMHTB4mkweuX3DgnC8ca/IArBj0n T29VfzcINTxXyjc5ccYXwT95ToQeM8TRz3KkPHc6/d1GjXQssKQ63VUMbdl3WNKEuMOJ5z g98fadu8fqtj8ofTfBlmOAMDySMlFU0d9rW47lTPSJIXQnPFab9TwWadtM0pKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffrm614Rz19RM for ; Mon, 29 Dec 2025 02:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:13:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 14ab9445f714 - stable/13 - pmcannotate: avoid accessing uninitialized local variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14ab9445f71454c21620f9a7f69352bea1349779 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:13:12 +0000 Message-Id: <6951e3b8.3d4bc.7bfae91a@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=14ab9445f71454c21620f9a7f69352bea1349779 commit 14ab9445f71454c21620f9a7f69352bea1349779 Author: Dimitry Andric AuthorDate: 2025-12-26 13:37:47 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:11:58 +0000 pmcannotate: avoid accessing uninitialized local variables Initialize `tbfl` and `tofl` to NULL, and check whether they are non-NULL before calling remove(3) on them, to avoid warnings from clang 21 similar to: usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tbfl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:57:9: note: expanded from macro 'FATAL' 57 | remove(tbfl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:12: note: initialize the variable 'tbfl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tofl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:58:9: note: expanded from macro 'FATAL' 58 | remove(tofl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:19: note: initialize the variable 'tofl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL MFC after: 3 days (cherry picked from commit cd880010c49a5d4ec529f4204d4e88cd27727255) --- usr.sbin/pmcannotate/pmcannotate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c index 32138aa6c3a7..0044f6aa7d9e 100644 --- a/usr.sbin/pmcannotate/pmcannotate.c +++ b/usr.sbin/pmcannotate/pmcannotate.c @@ -54,8 +54,10 @@ if ((ptr) != NULL) \ perror(ptr); \ fprintf(stderr, ##x); \ - remove(tbfl); \ - remove(tofl); \ + if (tbfl != NULL) \ + remove(tbfl); \ + if (tofl != NULL) \ + remove(tofl); \ exit(EXIT_FAILURE); \ } while (0) @@ -676,6 +678,8 @@ main(int argc, char *argv[]) uintptr_t tmppc, ostart, oend; int cget, asmsrc; + tbfl = NULL; + tofl = NULL; exec = argv[0]; ofile = NULL; bin = NULL; From nobody Mon Dec 29 02:55:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnH2bJyz6LYm0 for ; Mon, 29 Dec 2025 02:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnH0T4qz3qQw for ; Mon, 29 Dec 2025 02:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URul1NHlDoEuEDph1mLSxQrOxL81Kz/IgJkEx6sko3w=; b=kF/mmBuDBmkclJ47DrJy0wdRsrv7jA0Oo0u1DZvz8dsoli5FJNyzRfzZUZFFaT0NuLGwPz NcPdLOk9gMhNSPLRCRW7UK1F7+PxD4JN1jusxIma961y3CM2s5BZjojDfiPDi8QmxfKePL 9SxDDZoNnA8uaUgD7K9rFeKJaG452danAoCCiJsnJqX9kBSuxwFGeMxpx3lwBZJnG0+6fw /bo4mHcOf+r29YmZvN8u4KxJpG6AyRGzztflWK5uXtBhUPQHfnh0QiXpYL2OLgo/5gC5+k zt9g15v1eYEA/o5+X2C5lBpLdgSqH4Q0h+bXa1M70nMbtUe5ePwaCUIENn8kMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URul1NHlDoEuEDph1mLSxQrOxL81Kz/IgJkEx6sko3w=; b=NUK0kXSxPe1gcDruc2rQQ6n2coPEEUARY1+lvhjenTFiWxvd/JPk7zWhLHaMhAARZF1tcn 0h1mdfjA13mXV3vRS7YbDooKmhR/HnaIir0q6WDCIoKO0wDO3ZB5fM9NRC4NbMDRtBQqVx YIsZNHtOWJq+WOSKoUISzeCJgF8U85skjXX9l1fLBj/m8AI11+YYhKgNRKm1A4Pb0mxvsS 3jkGO169HdZRkBd7PFwgoVhC41RpVlkfKaRzadRbhitLJYMxo3+exWDOUQmXibwmYWTwTE VVKs0NmVwVg06oM6ZMqa0M/Hn7sHVeXeBTb5b/0vOJpWaUYkl/q9Bra50bpxGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976915; a=rsa-sha256; cv=none; b=r3kB54r28WQxxhTkuS7lfmXy6OSTg7TI0pbQW225nJtnan70Q+jXNzwBJmckk+CY6FU+sZ a7H+zsvMkP9ROq2MYzLVmjxkfFS2qbx+GIbshI5MdHmf8kRCKEGC87q+VZxZPnNDulaNth 6+k1QhyeV4kV+CRaZmZrRbOFy962DF0gwqt1fUDG5eeaqD63QSrs67t+sjnQy4Yi/PYUGa QBp0SpgD9LwVZqBcNtXGFtBLn+se14+UexAXOz3dJlMsyzPcU3VolADwW5MzJzLc6hqgM8 pot/h8egCbgXyioCxhGogE05oBSalv9CBg/w6vXn/DcRW7mCpHiZ0lPGcVDRRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnG6h0Nz1B9x for ; Mon, 29 Dec 2025 02:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 954d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 32ea8209825a - main - LinuxKPI: 802.11: add compat.linuxkpi.80211.IF.dump_stas_queues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32ea8209825af594cbfa1fc654d45eb9a6aab528 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:14 +0000 Message-Id: <6951ed92.954d.6416043b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=32ea8209825af594cbfa1fc654d45eb9a6aab528 commit 32ea8209825af594cbfa1fc654d45eb9a6aab528 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 17:03:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:48:14 +0000 LinuxKPI: 802.11: add compat.linuxkpi.80211.IF.dump_stas_queues Extend the normal compat.linuxkpi.80211.IF.dump_stas sysctl by queue information. This was helpful for debugging various issues, like selecting the outbound queue, stopping queues for BAR and helped finding multiple bugs. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- share/man/man4/linuxkpi_wlan.4 | 9 +++- sys/compat/linuxkpi/common/src/linux_80211.c | 78 ++++++++++++++++++++++++++-- sys/compat/linuxkpi/common/src/linux_80211.h | 4 ++ 3 files changed, 85 insertions(+), 6 deletions(-) diff --git a/share/man/man4/linuxkpi_wlan.4 b/share/man/man4/linuxkpi_wlan.4 index 136e04c32bb7..65c77d8d7631 100644 --- a/share/man/man4/linuxkpi_wlan.4 +++ b/share/man/man4/linuxkpi_wlan.4 @@ -6,7 +6,7 @@ .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. .\" -.Dd June 13, 2025 +.Dd December 28, 2025 .Dt LINUXKPI_WLAN 4 .Os .Sh NAME @@ -112,6 +112,13 @@ Print statistics for a given, associated .Xr wlan 4 interface; typically IF would be .Em wlan0 . +.It Va compat.linuxkpi.80211.IF.dump_stas_queues +Like +.Va compat.linuxkpi.80211.IF.dump_stas +but also print queue statistics. +This sysctl is +.Sq hidden +and normally only needed for debugging purposes. .El .Sh SEE ALSO .Xr iwlwifi 4 , diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 02724433d89d..28c9c62309fe 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -282,7 +282,7 @@ lkpi_nl80211_sta_info_to_str(struct sbuf *s, const char *prefix, } static void -lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) +lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s, bool dump_queues) { struct lkpi_hw *lhw; struct ieee80211_hw *hw; @@ -292,6 +292,7 @@ lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) struct ieee80211_sta *sta; struct station_info sinfo; int error; + uint8_t tid; vif = LVIF_TO_VIF(lvif); vap = LVIF_TO_VAP(lvif); @@ -376,6 +377,39 @@ lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) sbuf_printf(s, " he_dcm %u he_gi %u he_ru_alloc %u eht_gi %u\n", sinfo.txrate.he_dcm, sinfo.txrate.he_gi, sinfo.txrate.he_ru_alloc, sinfo.txrate.eht_gi); + + if (!dump_queues) + continue; + + /* Dump queue information. */ + sbuf_printf(s, " Queue information:\n"); + sbuf_printf(s, " frms direct tx %ju\n", lsta->frms_tx); + for (tid = 0; tid <= IEEE80211_NUM_TIDS; tid++) { + struct lkpi_txq *ltxq; + + if (sta->txq[tid] == NULL) { + sbuf_printf(s, " tid %-2u NOQ\n", tid); + continue; + } + + ltxq = TXQ_TO_LTXQ(sta->txq[tid]); +#ifdef __notyet__ + sbuf_printf(s, " tid %-2u flags: %b " + "txq_generation %u skbq len %d\n", + tid, ltxq->flags, LKPI_TXQ_FLAGS_BITS, + ltxq->txq_generation, + skb_queue_len_lockless(<xq->skbq)); +#else + sbuf_printf(s, " tid %-2u " + "txq_generation %u skbq len %d\n", + tid, + ltxq->txq_generation, + skb_queue_len_lockless(<xq->skbq)); +#endif + sbuf_printf(s, " frms_enqueued %ju frms_dequeued %ju " + "frms_tx %ju\n", + ltxq->frms_enqueued, ltxq->frms_dequeued, ltxq->frms_tx); + } } wiphy_unlock(hw->wiphy); } @@ -393,7 +427,28 @@ lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) sbuf_new_for_sysctl(&s, NULL, 1024, req); - lkpi_80211_dump_lvif_stas(lvif, &s); + lkpi_80211_dump_lvif_stas(lvif, &s, false); + + sbuf_finish(&s); + sbuf_delete(&s); + + return (0); +} + +static int +lkpi_80211_dump_sta_queues(SYSCTL_HANDLER_ARGS) +{ + struct lkpi_vif *lvif; + struct sbuf s; + + if (req->newptr) + return (EPERM); + + lvif = (struct lkpi_vif *)arg1; + + sbuf_new_for_sysctl(&s, NULL, 1024, req); + + lkpi_80211_dump_lvif_stas(lvif, &s, true); sbuf_finish(&s); sbuf_delete(&s); @@ -4173,6 +4228,11 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], SYSCTL_CHILDREN(node), OID_AUTO, "dump_stas", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, lvif, 0, lkpi_80211_dump_stas, "A", "Dump sta statistics of this vif"); + SYSCTL_ADD_PROC(&lvif->sysctl_ctx, + SYSCTL_CHILDREN(node), OID_AUTO, "dump_stas_queues", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_SKIP, lvif, 0, + lkpi_80211_dump_sta_queues, "A", + "Dump queue statistics for any sta of this vif"); IMPROVE(); @@ -5690,6 +5750,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) LKPI_80211_LTXQ_LOCK(ltxq); skb_queue_tail(<xq->skbq, skb); + ltxq->frms_enqueued++; #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_TX) printf("%s:%d mo_wake_tx_queue :: %d %lu lsta %p sta %p " @@ -5719,6 +5780,7 @@ ops_tx: control.sta = sta; wiphy_lock(hw->wiphy); lkpi_80211_mo_tx(hw, &control, skb); + lsta->frms_tx++; wiphy_unlock(hw->wiphy); } @@ -8121,6 +8183,8 @@ linuxkpi_ieee80211_tx_dequeue(struct ieee80211_hw *hw, LKPI_80211_LTXQ_LOCK(ltxq); skb = skb_dequeue(<xq->skbq); + if (skb != NULL) + ltxq->frms_dequeued++; LKPI_80211_LTXQ_UNLOCK(ltxq); stopped: @@ -8769,18 +8833,21 @@ linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) { struct lkpi_hw *lhw; - struct ieee80211_txq *ntxq; - struct ieee80211_tx_control control; - struct sk_buff *skb; lhw = HW_TO_LHW(hw); LKPI_80211_LHW_TXQ_LOCK(lhw); ieee80211_txq_schedule_start(hw, txq->ac); do { + struct lkpi_txq *ltxq; + struct ieee80211_txq *ntxq; + struct ieee80211_tx_control control; + struct sk_buff *skb; + ntxq = ieee80211_next_txq(hw, txq->ac); if (ntxq == NULL) break; + ltxq = TXQ_TO_LTXQ(ntxq); memset(&control, 0, sizeof(control)); control.sta = ntxq->sta; @@ -8788,6 +8855,7 @@ linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); if (skb == NULL) break; + ltxq->frms_tx++; lkpi_80211_mo_tx(hw, &control, skb); } while(1); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index fcbef46fc6de..d4f18fcafbba 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -154,6 +154,9 @@ struct lkpi_txq { bool stopped; uint32_t txq_generation; struct sk_buff_head skbq; + uint64_t frms_enqueued; + uint64_t frms_dequeued; + uint64_t frms_tx; /* Must be last! */ struct ieee80211_txq txq __aligned(CACHE_LINE_SIZE); @@ -180,6 +183,7 @@ struct lkpi_sta { bool in_mgd; /* XXX-BZ should this be per-vif? */ struct station_info sinfo; /* statistics */ + uint64_t frms_tx; /* (*tx) */ /* Must be last! */ struct ieee80211_sta sta __aligned(CACHE_LINE_SIZE); From nobody Mon Dec 29 02:55:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnJ1WBkz6LYm1 for ; Mon, 29 Dec 2025 02:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnJ0YFhz3qSw for ; Mon, 29 Dec 2025 02:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1jTz+hJsqA3TllZkZ+nh9T/DU9s6M/MHbUdkbYjNCg=; b=LeJ8k2+91XmOurx6xAPEyp7l5ECiMfD658ofQVqgsPtWHOaIQeppzBhtWQBKKo/th2cij3 sNOZMUIeCGb9dxQU7CRfRGJBKiKgPPiXnzrWOwrzhu2royvf0NnLlNuWA3B0B/M1BrWMuq IJ3hh51wIWPa1WczMxzn/Dq4tTzVumVe37d4UH4+zk8Xq6ZA21fYBGxLcA7+nckvqpsKqm nhyKqicKPOJPUrS36hq4C8iuAWRa9xxCK2RbP55H2MAZV0OdRx8Hd27iIIyoqVHt5+9ae9 remW4MeZAf7SIAhQGiE0JAmEBNwpqkXya5Bzj+Hx6ouwo0m/GM0QPNZVsKoN9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1jTz+hJsqA3TllZkZ+nh9T/DU9s6M/MHbUdkbYjNCg=; b=R+7yvJICjupyZKpIJuvAI0Kl/60NI2BCa6Xshxv2t3jpMoqHq5TK1vO1pY/n9IKeOMT/28 PXXLuuAaZn87azlEB4VdTODZey3M+S3eSotYNZD3nRZ5wa5E91dnL/56XpqRmpnkWSwkOS tXhmdYyiMyAbWKp9H26Vy0NVLay10Ef+Lr8U7ruCO1NRY729t+hJeLF9ctl1J3vNQ8sl2v bJaTZFqAo/OnjUMEXDtERYiWnBhQJNG2tCQ42rF8QJgQ7FXZfrGU9UF1HeD1OhMWDsOFQL bExOepbCRrL5VtrRez19TkBIBiVKPMgFAIrZbkjAFoRs/NsluJNN3auVx6RDNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976916; a=rsa-sha256; cv=none; b=Gl4s2deEB3EvHMq13UkxFbFGhd82b13V4+WMqjL0ZyWi2NtZ1PdKGGAJR3HW4S0hYaxfbx 3Jup1KnyogtbBxmoArs2XlcEz4vEy/Qxyhkgmxn3yufcbeDKT6acfa0SkrITXDpkYQFLST 9UjdWGnAa8tOXnM/LGxnxkmrtWmRZL/+8sa0z4ZmhIW7TJxDDOmQ/OTcIaHUgKzU+Ixy6W DMbq9vsF7aobq5I81kW75cfBPZ7zAaRGnQnEiTTVDNv8Cvhx4TwJDPqsUpjpw4nvzqwulC HnsAXFn4T6KK7xKMvaC/+Xd5xCsnfMrck5i4T81Z7+K9isogpp5FU2rvjtC3uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnJ06M4z19v1 for ; Mon, 29 Dec 2025 02:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8e4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9cf85457b13b - main - LinuxKPI: 802.11: assign sequence numbers to frames List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cf85457b13bc7aa125388d63c82acf2b21e9e9e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:16 +0000 Message-Id: <6951ed94.8e4f.5ff4c384@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9cf85457b13bc7aa125388d63c82acf2b21e9e9e commit 9cf85457b13bc7aa125388d63c82acf2b21e9e9e Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 17:06:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:50:42 +0000 LinuxKPI: 802.11: assign sequence numbers to frames While all native drivers were converted to call ieee80211_output_seqno_assign() after changes to net80211 if needed, LinuxKPI 802.11 was not fixed. Add the missing call. Given we are currently only supporting STA mode, we can provide sequence numbers for all frames (mgmt/beacon would be a problem in AP mode). This greatly helps LinuxKPI based drivers other than iwlwifi(4). If drivers do their own sequence numbers, they will overwrite what we pre-set unless we would pass a txflag not to do so (beware the consequences). Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: eabcd1773fa3, 785edcc2af5a --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 28c9c62309fe..45c46a4d34f7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5573,6 +5573,8 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif ni = lsta->ni; + ieee80211_output_seqno_assign(ni, -1, m); + k = NULL; keyix = IEEE80211_KEYIX_NONE; wh = mtod(m, struct ieee80211_frame *); From nobody Mon Dec 29 02:55:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnK5FDZz6LYgD for ; Mon, 29 Dec 2025 02:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnK1Q5cz3qN9 for ; Mon, 29 Dec 2025 02:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjIGxBN/vw6Lh3JZPQaAjN2KkU2Drug/VDc7w+WE3PA=; b=kmUH8H6kCqQzLKJ6UyNmBcp55vaO6gBFklCx+xFh6+pQp85NSL61Lw6DmHVg2GZ6BYVX56 8OaMbneLZw4+567LfOvyyHxyGdZeUDQIMGJkpicSMjUugnSdMaaOke5L7V0O2D2w9smEgY l7KWpWorWWkiUainBHCmAbYXl+g05Vx54jEyAYK3p2TKAgvakHhgy4nDtCAP1PUhSf4+6D IhUOr4fLfo2RZ+3Owme8eR+TRhYXceX/i4DtH14g0TqPW0BlCilVDQjSWZX4GxOt6dgOqv 0YfaO5/rt3NJmTybb3VKg1vHEXxlW8PUbtgLybZVhwGi+3v73gQ6r0C+1S4ifA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjIGxBN/vw6Lh3JZPQaAjN2KkU2Drug/VDc7w+WE3PA=; b=YNk0syyMWXemKpCLDxC6RAvc4vbUMto3OYehd0SK9gjMr5uGMQnvaDsNn9CZvAg8FZgjFQ QeHxuUMmB6ZNjA1s7vqPf7XBTdyqDI4t6ZaAYWGKbgRH5cBn7Hk9TSsytgY9c5M9fNTJgc O8WE5TxErFV4lBpQoHSjSsyh9StGCHqDh8G0H2oHCMnI2J143fPjeEFae2kz0GcUMrWHke ZPK1EbS3ZxNenj7ZgI9pi3AaD5t4YYZSUTz4L8HOKfraGk+F2TBaqCy2zg9E6YF9ot6Paz BmA4vYVO8QpsKe4lZiOXEVdeh2fZi/AA8k76SR5oQlMsNmPH32wbL7yZ9KvBcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976917; a=rsa-sha256; cv=none; b=aM0slqWaPXteBg2IYGG06C3aBANnIohxhfXpbLBtQW/wNAngj6/n6dJ4m254pqp5PxU8DR HWSteeBElZfqHrI0eDGNcsohYSIH0VlnwK91CAoJ0Pl11PM6Vrmh05WlZKQa2HTFl7st+W ho46yD4mfRv6J7bejA5o1Kkwp9buCsB/czqcdB89i3yRWnrWxygSO2UVLRLPbx2/aZl76o iMcB16Eoc0IsaYII6eH0xTMlmfr7NHN7T+em9/4OleyltyRFID+8umW/y0U5X8Gq5np9EE S54mvnXQiBWospNfEOaTQQ4D6cOzdLqdE/pUS6b6eYW2HSaRRbX+N5pqP/0N9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnK0xJWz1BGr for ; Mon, 29 Dec 2025 02:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8eda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f0395993e1ea - main - LinuxKPI: 802.11: reset hdr after crypto in lkpi_80211_txq_tx_one() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0395993e1ea83705e0da6623843e7d5d03f7269 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:17 +0000 Message-Id: <6951ed95.8eda.9ba7bf6@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0395993e1ea83705e0da6623843e7d5d03f7269 commit f0395993e1ea83705e0da6623843e7d5d03f7269 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 17:15:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:54:03 +0000 LinuxKPI: 802.11: reset hdr after crypto in lkpi_80211_txq_tx_one() When lkpi_80211_txq_tx_one() calls into the crypto offloading parts to possibly make space in the headroom, the beginning of our frame moves. We have to reset hdr after that call as otherwise later classifications based on the hdr->frame_control will fail or cause wrong classificaiton of packets. This makes sure frames will either be directly sent using (*mo_tx)() or use the correct tid for the correct queue. This helps to get rtwx8 packets flowing after BA was negotiated. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 11db70b6057e4 --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 45c46a4d34f7..f4b534122b87 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5729,6 +5729,8 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) dev_kfree_skb(skb); return; } + /* Reset header as data might have moved. */ + hdr = (void *)skb->data; } #endif From nobody Mon Dec 29 02:55:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnL4vw6z6LYm8 for ; Mon, 29 Dec 2025 02:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnL2jDqz3qR5 for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9C8JIzCXAVnOxx2lnsbcvIMgJknnj+ZkuE3MEKM2vTc=; b=OmykITYqnka4DmpyLaptys8gJjKtWrQH2uJJrVWoI0D3B+Sma144KM8ClOtvK8id/ziYzE c2rtHdDlP/tsj5PXmXYhLv8FlgQDmz9TfPw4iqUrQc+5OMnOhM5c9G2hol1ydv668bzIaW 67b7Gssh6BafAiYKQgefOaGzod/3W2Snml1p9jcIY5BPNuwWNEgASQRdo7PlUTD84y4id9 DPn2rnjruFyLkx6Gs9XmBjddS3uyOiDrtorJLpaBcba80MlG2RXlHqEt1nNuaYrgeg4EEh x7kn6C/HvSJOXOL2s6LPQgVSMfu326MWO+ToPoTvlqQ/HTEw4lgZkihEZQfEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9C8JIzCXAVnOxx2lnsbcvIMgJknnj+ZkuE3MEKM2vTc=; b=mZmfFY1WwhS6WLnUCnkUG2wCJLY+DrIyPwRlfn8KRrOq+DAKDM8rWEiHJyaKrZ/T0i0bxW AYVALjzP+OJwIOSGPyGeUHUMDr+ijDcZ1hB3iBCo3VaA2cfOZ7bJ15+ywlW82RJOL9HOWW I6T7mJCAqE4yFN9aQVMa7930iIamNnyOJOy0/w42BWi8v3L9BAvNvKdzbcWepUcAo7uL5a QvgJ4/VqzGeb6lhmri+5Q9vFhn2JJkwn/NyerzmEbBcBL0KfKc56fvaRnaq8ngUz/aFRPp QQaxfEwUvDZKcbRTObhgRyIptYQvNEVircA4dX7rToOWtkO8SiWo4QT5G1hAAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976918; a=rsa-sha256; cv=none; b=fNtcKLI8bO5bWLr1lO1a6DyhGftwxHX5FtjaFK4NRaXtDWiA8ZSSdu89en5VRmXWIdsbOo MjvtpxIyFOJm5IsX50ZHFtWeAvZ/qNQLoRFCcUPfshj+3eN00sB0I5fZ6SuTxv8hkCM88o CZQJZnIVKDPGtFI8vtnhJlW1sYk+2EDukbbePAaQMePn6F72LDYu1mKVn+CvhEJMqUZg3x 2ESfdVbnUt8IQJttOtJLh7iMRKqbtREl7C1oTBYXIcOOkg1L2hoDS26aggr5EEwrqs31hn Oq3qOZEFXFfiSBSCM4N2tSkQn+Grp2H9EN+6EvPSRUVhzNH3H4TFTmWAhEj1QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnL1k2tz1BjM for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 84f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8494be1b5af7 - main - LinuxKPI: 802.11: fix rx_nss with VHT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8494be1b5af7fe4f765532f802ac0a145e061d73 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:18 +0000 Message-Id: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8494be1b5af7fe4f765532f802ac0a145e061d73 commit 8494be1b5af7fe4f765532f802ac0a145e061d73 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 19:38:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:54:03 +0000 LinuxKPI: 802.11: fix rx_nss with VHT When fixing single-stream chipsets, like iwlwifi(4) AX101, we started masking the announced with the hardware supported values. This would probably limit, e.g., rx_nss. During these works we fixed a loop checking from the highest nss=7 to lowest nss=0 (8..1) and would set rx_nss if the stream was supported. This left us with always setting rx_nss on nss=0 to nss + 1 = 1. Instead only update once when we hit the first supported MCS value (highest number of supported streams). Looking at the diff of the mentioned commit hash which gets fixed it looks like even the old code was not correct either. This only fixes the logic to calculate rx_nss. This does not yet help with modern drivers to actually update the value. Code for this will come in a later commit. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: adb4901ac9ae --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f4b534122b87..1ac28dfef448 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -693,7 +693,8 @@ skip_bw: sta = IEEE80211_VHT_MCS_NOT_SUPPORTED; else { sta = MIN(sta, card); - rx_nss = i + 1; + if (rx_nss == 0) + rx_nss = i + 1; } } rx_map |= (sta << (2 * i)); From nobody Mon Dec 29 03:28:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfhW85GHHz6Lbdl for ; Mon, 29 Dec 2025 03:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfhW84gzcz3vC0 for ; Mon, 29 Dec 2025 03:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978884; 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=xo6n0LX4wbqmlDXP70vtnZr3orqfptmiWGSyKG7qs+k=; b=NKTLjf/x2LvhGLZPVa1NGYDEZSPEDZ6VK/JD/YFQv3YpYlZPdy9eHAXedpK5+rthS7lGFS M96XLwOs63IDlG0ZA+ZWzuaEKH0Ne7nTzJIQTpK4EBlO+iSjvcukfOakPcU9EevCoUcy87 87OZdXQJ4pJI1egrcIBDQoRk6Te07FzFqzF7TUvd+7TqzFB65vKL3PV/SwiOYQBhQyPRlg 3S/xTUORPEFT45F8CT4O2HXioc4AUBnTGBOCfz3/zt7wAbota9BD5yz5P9qoIZxyQuEoDe N+m5R2uLG+ExHEQ+PbNbs8SfJyrjmz/GejXOQUIN67kZWD6+IHRpZh0tE3qbrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978884; 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=xo6n0LX4wbqmlDXP70vtnZr3orqfptmiWGSyKG7qs+k=; b=oxWyhDfYB+Hyn2xXZ2BVIKdWG7a6Z2ZRxWyHCl2fdfSxG7V+JjOySPWl3uQW5fp1/R9JDk 1EO9tCIaUnNCcHHb2h+aqcU3cM/HYq5GrPuqAnsum9yrS0VvVVwtCmBO9CnrErM1BPAbuN +VzjA5wCGRnt6iUQNpYQZbAa/GqnrA68kcC9ARX2ogr6AEK4EKVomjBWdJNB6+rvPCEQmX hmhwEQsKE8lw7SqRTMoR3xHY81xIbhjw8GmrLSBwv+NupZes1bLEFSVky2Q+QwYCHqDxYi GKS7chLovppgvTIWMPzm4CmeWJwmHf8AwwGRJroqexRglJ7yxVVN827pTfvlaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766978884; a=rsa-sha256; cv=none; b=gz/w2gq6HUcE4BiE7CE45W+Kl86oSXQf4UC5N3Nc8ZIPaVDt5fl94u3MxvIo9nnNaFy2/E cXc6r/rIftEB2MtgYQ1klNNtkWMmZPcA0WqV4fyFQ3xniJhnaMBigXTYoGRKDo3tdxBDqI H73BPj/J/NgoBVCrWIK0BadJkalpBVZpDyK1fT/1PM4UYHv38+PAY+eCb6+RXhoW7i0shh y4dt/PfyGNCZg8o1bhJ68/rwYGzQdOgZ7KTUQYfIhR79hgNB8Abwe5yyJ358CDSlDBwL3C qSa9yhCXFI1lmUzE9A7tUMKYh+QupzyhSnTEYeNQSWFLiNot4tAvU9All4MKYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfhW84Cmsz1Cb8 for ; Mon, 29 Dec 2025 03:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c433 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 03:28:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Jorgensen From: Xin LI Subject: git: d1f275606d9f - stable/14 - GCE: Add TARGET and FS to image family List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1f275606d9fa2560606c4b6e515bc35d82699fc Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 03:28:04 +0000 Message-Id: <6951f544.c433.1d7d12c5@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f275606d9fa2560606c4b6e515bc35d82699fc commit d1f275606d9fa2560606c4b6e515bc35d82699fc Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:16 +0000 Commit: Xin LI CommitDate: 2025-12-29 03:22:18 +0000 GCE: Add TARGET and FS to image family GCE image family is meant to be unique per set of image characteristics so that a user can create instances using the image family instead of the image name to reliably get a similar image with updated software, but no other changes. Without this change, the instances create API would select the most recent non-deprecated image matching the name, regardless of architecture or filesystem. (cherry picked from commit fc83e6c5e1f20087314dc52b63e485db87a98b86) --- release/Makefile.gce | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 51dc5e3436e2..f67cc5da8d82 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -18,7 +18,7 @@ GCE_BUCKET?= GCE_LICENSE?= .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) -GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,} +GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" @@ -76,7 +76,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ - --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ + --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET} From nobody Mon Dec 29 03:28:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfhWB0Hvnz6LbNP for ; Mon, 29 Dec 2025 03:28: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfhW95Jsfz3v17 for ; Mon, 29 Dec 2025 03:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978885; 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=WM408knut/Im0/FG7TH7niLVgmTDI8llawCovFzL/LY=; b=xey4vRi4JJ2SVVMQ4j77q9tkqAuZiwkNeqxq3LySqSIz9ie7LhRWbMcLmIA88Gy+rA968l cEYw0u4jScQw+uII91FnvxvRbbiAOa3KTjMsSa5frSV1hlX7FxEmrpvD3MEDKRgY/iAx1b uhuvwdQFPS/MnbMUDrfDl4yHfVAtt7RM10jr51BiA1PTz2Se7aVo1HzqDq4+AFBLK7O6+O qhVWA28YS+sNE+qqd5k3WN9GKDDMDdQOsRAD135pw1hcO4YScDPY/RjEF/Ea9lHCjxC12W ziDeKpIl9w/yKrJfDsa7l8PrPdvzelatvsYxJ18BIJVUl4hY2HkxypuMBciDvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978885; 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=WM408knut/Im0/FG7TH7niLVgmTDI8llawCovFzL/LY=; b=vCp8h3yKsce1SH5+R7O37UnIks0ShSEgqb/ASjU6Oqj4yztJkaZ8a+h9sQgelCZCJNn+LY qbYwE06Q7WS8lrhuYHIXS5OXguDr1DJsXwI1fMRl+6CKdKyjDVW2X96ZGuV837cYCTKpTZ svLdHrUvvXlPIs90pxRxp1kIcPjg9pHV5c7HDYvXdFSpEpO0DiVGq8CeHCsiVc3017OLqb JkBeFKrjYdR3pd8qKAS6HBQaJAPMfOidlzg2KMY0PaPL8XzEuPb1rEtkzSbASdvB/pIG4Y LyX73+SpA+Bir6Gima2p8/+Bu7eS6kp9EraF9SG/CmWmR4+KVqo1njl2ZnAMdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766978885; a=rsa-sha256; cv=none; b=XZN8nsJjOTs+QDEx13a8Y24fDAJO3CpDJi0w1GG0XcpEPlhuvRkPgysSdvaE2cpbx0tLrO QoZrkKIWm7fjVJWzYIn+acOb+AMyuHObbYFXEjQWP9CByxSuM+gQ0rvhyIWiXhvCwdFbya vcU9gSTaMCm/R8B2iTv8DW1b7BBpUbDtZXNj2LpXrqYX2YTm8/Q86bV9/8Yos8M+kUetfJ oGH8N2xwGaz1W3bnlWQ43JjPIhVZ/7ZICToEEVFzgtYm1za5HqQ9tz6ekeZL4x3jqttAP8 7Wvzm9msrh+bpfOk9tXgy2lALhh57oDe0nOSluWXvyBB6U8SpvajTE8Iy6JaSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfhW94XXRz1C6t for ; Mon, 29 Dec 2025 03:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c5b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 03:28:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Jorgensen From: Xin LI Subject: git: 86b5e5bb7814 - stable/14 - GCE: Specify the architecture of images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 86b5e5bb7814f4f972dc29076969d06cd76567cb Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 03:28:05 +0000 Message-Id: <6951f545.c5b3.4ff315ca@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=86b5e5bb7814f4f972dc29076969d06cd76567cb commit 86b5e5bb7814f4f972dc29076969d06cd76567cb Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Xin LI CommitDate: 2025-12-29 03:22:19 +0000 GCE: Specify the architecture of images Without a specified architecture, a user can attempt to create an arm64 instance with an amd64 image or vice versa. With the change the API will prevent that mismatch. (cherry picked from commit 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434) --- release/Makefile.gce | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/Makefile.gce b/release/Makefile.gce index f67cc5da8d82..31bed380f56e 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -17,6 +17,14 @@ CLEANFILES+= ${GCE_UPLOAD_TGTS} GCE_BUCKET?= GCE_LICENSE?= +.if ${TARGET_ARCH} == "amd64" +GCE_ARCH= X86_64 +.elif ${TARGET_ARCH} == "aarch64" +GCE_ARCH= ARM64 +.else +.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +.endif + .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif @@ -76,6 +84,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ + --architecture=${GCE_ARCH} \ --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz From nobody Mon Dec 29 03:28:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfhWB70q0z6LbKZ for ; Mon, 29 Dec 2025 03:28: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfhWB5qQ2z3vDY for ; Mon, 29 Dec 2025 03:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978886; 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=sfrb49CbfL0EBNYWQLiniqwbkn3admbbnX1PIJrZV+c=; b=RLgJJE28SZ8BJJsC3g9qeeCV6/uZRwB0hb5Hyp4l854x2esGs5zFzuyTzfp1VXpZgzn4x4 irXUPGXL33C6wdaoEliyhR20FdasL2LQZICCkXyVYYiAjzX+D2A1EjRBLFggGy2XBueDSf Qm6Xce8d8ygVWHJqm3KlVnps32lx5oblNcqhfC1p2Tqytku+85kSNS2T9HegrvHIeq9cCh TwhIba6NweV3LGFvSV03Avg1IbP3xLbbhHUWvfjY5Xuhd+xHqhY7UHq5EA9BK4uqqpsQen Bw3H9PoZDtUrRpaX+fPoesGw8KeH/wz3oXUHhwAZrIFKDkjefE+5QjxFUbNp/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978886; 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=sfrb49CbfL0EBNYWQLiniqwbkn3admbbnX1PIJrZV+c=; b=NzLiGzBOhEnwBD6Vs+X42wmVbNOzVYCfRM049c2Ok4rZ0xbuApbLNTUZ7i0TgclBj14sW3 ldXVdNVnbr273TE2QAlgXWghtjNxd2ZqNVZlIBKyoj7AOMg8JN9Blx2YxpDXfMNwq0Zx25 VrarwkctvjH8KReX63dB5yFYdhyof4haiKPvKIbfQzKCW7nMElL8/iboCO1bKaXCXgOtAp uUrq5TrFyXdoWdkj1NgZhYy0GQOh87cDpvseyVvPUz0Sskatjw7+dgGfLRxzu74q9xaep9 ltUo8Pj3sH8HjKuI9f9PHP13HjuXKK2/bJZ21cT8lpFddaOxu5c3JD/ptvDPDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766978886; a=rsa-sha256; cv=none; b=XkxcDXvZCzsK0U50kZsM5P2t72nzxxpiAZmY7uGq006HDWFp0+BksISH1iLFOpP1AgkvgN FXCUet+gWKQBn+Z3iw88z7u1tMn6Muxv2JFavJPY1KodC4AF0C1f/U7GnzUinhYOYpY+I/ QvHGUPfOTJOjK9mP7sRzIdwTpvcP3piliG3Nmg+/KgfM+GrS/V7xboLlAzNDC7rENieCUF YmF1v7Seswv5Z/B2kUTMfv8K0aTcbMh3qWwinRd2cncw6mU4OcyXfTtn1CD72lJx6oKmIZ KaCnAoNyxrWLJCmlI4kHKpll/NUjksjKImATi0qBIei6YIWPaT1xVqNeBKMfIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfhWB5HsCz1CNp for ; Mon, 29 Dec 2025 03:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d218 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 03:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Colin Percival From: Xin LI Subject: git: 92d80c231d0a - stable/14 - GCE: Don't .error on unsupported targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 92d80c231d0a0f53daf6224037181d648b06b632 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 03:28:06 +0000 Message-Id: <6951f546.d218.17480e44@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=92d80c231d0a0f53daf6224037181d648b06b632 commit 92d80c231d0a0f53daf6224037181d648b06b632 Author: Colin Percival AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Xin LI CommitDate: 2025-12-29 03:22:19 +0000 GCE: Don't .error on unsupported targets We ingest Makefile.gce even when we're not trying to create GCE images so we don't want to .error here. Instead, set GCE_ARCH to a dummy value which should make the problem clear to anyone who attempts to create GCE images on an unsupported architecture. Reported by: Jenkins Fixes: 0a8ecca4e315 ("GCE: Specify the architecture of images") (cherry picked from commit 787d09753f70bb382a7cbfba742a612fa54069e6) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 31bed380f56e..e492aef11ba2 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -22,7 +22,7 @@ GCE_ARCH= X86_64 .elif ${TARGET_ARCH} == "aarch64" GCE_ARCH= ARM64 .else -.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +GCE_ARCH= UNSUPPORTED_IN_GCE .endif .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) From nobody Mon Dec 29 09:22:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfrNY4JBsz6M1P6; Mon, 29 Dec 2025 09:22:53 +0000 (UTC) (envelope-from kp@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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfrNY3SQ3z3CXv; Mon, 29 Dec 2025 09:22:53 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767000173; 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=Tn/lzNnhy+MroI03FXzk9D3uxb52fLGQg81ArSZ7NNo=; b=inW9kBX13ZBeDlpSRpzZXqgqLOR7G1tdJlH97/bxbPGL78jDOSvusfpT0Ha0geVXNiz9BI NNer6MoaI3UN4oKjReztHGsIXNIqwNLjjYHsjdVjuTVF34IgYXh2hPLW7b4vIuv7jo9VOp R1tmKg301iTasJTF3padVG+iJfpRAFiWoBqgDXzdaUk60om3jshrHkE+LtkNWxdqSZZpOH GDt1WMDkvKMk6OGm9ttWXLI6Obwh1yxnUfvdNgRFzrJYpIWMEue+iZk8B5LDmmgAnsm0ED gXLSwushDYO2d3Sh20Q36rhzml9UKB2HFysnbA7IoqUX/aYXDBLLtA0CQgSZFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767000173; 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=Tn/lzNnhy+MroI03FXzk9D3uxb52fLGQg81ArSZ7NNo=; b=couiuPQrw+d9y1DkoVfUbtU7YbbkQl72JkCMRE9qtCFlfgXpwi337JLDW8hzEPRJELzUKU OiNFXKzk3gla4lX4i4dp2SnTiue6dKZ8kaz2m+6mxLHiwx+qFJwRpbDqmF6sCjjKDUoiSu CpNtATO5Emrjb3pjf/8GXo8NNCDNp6YykOf3fvzHs6ikGqHMNDE53Yu5LFpUWH+5vBhVgb oURhEYwiktRoE0VHZ2eOrprZK5mF1Hv9cNT7KIEuqQTf1XA/6N9qIy2c3DvHSi8gcPoTWS 05QCuoNSYA51/gTWERruN/Ld/n0DATIepqneD5rPnAE6Cep1Uqxtxo+YOWALtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767000173; a=rsa-sha256; cv=none; b=yw05fibV+OpMzENElSepDqqy8OPrKCqLuWI1RlGnE/3pa6Xg2HEzxyFpKMJsDROStk0Ues jtAsRePi2jAczpZo1u+HtXK+32t3DbEvktoPdM4Qxiz6lvSJPyFwYKOH8k1H2izw0TWi3W EP+SkXaPpbbIjWzNqNpqsX7wcfj/TzB8UZ89ov5/n56jRq7yNIniQlcj0TVl5G0Nkf4GJn PTrYiWL8/YbygE7XY4vMwG3zUf+9EiLiRAH4FhFTNnqUMN7zHPXP7MNavyrpgRhpGYbZqr fda1FdBjwiFIbWpwGjA9MAQ+1idy3NeT9sqG2Ilat7T0LSWjzjWSpdt5jtmbSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R13" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dfrNY1lMSzFbT; Mon, 29 Dec 2025 09:22:53 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 724F11D3E5; Mon, 29 Dec 2025 10:22:51 +0100 (CET) From: Kristof Provost To: Ka Ho Ng Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 112c453ba910 - stable/15 - geom(9): struct bio KBI fix Date: Mon, 29 Dec 2025 10:22:50 +0100 X-Mailer: MailMate (2.0r6272) Message-ID: In-Reply-To: <69489316.252e6.179063dd@gitrepo.freebsd.org> References: <69489316.252e6.179063dd@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 MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_8F56F269-AA01-4D4F-8A93-6AC3F4C03A05_=" --=_MailMate_8F56F269-AA01-4D4F-8A93-6AC3F4C03A05_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 22 Dec 2025, at 1:38, Ka Ho Ng wrote: > The branch stable/15 has been updated by khng: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D112c453ba91012f19ed140c56a3ac= 8fc929ddabb > > commit 112c453ba91012f19ed140c56a3ac8fc929ddabb > Author: Ka Ho Ng > AuthorDate: 2025-12-21 22:45:03 +0000 > Commit: Ka Ho Ng > CommitDate: 2025-12-22 00:37:40 +0000 > > geom(9): struct bio KBI fix > > The struct bio was changed after cb85c2e2e995 on the branch. To = > fix > this, move BIO_ERROR flag to another value, and now = > BIO_ERROR_COMPAT > occupies 0x1 instead. Also, introduce b_error_compat field at the = > place > where the old bio_error was. > > This allows non-CAM(9) disk drivers and software volume manager = > modules > compiled against 15.0-RELEASE kernel to work on 15-STABLE kernel = > again. > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D54327 > > Approved by: re (cperciva) I=E2=80=99m seeing panics on boot now: vtnet0: Ethernet address: 58:9c:fc:0c:60:85 vtnet0: netmap queues/slots: TX 1/1024, RX 1panic: Memory modified = after free 0xfffff800038b51a8 (424, g_bio) + 0 =3D deadc0dedeacc0de cpuid =3D 6 time =3D 1 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame = 0xfffffe008d5679a0 vpanic() at vpanic+0x136/frame 0xfffffe008d567ad0 panic() at panic+0x43/frame 0xfffffe008d567b30 trash_ctor() at trash_ctor+0x74/frame 0xfffffe008d567b40 item_ctor() at item_ctor+0x59/frame 0xfffffe008d567b90 g_clone_bio() at g_clone_bio+0x1d/frame 0xfffffe008d567bb0 g_part_start() at g_part_start+0x96/frame 0xfffffe008d567c40 g_io_request() at g_io_request+0x2ca/frame 0xfffffe008d567c70 g_read_data() at g_read_data+0x95/frame 0xfffffe008d567cb0 g_raid_md_taste_intel() at g_raid_md_taste_intel+0x1d8/frame = 0xfffffe008d567e50 g_raid_taste() at g_raid_taste+0x18e/frame 0xfffffe008d567ea0 g_new_provider_event() at g_new_provider_event+0xaa/frame = 0xfffffe008d567ec0 g_run_events() at g_run_events+0x104/frame 0xfffffe008d567ef0 fork_exit() at fork_exit+0x82/frame 0xfffffe008d567f30 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe008d567f30 --- trap 0, rip =3D 0, rsp =3D 0, rbp =3D 0 --- KDB: enter: panic [ thread pid 13 tid 100069 ] Stopped at kdb_enter+0x33: movq $0,0x121aa92(%rip) db> With this commit (and the follow-up =E2=80=9Cgeom(9): unset the = BIO_ERROR_COMPAT flag correctly=E2=80=9D) reverted the VM boots again. Best regards, Kristof --=_MailMate_8F56F269-AA01-4D4F-8A93-6AC3F4C03A05_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 22 Dec 2025, at 1:38, Ka Ho Ng wrote:

The branch stable/15 has been updated by khng:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D112c453ba91012f19ed140c56a3ac8fc929ddabb

commit 112c453ba91012f19ed140c56a3ac8fc929ddabb
Author: Ka Ho Ng khng@FreeBSD.org=
AuthorDate: 2025-12-21 22:45:03 +0000
Commit: Ka Ho Ng khng@FreeBSD.org=
CommitDate: 2025-12-22 00:37:40 +0000

ge=
om(9): struct bio KBI fix

The struct bio was changed after cb85c2e2e995 on the branch. To fix
this, move BIO_ERROR flag to another value, and now BIO_ERROR_COMPAT
occupies 0x1 instead. Also, introduce b_error_compat field at the place
where the old bio_error was.

This allows non-CAM(9) disk drivers and software volume manager modules
compiled against 15.0-RELEASE kernel to work on 15-STABLE kernel again.

Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D54327

Approved by:    re (cperciva)

I=E2=80=99m seeing panics on boot now:

vt=
net0: Ethernet address: 58:9c:fc:0c:60:85
vtnet0: netmap queues/slots: TX 1/1024, RX 1panic: Memory modified after =
free 0xfffff800038b51a8 (424, g_bio) + 0 =3D deadc0dedeacc0de

cpuid =3D 6
time =3D 1
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe008d5=
679a0
vpanic() at vpanic+0x136/frame 0xfffffe008d567ad0
panic() at panic+0x43/frame 0xfffffe008d567b30
trash_ctor() at trash_ctor+0x74/frame 0xfffffe008d567b40
item_ctor() at item_ctor+0x59/frame 0xfffffe008d567b90
g_clone_bio() at g_clone_bio+0x1d/frame 0xfffffe008d567bb0
g_part_start() at g_part_start+0x96/frame 0xfffffe008d567c40
g_io_request() at g_io_request+0x2ca/frame 0xfffffe008d567c70
g_read_data() at g_read_data+0x95/frame 0xfffffe008d567cb0
g_raid_md_taste_intel() at g_raid_md_taste_intel+0x1d8/frame 0xfffffe008d=
567e50
g_raid_taste() at g_raid_taste+0x18e/frame 0xfffffe008d567ea0
g_new_provider_event() at g_new_provider_event+0xaa/frame 0xfffffe008d567=
ec0
g_run_events() at g_run_events+0x104/frame 0xfffffe008d567ef0
fork_exit() at fork_exit+0x82/frame 0xfffffe008d567f30
fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe008d567f30
--- trap 0, rip =3D 0, rsp =3D 0, rbp =3D 0 ---
KDB: enter: panic
[ thread pid 13 tid 100069 ]
Stopped at      kdb_enter+0x33: movq    $0,0x121aa92(%rip)
db>

With this commit (and the follow-up =E2=80=9Cgeom(9): uns= et the BIO_ERROR_COMPAT flag correctly=E2=80=9D) reverted the VM boots ag= ain.

Best regards,
Kristof

--=_MailMate_8F56F269-AA01-4D4F-8A93-6AC3F4C03A05_=-- From nobody Mon Dec 29 10:13:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfsVl5pMjz6M55h for ; Mon, 29 Dec 2025 10:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfsVl55k0z3H1s for ; Mon, 29 Dec 2025 10:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767003199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54AgvnRIIRARcTgwfYPAaXoWQ1MjB/V4wfQ9jqZz/ek=; b=DahPXxewmM+ktduUuZ6B5b6sAc3D4rjCGhP9G++c6LIzOWrIAbuMcojm2N7JNxMZEqWueb njkiNQ9TC1v+wZ8tsWGCHUdUGTlbyHI4mW/SHw8hSiXhafU9UsFD7bl2pRAkYq+uQLZsUb 5/3f9xx8L7GNltJ0DP11fYCMjLT6UlCkC8o7Ht7xMtS3KHQUCBquDQKOXP7HGunR3F+7Qa XA28tjfmiyE4a98GGf2+ZiQXRUYh7QiCeomQCXGm5YBA+kJI6sLHbuaz7GO8yZC+ZhRKsc 8ckNod/c4gBk2mnB0MTVRdR/LQxJL8VG07eH3gNZTXknSRJpbUqrZeRdEvCGIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767003199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54AgvnRIIRARcTgwfYPAaXoWQ1MjB/V4wfQ9jqZz/ek=; b=x9IRC4fOZ9TTQfupWq/gg2a1doLCdGU3MGvVWpcYfaqXU6wm/M4u2+9H8uhPlF1ma49lt/ hvABvi6vygHd0KAP956Gh5k2xyKUzhcTXZDCEEEJE7pQSNqNVwlIgXOAVel7onFDMc7IZ5 gd0vT7i2lcbKO89fpPYBgz0Tj6NfEC4M427zQ0rC4yYmVJ6JHnAPC5taykZHrKftFY2Wyx vNwId9/rDUiG4SYICR8KfDVnMwpnGTKcIdagZYc0556nywtU3NROlGfEDymNrR83o+Opd7 qzb4IKolfFSpJQzs/f8G+CPZE46UJgvQzoI2tTRFIM/YUypv7lllItOyKL1xow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767003199; a=rsa-sha256; cv=none; b=y3ja7aGBpLHuySIpdYiV+x4wuAKmvd2Yt0kLAcF2dDo/x78+UxOSRxZfZku7i1oPNoH8DI KNkci7jkQKxuiQn7d7fhWeigJyP3C8Ga8tObK6Gkzbn80dUwUvxEbo6RCyccV6SllTQSZX B0nv9yXbmwJmWvs8UeDR1N63Ur0pXGalZxpBybprDH7BKXfLb5SoTUvwkr/dtoUo37UQ9W 0VBBKXP6TLh7jEiGPCnm7O65w6StdyO3xYeopXH1gcCBEfRNl295fMLbnYg5P72uQ1X8wn tG3Erd6Pjz8YZpWM8K7eEgYUdZ0mcDYgn9yAGc7X5h4xUnpx0DJir7to4cso6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfsVl4W9pz1PSF for ; Mon, 29 Dec 2025 10:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ddb1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 10:13:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 261642478c8e - stable/15 - pf: handle TTL expired during nat64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 261642478c8e796679103612c41064f0ac78d13d Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 10:13:19 +0000 Message-Id: <6952543f.ddb1.10b20b3d@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=261642478c8e796679103612c41064f0ac78d13d commit 261642478c8e796679103612c41064f0ac78d13d Author: Kristof Provost AuthorDate: 2025-12-10 16:27:51 +0000 Commit: Kristof Provost CommitDate: 2025-12-29 06:54:56 +0000 pf: handle TTL expired during nat64 If the TTL (or hop limit) expires during nat64 translation we may need to send the error message in the original address family (i.e. pre-translation). We'd usually handle this in pf_route()/pf_route6(), but at that point we have already translated the packet, making it difficult to include it in the generated ICMP message. Check for this case in pf_translate_af() and send icmp errors directly from it. PR: 291527 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D54166 (cherry picked from commit ac4fb06d096d6308b9522f454b68fbfc45bb8531) --- sys/net/pfvar.h | 1 - sys/netpfil/pf/pf.c | 25 ++++++++++++++++++++----- tests/sys/netpfil/pf/nat64.py | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 7e030910e0ec..55b841f970ea 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2511,7 +2511,6 @@ int pf_socket_lookup(struct pf_pdesc *); struct pf_state_key *pf_alloc_state_key(int); int pf_translate(struct pf_pdesc *, struct pf_addr *, u_int16_t, struct pf_addr *, u_int16_t, u_int16_t, int); -int pf_translate_af(struct pf_pdesc *); bool pf_init_threshold(struct pf_kthreshold *, uint32_t, uint32_t); uint16_t pf_tagname2tag(const char *); #ifdef ALTQ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index fb67c37b1556..1fdfd6e0f38b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3605,8 +3605,8 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, } } -int -pf_translate_af(struct pf_pdesc *pd) +static int +pf_translate_af(struct pf_pdesc *pd, struct pf_krule *r) { #if defined(INET) && defined(INET6) struct mbuf *mp; @@ -3617,6 +3617,21 @@ pf_translate_af(struct pf_pdesc *pd) struct pf_fragment_tag *ftag; int hlen; + if (pd->ttl == 1) { + /* We'd generate an ICMP error. Do so now rather than after af translation. */ + if (pd->af == AF_INET) { + pf_send_icmp(pd->m, ICMP_TIMXCEED, + ICMP_TIMXCEED_INTRANS, 0, pd->af, r, + pd->act.rtableid); + } else { + pf_send_icmp(pd->m, ICMP6_TIME_EXCEEDED, + ICMP6_TIME_EXCEED_TRANSIT, 0, pd->af, r, + pd->act.rtableid); + } + + return (-1); + } + hlen = pd->naf == AF_INET ? sizeof(*ip4) : sizeof(*ip6); /* trim the old header */ @@ -9158,7 +9173,7 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, if (pd->dir == PF_IN) { if (ip->ip_ttl <= IPTTLDEC) { - if (r->rt != PF_DUPTO) + if (r->rt != PF_DUPTO && pd->naf == pd->af) pf_send_icmp(m0, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, pd->af, r, pd->act.rtableid); @@ -9483,7 +9498,7 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, if (pd->dir == PF_IN) { if (ip6->ip6_hlim <= IPV6_HLIMDEC) { - if (r->rt != PF_DUPTO) + if (r->rt != PF_DUPTO && pd->naf == pd->af) pf_send_icmp(m0, ICMP6_TIME_EXCEEDED, ICMP6_TIME_EXCEED_TRANSIT, 0, pd->af, r, pd->act.rtableid); @@ -11299,7 +11314,7 @@ done: *m0 = NULL; break; case PF_AFRT: - if (pf_translate_af(&pd)) { + if (pf_translate_af(&pd, r)) { *m0 = pd.m; action = PF_DROP; break; diff --git a/tests/sys/netpfil/pf/nat64.py b/tests/sys/netpfil/pf/nat64.py index 705de72f5bc4..ba0d2ae01a9e 100644 --- a/tests/sys/netpfil/pf/nat64.py +++ b/tests/sys/netpfil/pf/nat64.py @@ -329,6 +329,42 @@ class TestNAT64(VnetTestTemplate): for r in packets: r.show() + @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) + def test_ttl_one(self): + """ + PR 291527: invalid ICMP error generated by nat64 router + """ + ifname = self.vnet.iface_alias_map["if1"].name + gw_mac = self.vnet.iface_alias_map["if1"].epairb.ether + ToolsHelper.print_output("/sbin/route -6 add default 2001:db8::1") + + import scapy.all as sp + + pkt = sp.Ether(dst=gw_mac) \ + / sp.IPv6(dst="64:ff9b::198.51.100.2", hlim=1) \ + / sp.SCTP(sport=1111, dport=2222) \ + / sp.SCTPChunkInit(init_tag=1, n_in_streams=1, n_out_streams=1, \ + a_rwnd=1500, params=[]) + s = DelayedSend(pkt, sendif=ifname) + + found = False + packets = sp.sniff(iface=ifname, timeout=5) + for r in packets: + print("Reply packet:") + r.show() + + ip6 = r.getlayer(sp.IPv6) + icmp6 = r.getlayer(sp.ICMPv6TimeExceeded) + if not ip6 or not icmp6: + continue + assert ip6.src == "2001:db8::1" + assert ip6.dst == "2001:db8::2" + assert icmp6.type == 3 # Time exceeded + assert icmp6.code == 0 # hop limit exceeded in transit + found = True + assert found + @pytest.mark.require_user("root") @pytest.mark.require_progs(["scapy"]) def test_ttl_zero(self): From nobody Mon Dec 29 11:59:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfvrp0kjcz6MBZS for ; Mon, 29 Dec 2025 11:59: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfvrn6Wfsz3QG1 for ; Mon, 29 Dec 2025 11:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767009545; 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=MSwsQnihIJHTw1bLbT8nL6p+MecwE2526CfmPxCEm1Q=; b=yVP0vqTKLAyhJNXhFau0/W+TTClnA9oR6m2SXh6ajM7ZgLqeffdp+OnpSL26YAYTz1ILJ/ IF+skQeul4uqglv2Jl/Tbv1q+SZssSYsfvODHbsHUKROZIjLGxncHgJCMGygCLMLOba3g0 A+lRUFyhp0NCuqI7mvlRICIIaAcsJ8CgzAaS2x4nq3qnwCcpDmnfGlAjy6vASUWXF2DG7D rd9KWcQiIiGzU1eUsrjZLXw5rISGywS6dmWBWy5Nx2OjXKaoELKLTyJkrYQpBJX0CoPMI4 CK3a7YY2mgyh17Ca62HMgdsZNnXynyZUvJeDxPRQiUFnG+eAqGCClOAQ2Ers8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767009545; 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=MSwsQnihIJHTw1bLbT8nL6p+MecwE2526CfmPxCEm1Q=; b=AFI95IzHiwS+4KCqWQkk12HRK0t2bCE0mVqJTIBlaZhaWmKkMKasJSY41wMoQDzH/N8j/1 3pc2hkQ6Et+mZIpUY8nSX9ewHw2f6mINcLSeAPHRbbe56qakl50dWFpiolFqBNEU0VIScZ X/X9OXqE54K7BjmslEn+wgknyjiqTq3iJjJooCDxmuUuqed7fQhb1EnCPLcDt9kepIEkMd vapERR79v73UUnSHfXRCV1KV0Cs+PbHV1a7Ss0ieH+V5as+X6dTfSi8unETSWqQCFugHWF NRYbAVtPU41f9iSnyhS/iNJB/Ai8EK18gNTeS950pA5DaWbrre+gSvSmbbSu7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767009545; a=rsa-sha256; cv=none; b=JY2nNV1b46xgc8Qo0V/9H/tu2RecTPGkLAJpv2/HYyY5EtgS5h5Yd2pT32lE5CJWPcS8Vp HWPrqeU9npCBLq+V4qhziY8fqMtk3ywAVYvNupI1L9GEi8w5LNKqKBciS7Wygppx/gQd7g vNAAlX2jv5aPB2G8zDjOJEx6nePsYzmoZM7xfw3UQQqNo0B+UeiTu87q1s/jBbHsxXuPSh crqL7Z6OYuHSkCcDrxPd4dH2FUj9l5I9bbPA47s6E4ogsYILYBiLQJVqUGaQ3uGI+hD6fr xNt8Rbsu3ljqHMkRnOLS187dYenrDXkHhWVN+KgnnscOR9ouSTtTzHqpv+dVGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfvrn5gLBz1RsM for ; Mon, 29 Dec 2025 11:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30235 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 11:59:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: dc28e6534b14 - stable/15 - cdefs.h: Introduce __nonstring attribute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dc28e6534b14f1fdbefb1d9ebebce9e9b22197ab Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 11:59:05 +0000 Message-Id: <69526d09.30235.3adcf971@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dc28e6534b14f1fdbefb1d9ebebce9e9b22197ab commit dc28e6534b14f1fdbefb1d9ebebce9e9b22197ab Author: Alex Richardson AuthorDate: 2025-12-16 18:03:44 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 11:41:14 +0000 cdefs.h: Introduce __nonstring attribute This attribute can be used to annotate char arrays that are not supposed to be terminated with a NUL char and is needed to silence clang's new -Wunterminated-string-initialization warning. The name matches linuxkpi. Reviewed by: emaste, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52565 (cherry picked from commit 802c6d5d61d15494a54a386dc2ffbcfefc68c8ab) --- sys/sys/cdefs.h | 7 +++++++ tools/build/cross-build/include/common/sys/cdefs.h | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 3bc4389346d2..ea6a92ad0056 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -394,6 +394,13 @@ #define __printf0like(fmtarg, firstvararg) #endif +/* To silence warnings about null terminator not fitting into an array. */ +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif + #define __strong_reference(sym,aliassym) \ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) #ifdef __STDC__ diff --git a/tools/build/cross-build/include/common/sys/cdefs.h b/tools/build/cross-build/include/common/sys/cdefs.h index 3f9b7866141f..8419b53135f6 100644 --- a/tools/build/cross-build/include/common/sys/cdefs.h +++ b/tools/build/cross-build/include/common/sys/cdefs.h @@ -100,6 +100,14 @@ __attribute__((__format__(__printf0__, fmtarg, firstvararg))) #endif +#ifndef __nonstring +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#endif + #ifndef __predict_true #define __predict_true(exp) __builtin_expect((exp), 1) #endif From nobody Mon Dec 29 12:00:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfvsy5h4Qz6MBgK for ; Mon, 29 Dec 2025 12:00: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfvsy4MwDz3Qng for ; Mon, 29 Dec 2025 12:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767009606; 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=5g2gKlP1vm70N/t7cS5bDpUKxpP+By2WOAov1bWVP+s=; b=Y36kzEaoWzL7OD9nYVR3FyxVNsYSyTLffAPptw6SfDK1ZI9Jd+pTfXfNAuIdNvFK5boV4E cl8Yhgf3EFu2bnfv/xGQQQqDNOrrX8+r8EfK1U6ewBezKoTdP41B49PZhH6RT0nUGWX7Xa mId2aO19zqI/XsKP/60AuNgdPqi7jfZ6Kpq3qb7yMvR8vG86vIz+7Sof7/t9xlmLjlZH+J yqMpR8CNXsVCXiHY1lcsWccKVZX35DnGhTc/+1UYWTmWrgRXl65q19zmd2+9H1QMv7ClEm 8+OCpa3qtgdRDkPzz9FSDsNfRM7v5Qkg3qeqKtCP7nqQ+fPkx35JKT0eNA7urQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767009606; 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=5g2gKlP1vm70N/t7cS5bDpUKxpP+By2WOAov1bWVP+s=; b=PM2lOW6vZDUdkMOPms0SOeO8SqsvbQ2YG7wnAQJyVAz/pMsPR76CfJSp5TswIxyQWnjE78 GEyid1Bw9DsVTk/hr83nralcswGaz4vn4hYoMDI9GkAxcttP4OjwuNtOTH/GTXx8tn2W3V kVzdzaUrEQzIO8lcXu/K3rEPY78UMMd1q7JuhmImvEWl6Asmo8a63MS3gGMGgGI2wbo6aJ YcsdZm6oDiaw6DUCxYVwufZETWL1f6sx8CyK7P/KKEHb5xpEMc7suG9OnZ6Xz10e03tYjX sP/MUIC3PK7wrrb8HdlV/O38TqonCEEmJsw8uXlnSjMfKFvvzULsOLTYaY729w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767009606; a=rsa-sha256; cv=none; b=RaHEBKQMtS8KCSvgrYFvRT+hanMrhZzD/cnQn1GihK+uGBtlnKAlacQnlNDlwcvlQ/02p/ EVcY2vs3nxEtp5gHwJ0cZod6vPEEoPTU5X1VTa5FDm8Ih0ochSyghooKedP6tDg7TUOE5t r7D5gMQUSmd7IX3JJS4bD4G+ysOUR/jZjn4NHKxly0cj9gggH5ARnxvX/Ajwy2L+dREseZ h7JoivS40P1+CGF8J2sIcjeYO8jq0/ChS9z8TH/XJ7HhKJ7YPDdakTTJCjiq3rc6U+mqCc zy1OdbhCOcTk2JM1Bpxpn6iceGTv/0ACaLfPum2rEbsChAmsvkOWaFr28JLuvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfvsy3R2Kz1RN3 for ; Mon, 29 Dec 2025 12:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:00:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 0925033ac770 - stable/14 - cdefs.h: Introduce __nonstring attribute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0925033ac7704279664c0deceaea7835bfb5cc1d Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:00:06 +0000 Message-Id: <69526d46.24f64.718b6c36@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0925033ac7704279664c0deceaea7835bfb5cc1d commit 0925033ac7704279664c0deceaea7835bfb5cc1d Author: Alex Richardson AuthorDate: 2025-12-16 18:03:44 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 11:57:38 +0000 cdefs.h: Introduce __nonstring attribute This attribute can be used to annotate char arrays that are not supposed to be terminated with a NUL char and is needed to silence clang's new -Wunterminated-string-initialization warning. The name matches linuxkpi. Reviewed by: emaste, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52565 (cherry picked from commit 802c6d5d61d15494a54a386dc2ffbcfefc68c8ab) --- sys/sys/cdefs.h | 7 +++++++ tools/build/cross-build/include/common/sys/cdefs.h | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 4af38941762c..029eff437c8e 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -558,6 +558,13 @@ #define __printf0like(fmtarg, firstvararg) #endif +/* To silence warnings about null terminator not fitting into an array. */ +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif + #if defined(__GNUC__) #define __strong_reference(sym,aliassym) \ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) diff --git a/tools/build/cross-build/include/common/sys/cdefs.h b/tools/build/cross-build/include/common/sys/cdefs.h index 3f9b7866141f..8419b53135f6 100644 --- a/tools/build/cross-build/include/common/sys/cdefs.h +++ b/tools/build/cross-build/include/common/sys/cdefs.h @@ -100,6 +100,14 @@ __attribute__((__format__(__printf0__, fmtarg, firstvararg))) #endif +#ifndef __nonstring +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#endif + #ifndef __predict_true #define __predict_true(exp) __builtin_expect((exp), 1) #endif From nobody Mon Dec 29 12:00:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfvtG65L7z6MBXV for ; Mon, 29 Dec 2025 12:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfvtG4tNFz3R5L for ; Mon, 29 Dec 2025 12:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767009622; 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=/dDzUNYC9sZZVTG2pJ1pB51BhUxM92KWqoKGrFHhoDE=; b=HPYBZOiU9+E7PKkK3LM4n/7emILyHWeC7u+05w4cRzPJfmn4iSRNzKiGFiNbuY/zM8JQuY bdgsuJKGO5SBg15CbBz6jlywMJFZaUXZAfei+00i9zf1bpkkpI3pGeB4b8PEOHG5nHQBLJ Czs1C9tb0Hm9EZBpLID490fwjNIC3/e+k8khCThuo3Bwl8ZWiFi6kJbNaM3kqG2sTPNWdK wFhxQw2YALG6SDFrLEnpwiGpQcZSr5jmMgmofGyIFnnS+1c8fwmqM3XCAyqQmMWzQaysDY 0lnt2+Po6hsEPQ31Yd/6pPUEAoss5LQMTNBUjKJ6bj/7ROOM+QMKZ/X2zhaPew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767009622; 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=/dDzUNYC9sZZVTG2pJ1pB51BhUxM92KWqoKGrFHhoDE=; b=ZR+66gkGZWmpFiksTh5evHsNYCmm0XRcde5xWtaXAPhbwKg+6KMM7qOomdLZ4GHn5DsPb7 FrmF035BUjtHejeikHccVkFM5q2AljlZ5jrepeDN4rlW8yM6cHuyE3VrLl+FnXyQR1P4kQ A3HEPje37AKQ5ik52YpTnt5Dom1CKRu5Yz/ijOa3pHqG700n05co30iW2JSEVvl41xtnou XsO5RfMxlYKQA9DlN+8EpkPH1n7zQQM0W1FUK5zMZnLsvhrIHyCJgtV9cW9/KzlcrpaYAa LKSMN2vZefxOWNBOqFQGaIdhXIQ4POLJVKR1GNaK66o0zx3pw0WngG2q/JvOHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767009622; a=rsa-sha256; cv=none; b=eyYGJ9KErgbrJy1f0MWPbgPNf7jleYO/CrdjAC7SGnceSX9HcLoAuY2KeyEDL8DIW79J5Y 1qaNFatWslHGgBQRdmpKqK7z7LbAloLGq6JIyiR83CMaMl288iHTxhRfyvQ9SOprStHsfa nav7hIsQ2VQLXalgb4vUpbtejfeToMSTdnxWmDjW9H3loEG56WgnQGVEprifi9VC4c4/Bq 8gaTty5luREQrd03LGuBi3rPTCE4GviBPGpZs/nb8yj9bV6dCZQO97QIykNChIPdRC6sm+ 8WwoW71GTqQ8Mp2jNUSbzlHJl3HD502Lu25FZkf7t+bTNPQrbfBZbV+/hWCYoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfvtG3nwbz1S4b for ; Mon, 29 Dec 2025 12:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27ccc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:00:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: bb4de3d2cf88 - stable/13 - cdefs.h: Introduce __nonstring attribute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb4de3d2cf88c2e407c2d0ffd9542377f7b0049c Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:00:22 +0000 Message-Id: <69526d56.27ccc.1be128a3@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bb4de3d2cf88c2e407c2d0ffd9542377f7b0049c commit bb4de3d2cf88c2e407c2d0ffd9542377f7b0049c Author: Alex Richardson AuthorDate: 2025-12-16 18:03:44 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 11:58:35 +0000 cdefs.h: Introduce __nonstring attribute This attribute can be used to annotate char arrays that are not supposed to be terminated with a NUL char and is needed to silence clang's new -Wunterminated-string-initialization warning. The name matches linuxkpi. Reviewed by: emaste, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52565 (cherry picked from commit 802c6d5d61d15494a54a386dc2ffbcfefc68c8ab) --- sys/sys/cdefs.h | 7 +++++++ tools/build/cross-build/include/common/sys/cdefs.h | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index fbd3c3144596..8fd07ce85a05 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -559,6 +559,13 @@ #define __printf0like(fmtarg, firstvararg) #endif +/* To silence warnings about null terminator not fitting into an array. */ +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif + #if defined(__GNUC__) #define __strong_reference(sym,aliassym) \ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) diff --git a/tools/build/cross-build/include/common/sys/cdefs.h b/tools/build/cross-build/include/common/sys/cdefs.h index 3fa7790841cc..f4dfb1c3fe27 100644 --- a/tools/build/cross-build/include/common/sys/cdefs.h +++ b/tools/build/cross-build/include/common/sys/cdefs.h @@ -100,6 +100,14 @@ __attribute__((__format__(__printf0__, fmtarg, firstvararg))) #endif +#ifndef __nonstring +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#endif + #ifndef __predict_true #define __predict_true(exp) __builtin_expect((exp), 1) #endif From nobody Mon Dec 29 12:17:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwG95sHPz6MCcd for ; Mon, 29 Dec 2025 12:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwG91pWfz3Tkd for ; Mon, 29 Dec 2025 12:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugkVvpx5VDmhxXX/k5EMRcEHnYwxxp/oMkVSjHlV56Y=; b=uEG17op8J/CYhbBIz4eBHVGgGDVhcr/qcA7N20bD9YN4OIp8V8yvlDji2IF1xn+LmBu3fb gnBNAgIKDxWfs7hlnCx1weclSO6AkMrq2WmhSDxqkZWy+I5Cpws7c1GImsc6nbEyPUlz5w esm+G+oUaOV7IW6/Y/NhHE7kfJiiWGzDTNxargsor8RM8TeFqQ3lq0YbbY+uKqBxBmYftr fydiW5u12PB+Rg6e+iODSJyQbsH0Hdbl0BK9ekeAP1wj/ePnKdfYYByVjscMwN+DApi9rA 6RYuucUzOq8tAr+HNEkvFCgGXMZsDgOdnzVdvcOUkPrz5/+i4l3ikkKmGcDFyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugkVvpx5VDmhxXX/k5EMRcEHnYwxxp/oMkVSjHlV56Y=; b=jfN20o/dLQedzDDxdvOfGHcnKNpIspF2CXKa/hnuV7xuKzlG1t4VJXosOdSpgjnu2oQy0F z/AXL1YQCwG8/SXFqiCg+NmV+Mou8LjyjWJaiF86CQIrAkWJMMrfhBOznzx8Q78rKb0y7+ 9a1VDmI7p4fJHJrrBZzNaeyBi28swL7UACQbYsSAH1W3zyMziptnOSMg/5A76bNbyRBB+y ybPvFwRMxbVGd2bus9QiG9Cq4tRb2DdTr7PwUIUDG1Zj+IeVtuys6Q7t6oBdWggCEhB+mR YUTdouH8f9aQQzCX+KW1zVJNC9dBIi7WRuqjtgLLBjs2j/pYgPrXWCnuP97iHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010657; a=rsa-sha256; cv=none; b=QwX0Zul7I5VsiBAdMy3K0HS1WYlSRzn6RVN38yaAmzTRBAC4EJsb8sj2etD2Va9Tgy4fdn 06j4fDtQ8ovuSHInCKETd62sxmmi/aLXoYwxrNEludqb9rmKoIEtb7ONLiDc+WP6YQAbOx 8fn36/jeNY0l+x3Na9YKWOlg+4FcRMMNi/kFrUmQpQ7vmP/7OBAH2JJINpcFgAMSmLaGqd tA/ruiae50d0GOon8mihil4oNePamHTsw9K8G9reEanj6SbvbSv7YfjlAOO7cj7Ahnohg0 7+3TI6dZuHq7364rzOY1ybsWAsvW9lY4L3jeB1j1p9yt0Y9YLwsRXwfPfJ3vqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwG90w0zz8j for ; Mon, 29 Dec 2025 12:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2d0600671a5d - stable/15 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2d0600671a5d7abed848c3bad2ab6601e048b3b4 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:37 +0000 Message-Id: <69527161.26b7f.15a3f723@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2d0600671a5d7abed848c3bad2ab6601e048b3b4 commit 2d0600671a5d7abed848c3bad2ab6601e048b3b4 Author: Dimitry Andric AuthorDate: 2025-12-26 15:26:13 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:14:46 +0000 tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it This is needed to let the legacy stage compile against newer versions of sys/font.h, which transitively includes sys/cdefs.h, and requires the new __nonstring macro from it. Fixes: e2c93ed09f25 MFC after: 3 days (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index bff73fc715ef..e057f0b6c400 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -347,6 +347,10 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h +# Needed to build most of the things below, which include sys/cdefs.h either +# directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h + # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/_nv.h SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ From nobody Mon Dec 29 12:17:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGC17brz6MCfl for ; Mon, 29 Dec 2025 12:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGB2Tlbz3Tpq for ; Mon, 29 Dec 2025 12:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWiAuHwuLdmR7JZKFEpiAnsajV4iLzri1M8HAnfiDRk=; b=I/P+HnyOQ6BzrHIA0wxFf/2bs+d0daL8lZBFEDNwCFa5BMIIidOhy3hyb0JRtqGKVsFLKX OeHy9SYCStxAPugK8VFaGj2zuv4p5ik1YufqfqR0Nb+zA0Qk5NPjH9jCQdxEq+hEC5nuOe OjEUamwldZB0ErCTZ3SUu3mugY8Yzr/Hrr+qYAei6Ctwu6UearTBOqtC8UTIn6hyVmpVGe XFjcZvvZQ4+Z1PCpSPfZZ0Q7VZPLLWRysh3trj7qV98FujIezQop2tVbDrNtZquoZhmKLq lYWa6xZk4k6AEYPnaLjVRUX3gODxfwSHpbK/kbT76MK2X6PLkSjD0WQTDmhucg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWiAuHwuLdmR7JZKFEpiAnsajV4iLzri1M8HAnfiDRk=; b=h13EQDGqCOBbpqZcWhGGRoN5dpj+D7IbwHbOlLOSTyO6sWRnRAhraRaz4b9yZ1+5VtNSvS 3/U9el99yzyo/D1dlKKq+SY7DrU0I8kgftolfwjsOyS3zPKyzuAIvN5cpqY0vAddcJTOuS xJHWUrdy+PE316k6Dj4XxKOybEiFJzTIjhRsO5kAcQJ0rPH+mh9o7Kbhlsbmt9nLPPeSRK u3bhYOzJ7icKCxi9Ey85iT+J5kaYE2O5v3f3AwI/bCY47ZQawd+K7hDWstX6GIjfGErgAR uabw3aR3I0sg/kc2eBEW3+ChHiyLUdbnllZ0jMoxgX+VIS06j5PttrkOdn88/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010658; a=rsa-sha256; cv=none; b=E+lDKlEFpmF8VnImkAHmBk8tYFBI9U26xGMXftJUPIgTCxJwb8DQH1DQJ9SJPR4goHyKth YAj5JaqKDfsvlLcdvX3DKFwgTDCTJ79u+Qx7H4lyGAFaw7KnEA9KhXU2+C/Bxy+TeOn3AM bc2X3gw5F6ZMnszF4qrvEvi/3MzSU5tbGcEKkBhNMw05lCK+mKMhCG0szsQyV1CRidROJM S/R2wVby/wIe/qmLk4Sn0hlikVM4EaF6XncOQY9E7C/oZ72C7jfTClYeKgRM4tP/mh0HGT Q9A22lcUsLOGDmN6fhtajBa5gLXJ4LwiITVH69cDYpiNhfmntj2mtt5hHWfJHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGB1jJfz1S6Z for ; Mon, 29 Dec 2025 12:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c25ea7290efd - stable/15 - tools.build: also add sys/_visible.h to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c25ea7290efd9d4609ecfed5780f524907653a3a Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:38 +0000 Message-Id: <69527162.31f44.470e997d@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c25ea7290efd9d4609ecfed5780f524907653a3a commit c25ea7290efd9d4609ecfed5780f524907653a3a Author: Dimitry Andric AuthorDate: 2025-12-26 23:07:53 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:15:00 +0000 tools.build: also add sys/_visible.h to SYSINCS This is needed since sys/cdefs.h includes sys/_visible.h. Reported by: kib Fixes: 1c9ff80f0635 MFC after: 3 days (cherry picked from commit 086bedb11a853801e82234b8a1a64f0df52d9e52) --- tools/build/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index e057f0b6c400..9fcd458c370c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -349,6 +349,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h # Needed to build config (since it uses libnv) From nobody Mon Dec 29 12:17:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGC69kQz6MCmT for ; Mon, 29 Dec 2025 12:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGC3Qfyz3TXm for ; Mon, 29 Dec 2025 12:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010659; 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=edzHKlwl9B73Tf/ZSsw68K7gIDOv+hzcCZg85KNGcqU=; b=M56pyINnWkGBa7/4CfhDd+E6UG+fBimWzHSPrrUR4co/jMMQU0vgrNBcHQC0gAPu66A9wr pXQSmZTyJbb3OYIW4+Zxp2FbR9BkJVZaodU5naKexZQRrRTWzZl0OWwk/eyKHGTDf+vrot MMUZ8QLYOtGevVCNoysd41JFzmxye9B2oJcIIc11Tmt65p899vuA9ZrtgL449xCRv9vi1D iUob6iCdBmOHn4dIIFQKETSN1Frb8yjRbz3gTiB3+/XKlynpXmawiNkRxfv2o888Jh1uyl 2ATBz0DPg+yCSbdxf53RBt4tkgr+SVd8PZ/zKg6KzbS4I3e1wmgx8Rw/0/a0og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010659; 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=edzHKlwl9B73Tf/ZSsw68K7gIDOv+hzcCZg85KNGcqU=; b=oiEMSyYyVwAieYebdn3n+ag+cWCZQp9B64V0WplPYt8sWS2EX0vT0Jetr3vzHkOyWb1FS/ VuIIprRXz2DJrWNj16yh1Ou69shGmo9kqIr/jqsnQN9MzzzmDDLZ19w+AyGxPV5hmUgpeq pJqcg33h5+VkWGlr3Nua0nx7X0PoyUZmg7tGwH4xYQ99KXJs+QOiVyJKDSaRespbQL8njh TvB8dHPNhuwVIfGDEIIPxS73GK3mz48tKQS9su5v3i58ilJn1289r+y1AOyoOE46YtyC1T EFggVkHkvju5B53So33St7UzYEeQjzt5SLOHssWOlq54TY+5hBZEUMMedKqC9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010659; a=rsa-sha256; cv=none; b=Y/Z9WoQUol3lzLInztq7dcIAOXMBcPL/2djJJC/IdRHSLCbppUoHPk1Fl56LeZxNvsvpW3 xP20WzQN3nT+IgW9He98WNqQxucRxHeE8apcnUjr8rold43FvcuQOavwLNc8n/cMZBUO6d wpD10itElyc3xQrcaHdpryHprmr10Rw65k5y2ov2ypMS4nwKEePJQByi/KVD9ICkBhYF2z ULwU8iCm3E92Do6JZYNcQQ91iVo6ZUifleFdhL82fEA0DRPMVH0tB2vJxtpqkRlS9d6dWT PMxCpcveDRVDJRBI+5V0Y+Ts0mrGuElAcD39Q16Bcl75d+HdYj5oLwhLDqJ5Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGC2jQpz1c for ; Mon, 29 Dec 2025 12:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3204d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: 248f879133bf - stable/15 - cross-build: Avoid adding to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 248f879133bfa4b916421d385afeaf2dc91fcaf3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:39 +0000 Message-Id: <69527163.3204d.2ec84f71@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=248f879133bfa4b916421d385afeaf2dc91fcaf3 commit 248f879133bfa4b916421d385afeaf2dc91fcaf3 Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:15:14 +0000 cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 (cherry picked from commit b6672803a1cf10dd1c912fe6571a8d426b8868bd) --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 9fcd458c370c..676d0bea0936 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -347,10 +347,12 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h 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/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/_nv.h From nobody Mon Dec 29 12:17:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGT4kdKz6MCjy for ; Mon, 29 Dec 2025 12:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGT30t8z3TpB for ; Mon, 29 Dec 2025 12:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010673; 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=lTjFLzbn5J0AIV1wYvrByRCjeCq7bO1P9+SQa6no/vM=; b=vG/ZwRYm3lWUWnU0zIYaPg6czSQ78i/P/l4prS6i9GVQuQmg5f0z19OJQzLR03RLyLUVAJ 1dfCDGGTo0P6gCmBV1VAYoO05LT5khBM5Pxlr+FTY5APVzeiaT7iAyy/3v47HRJdaayh4Y pDS/jtlp1UPzWilAb31m8+piMRfJZZlV9qEasgWPItGIFIxmDngBbkUNvkz5BrgS8l6r+7 8mZ/u+IuglfTUwjfWyyRY+hqtrNX7KrZaXLQW70cd07ylDrB7kr4Lf7Ia9ii8noiKeYOW2 mZARwf0zkaSOyPkqzqddmeycm3RQpZ9ujwzv/XxoEfn5NnnD/J6CI8ZJ1phw3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010673; 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=lTjFLzbn5J0AIV1wYvrByRCjeCq7bO1P9+SQa6no/vM=; b=EkjW1wKuAo9fOKcRBQgnlvjN76Cj+QP4e9TkUSslDdegOWBxTqNuGIWCrn9YoOYSa0FU4E ioKMdmSajv1saVMimyXx2TtEjNxZrboZ+bDlZLxUerVAGcR0wBu3/TuAqKcHGUATFbL7KV QMNJNJoDdAJh5aOn9kwMVGl3hNZqxqoQOG107PnLR2M/n+kmiEcKfjqskWNDYJ0g0V+gND Vsy5ozUpcio6ueVOQZjJByGYQspdgxaXstoFBAQkMRml0SJzkYCAxoIH+HbyNeXypxMnGd ulMOMYwhUUcsbkljZUkSI8wTq15DVkwv8VQZpSF7tR8b1YT86qJOZJ2OUa4NnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010673; a=rsa-sha256; cv=none; b=YmcqEG2Yxum8TFL+D7kzUoRwM0K2C/V1P+G+kXXmEb526l/F/8aMRLTnJtN75A7vLYW7wG Vk5uVdH8PZKABVdHTAlFjx6qAYdrJP15Pte7YH3lUQurRZrRhw5Yp+Q5eYSpTUojvp1aFK YWzCmP20U4V0u8CkcuogPL1HGfZTeasFmX2ES+lg16t+Nop6Xoe2E3FKripeo8pmUwMQ8N 9bWIiVnjlXoVaY3EWuaQxE3usDzm+4OVl8CEYdFhj1t/PjiCtQf3FbBDQY+wH6hAOG3dPi veFGp1wvxPWeXxKMGTaJHI/wjx3vj0NCQdFhU8KiRdDHtRq5MqO3kUGbIEhd0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGT2XwJz1g for ; Mon, 29 Dec 2025 12:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3094f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: 9ea1aadfdb30 - stable/14 - cross-build: Avoid adding to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ea1aadfdb306d95e79854ca569aefc7cf993fcb Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:53 +0000 Message-Id: <69527171.3094f.2fa31aa3@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9ea1aadfdb306d95e79854ca569aefc7cf993fcb commit 9ea1aadfdb306d95e79854ca569aefc7cf993fcb Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:16:27 +0000 cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 (cherry picked from commit b6672803a1cf10dd1c912fe6571a8d426b8868bd) --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 75b05a4e5b9c..66ac2a4f381c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -273,9 +273,11 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h 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/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ From nobody Mon Dec 29 12:17:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGS50XZz6MCtt for ; Mon, 29 Dec 2025 12:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGS28X5z3TyL for ; Mon, 29 Dec 2025 12:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JfrznE2E7HTe3493LUFje5GAJSe4PxT9knryHp7V68Q=; b=KZksUwVq/nqaqlmKaYs1vXm3X3QQrCFMb7b+y66w3o2kYBqH5G3XAeQMmp39ltX+lcHVHf 10gfdC3AlxEFQElTIEJveniAJXfyImL9TiSyO7H3TqXhN6pW++p648DjBN1e1zXZEYKH/F aOCGM3TMYICE9qsrzwKtquKMWt6nMLH4q9Sg2B3LG5OMWpdR4vMoBEjCI5EpDuwskbrjFg 9+z4Ts2Ijcdwnn1oOnobnOsEmYff7fUIt3pCLSzR1w58O1bhg7y2tyhU/Zn/IzEEfH21n2 Y0PjRmSEV1k2sYoUCKeCpelkRmpOB+uwTfKIymLOKk34/7NBAVGEPsFZN44s/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JfrznE2E7HTe3493LUFje5GAJSe4PxT9knryHp7V68Q=; b=DbAKQXbUFVw+DGF6jbVB0pDNgVUr2C3F4Ix+rB7jRgxS+uaU6Vk9uO1cBzArcMZTRKC/40 Rqj6xoQebGvkIl9J1H5MLN3u4Zwxa/chmmGHIODvoBwtfdghDoPkqVioA+PgA7Kq8lMJ54 q/IbDXIHj6tNwYY539URslvJ23ZGE0xig9nnGxGF4A1kP7v1r5tSZ26lrJgnqX+fhuXgxK xwc7Ne7eiIyaFysf8u8tuWsqtmeyiEym3muq9PqWiHKjnFgQ2Odh0bxh0RMYIxRIm2z/St qlV28iBOHlNjMgS/2MSzKmQsQtrpOKMyOH3gRUiS18UGhOJ1XujkKgA6+CY/RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010672; a=rsa-sha256; cv=none; b=vp70etOhMWhTjfUePfvNXVRCCYJxj35iWRUsW61a2yeRSuvEOWnYcSyTUQvmQWmWrKl9er GgZF5O/Pj6Yg4Gyo7/mtvun2ODlq/cfEd6CnIoASZCbjaOk+uDkANTR9gzWZdjmkS9jahZ uAGT5dKZgXkMC/qkiCxKPrHi4wwY50STc1tCEKNdiDYWwT4wgrmg16iQLaNGhznCGDAIaG lC6CCpmG6qrFzC4yTucgu9NKHnB278ro7/qaS6yiF6nLY3bwZcFfOaDAbqVazMOe6XuFad LVdEKehn21Vs1oLonXu/9IkRJyTNEmVsZCgV8j05aFK1HPX7PZ2kq2aUQchLyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGS1lZWz8k for ; Mon, 29 Dec 2025 12:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31d92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ade7285253fc5dfe0adfc51f7bd342b9293f253 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:52 +0000 Message-Id: <69527170.31d92.5af51114@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2ade7285253fc5dfe0adfc51f7bd342b9293f253 commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 Author: Dimitry Andric AuthorDate: 2025-12-26 15:26:13 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:16:00 +0000 tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it This is needed to let the legacy stage compile against newer versions of sys/font.h, which transitively includes sys/cdefs.h, and requires the new __nonstring macro from it. Fixes: e2c93ed09f25 MFC after: 3 days (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index cee54fb71403..75b05a4e5b9c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -273,6 +273,10 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h +# Needed to build most of the things below, which include sys/cdefs.h either +# directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h + # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ ${SRCTOP}/sys/sys/dnv.h ${SRCTOP}/sys/sys/nv_namespace.h From nobody Mon Dec 29 12:18:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGn18vSz6MCrm for ; Mon, 29 Dec 2025 12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGm5pLdz3V1Z for ; Mon, 29 Dec 2025 12:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010688; 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=SuF5cgTMnPjo0QPl/jEw0fYi6aJl7/8j/pcRI1FS8Qc=; b=pWnSqlUl8r67ePGEvS5Ki3JGw8Wq4ReDDQFn4AU5RJmxdaAqvayA6R3QNImyW8Ct5RnAK8 PsyUrv4S7JYkM7Fn8APgRjPkoG+wEFsb1Zek4SLuhFBAsGnwrsOGmdsH5RaHPtEb0aMRKs cXNbbo+WIpc4trbpNDJi2hOQ5CcyfXtN5iWHoWq07YdEu7hzRZ8w97teGBxdPMtYzwraNU 2Vg8Ow3pyjmW/LgfbNq7jWuAK5DqmJh6zK2pOUiU+baF63EqlwB9SsrjFkHbWyaKoRFVfp HZKHRYn+6bTXpVuGuutqWu6y5nrxLcGDV0zacRrCoCVbkLTdZLhv5y6Cl9+4Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010688; 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=SuF5cgTMnPjo0QPl/jEw0fYi6aJl7/8j/pcRI1FS8Qc=; b=cQB53e9Wq8jCAIghTdmsdOAmDwgejtApOzy/zD9uEm3IV7unUpmZf5Ui5mpsFkjYr7AbXn sc5y9KAvB/xxLyvzKXlBdtL7nDz8SYIt5AQvklMSQ+JKvXvZLBJ57crH0NtUceWOhP0Xtf U9qTrcg8f2JhZ/aczH5GLauxkDsFn5mEGtfPPb2L3LgsC4X4g5KGGIwlh3CI6SbPZsJSSj BW8egyMzBO5YK+md0fu8Xm6RnFhuOd5P6hQ6MjExpiItwIVPD1P+qIkVqIWpMAtyt8nEil 4WNia9Mpx1O5UMTy8JVFPPlqJsjOjKAvip1m2O9bPPPYvXASHRXsYNatLLTEhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010688; a=rsa-sha256; cv=none; b=I0TGJwVDSPHGpx0E5rL5BqsBUv6fqI5vF1gjM3PY6wZoxNYdvfViXkrM05G/Po7C5ugIkn xUF3rOdgt6JXRSfEOWcJpPn0Dwi3kirSpPJSjuD8Z/na7ENiKRgDhozt05BXFTkL67Nd7Q XjNAAPkquaFyat/CqMjCcc4hdje8wlqZguZ3HuF6JNJvlLHIp9ZDC2mKP00O0uhhBJAUqZ fTBU3pEmpeqTi0hDIwIFsQshz2kmK9EoIExbTYl6rPfw0ui5K0dXaYpP3j5nKBSK4T70jM o4s/aiaND4JyeXqeVK2gd42WhdNT0Ud0apbHfEeBq18q9/iImXnR/5xBw6Vt7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGm5PH1zDP for ; Mon, 29 Dec 2025 12:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 320d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:18:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: b354a138c0cb - stable/13 - cross-build: Avoid adding to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b354a138c0cb672dc6540917f3fdada49bac4b2c Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:18:08 +0000 Message-Id: <69527180.320d4.3c0658e2@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b354a138c0cb672dc6540917f3fdada49bac4b2c commit b354a138c0cb672dc6540917f3fdada49bac4b2c Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:16:55 +0000 cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 (cherry picked from commit b6672803a1cf10dd1c912fe6571a8d426b8868bd) --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index d08406516362..b6925688896d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -231,9 +231,11 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h 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/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ From nobody Mon Dec 29 12:18:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGm3pqrz6MCk4 for ; Mon, 29 Dec 2025 12:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGl5Sqfz3TvF for ; Mon, 29 Dec 2025 12:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5+qZog2d7qu0ejV4w6RE4pR34DxQPdbG806rU4VfPig=; b=Jt0NQIKITdDHaeACwkAw/hK2UqppWJo9x5RMF5CUYBoAWsNlhbTDxp3Th+CmTKonL3yQr+ 4NGKz+D/VXSbicbGcM4bkutXFGe+pTlsLdFUe8vew5sveI/tj/s4lBYEYZKA65TMSrczY+ SuI8TtbgcDOTZhb4JuEkPS25KT6U6cNwzhxNtqejHYjvX7ZwHObDxB6mUBWbc+Jq4TbVmI 1ldKEDq1dpTGsEguv8XIuUbtoBurlUFCjzX7Mp0bUhoOoXEn+2HinuI6300XUvsn5kqjjS jjd2eH/SmZtjS+qSMtuX5vnMhvOY6CNj/je3zhkAOcRrhN1ppEmXJOGTkAKf+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5+qZog2d7qu0ejV4w6RE4pR34DxQPdbG806rU4VfPig=; b=DyYfS0YDtLfYds++qIYV2g+V0eqXVMHzGj84b24b+Xx6JG2h8pIuk1ji7clJGWxAkksTBN 2qDeohGiBAyCggTQYWQ7mZwdkPuRmG6Aibxcqd/f+B6T2PC7jPlUCVl45ybW7k7zHZlHU2 /P0NewL5g+truccQzbQAWssv8BiZ7w4OMgMWIb9jSdsXuSBunXX9pJQJ8emO/2q2aOlvRR dK2yxFaG48KKzEe/HXR395ZCjvpaNVEJWIicSlvhtKlS9gnXcp60HV/ceKS3LMxg2jxb+m 2Goa6/UGrub1L6ODQ4TYVw7u8gqwhKFT9Q2oWZxm+aHig+grvXFmSbT6qVZHyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010687; a=rsa-sha256; cv=none; b=A2KtC+78F0my8E51VZKAwwxTJMbtW7yyogUvFuHdRMk70D3f5PQlGvf5wuQWMy6lzGMgES 4VQgQDSgu+k+kjTWhJ0mTiavqSfFbrlbf4cJ929jKXJ0Nbc82hCOOGjEykQKmyVT7hQLvP nh40EjYqGuIlm8CMSP74LumbCnd94gjzhsWvzn6obro2sxG65PAK9ECzLst8Qz+KNZKKx0 O5j8XCMoABmDFv908wYwJVTWLxNb2yBM7yrGE+GUL72DnSg9BIk8hF77oMxFdFdF3aHrsb Qn5FUXb22pESsL+GuOuL4HWPoG0+xI4+YuZHsL/WkMXz46lfCJJThEV93gx6iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGl4nPBz7J for ; Mon, 29 Dec 2025 12:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30e5d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:18:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 50c02805f671 - stable/13 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 50c02805f6711b16a4315ed1bc736a372539604f Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:18:07 +0000 Message-Id: <6952717f.30e5d.27f611aa@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=50c02805f6711b16a4315ed1bc736a372539604f commit 50c02805f6711b16a4315ed1bc736a372539604f Author: Dimitry Andric AuthorDate: 2025-12-26 15:26:13 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:16:49 +0000 tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it This is needed to let the legacy stage compile against newer versions of sys/font.h, which transitively includes sys/cdefs.h, and requires the new __nonstring macro from it. Fixes: e2c93ed09f25 MFC after: 3 days (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 990aee424db9..d08406516362 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -231,6 +231,10 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h +# Needed to build most of the things below, which include sys/cdefs.h either +# directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h + # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ ${SRCTOP}/sys/sys/dnv.h From nobody Mon Dec 29 12:23:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNf4QVtz6MDRB for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNf3ZtKz3XB8 for ; Mon, 29 Dec 2025 12:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbgMQqeQavRW2aF8HOq0LJbgfje3CpellkaMxCdQJU0=; b=N/Hy1/X4Q1zN76Xk+tHd1ACeYbtTi4Io/KQ2QGMGOZLZ7tPxsCQ6XxZTzeBqR5+WmzrsH7 R/qXbbbOjuNbqvDoqLRdoNT15mue+Y9hrfHIeYi4xe+/mbiF+0S6CCFJGqJoNBinDez0CZ mALrEGygV3Qrarz+fu269qpRNPh/HTH8MDGjMnvJmntcgUJaGQlTUZewclajjW0kRqOWpl N2BP61tGcss/9ynCJl6roklX8sC+oL0WASOm+HIa/aaPiqvb3g3iRCbpCexG4JC40ptKgH w7UJtnNPeuEHNiflRhh0vrmbszIZCrjqlnuIWHhCHOJMyANHLTSsUXXIBAl9oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbgMQqeQavRW2aF8HOq0LJbgfje3CpellkaMxCdQJU0=; b=Yl8g+nq6sDWFfuro83QlRYaLPEPlBnFvQd+kZ0U5hUYIPM8thUJPNRuk0iyTdgadeTBNrl e9FPSekGbIqzFFOKGGdvDXti8Z+SdaCExGS82TiqjN7Fvl/PR06B2JrgLsN+2Ul8u4v9aH IYPPIrGtTXW6aI5Hbws0hzhtlUC/Clmk6k7G7KvJSCE40LRD92H6kZt3jy2xqEg94f7CGZ z9oGW3SZ+bBCpS8sFis2YhPttMEkyH7aKhqix6TlK7Ggm+dnW3FfHh1ZAeX2pYhK4cFbR6 Oz5SmcLyFJ27PNczhv3yVgfVXelKctU+DWQKRO65a8+eS3I2v0ztPww44U4liA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010994; a=rsa-sha256; cv=none; b=M+qpflF2RMSn6qG2EKUeaxGIWaNu6w01FStJXLHDwh6whnTrSMW9snJdNki9bPWG7PfMKm kqHWGR7y7oz7CXn62DrRVXNtc3HkuWVkpa9ojTU2+PocIyP6NMyvnQ+Tf8nkw8Yrgd5g/5 diY4hn+54UU5ilaDk5k+zhqsdFMdu5F/X9ZLyozXQMwuSBtNuDvi2BSZk1a76/l6UEhGHs AABIfV1VIc2nQXnuq8rhRtzbnXZTg+0dsgGr47d+Ns35j0iDI8Qqkn0HYpm5Qipr6ytqFC OpwuZd3BvLLbnKNmVqPKI2Gix8Uiiswm0jIhZqqk2vLxtS1NCicGcH2H+6+Rcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNf2y3JzRk for ; Mon, 29 Dec 2025 12:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3262f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 026647c72e82 - stable/15 - fsck_msdosfs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 026647c72e825b0d779a6ae8919b1254c142a8e5 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:14 +0000 Message-Id: <695272b2.3262f.5f15947d@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=026647c72e825b0d779a6ae8919b1254c142a8e5 commit 026647c72e825b0d779a6ae8919b1254c142a8e5 Author: Dimitry Andric AuthorDate: 2025-12-25 20:28:14 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:19:10 +0000 fsck_msdosfs: avoid warnings about too-long initializer strings Mark `dot_name` and `dotdot_name` as as `__non_string`, to avoid warnings from clang 21 similar to: sbin/fsck_msdosfs/dir.c:466:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 466 | static const u_char dot_name[11] = ". "; | ^~~~~~~~~~~~~ sbin/fsck_msdosfs/dir.c:467:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 467 | static const u_char dotdot_name[11] = ".. "; | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit 98c3d868fb5a7da7356c58e8c51423975bbd078b) --- sbin/fsck_msdosfs/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 19516d882e2a..2d7e4bcdc38f 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -463,8 +463,8 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) return FSOK; } -static const u_char dot_name[11] = ". "; -static const u_char dotdot_name[11] = ".. "; +static const u_char dot_name[11] __nonstring = ". "; +static const u_char dotdot_name[11] __nonstring = ".. "; /* * Basic sanity check if the subdirectory have good '.' and '..' entries, From nobody Mon Dec 29 12:23:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNg6qfPz6MDMK for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNg4L1qz3Wpm for ; Mon, 29 Dec 2025 12:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6C+kUsaF99tamFq/rSDelkPELExJp310mPmYmHkBTmY=; b=UWNa8urMEso+92+ZyO9XIJls9q+5e+LAhQTbCHVhmkmGuuh8M5REV29WOUN1VYxFKrTUh3 OCTJpCu0ER1v5pahNwhxWWqjLIWxAvcf99qO3BejBsiAz7SuuusL1bXNCUzM9zH9Z8ubhf J795LDbrDYkbqatQqny9h7ZG4XBJV4ZstKqoXrIUFMH/qRFOR7G8sQdvhPiCYZiiECUQ5/ jnEhdg0vUOWg9IK1/AaQGe6tT4es5otBc/2Q+Pt9J2l08ZX9rhe+ZuW079Anb/CzQbzOaa hzUIjkPURIICESJUeorKk98p/LLjHZOWBopLHhOEXNEnozpH9VjlAojF47udnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6C+kUsaF99tamFq/rSDelkPELExJp310mPmYmHkBTmY=; b=h8RTZD/Jhkq6PB0/1w1yNBHM8jPXkTKtPEpib7p5QwwFlE+Jrm9bGsTh0Eg9QJKX/bRkIT ttsa4/FJhgheKPlgtqYGUDH4FgiS3jcK42zkYDP/zNcP/0O6v2GqFNQkKXN3vL9iGZ/cTz NjXrtx0fIKkWKRm5ddv4rRmxPJGw6qkyP3EbXodvl9PMc4T+lku0ZO9UxZ7gvZhreYllFO f4kNY98oHeBmbJrdeYI+7p/MXeybme1VPVmNGrTggmAx4ZjIkVtE7zpGwpDpo+q8ozX2L6 F9eB5da+sr46Ql1xZm4L+u+UsfyQ4DYexjs2coxdtWZsks0x/sJIZ9dokfI49A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010995; a=rsa-sha256; cv=none; b=PkG2q9LPyVfxzrVg2h0bof1Bsv87UGW1uBxN01joMK3Huo1Gr3eJmQoDtXSLvqru1T2CHl xKaQsbq2V3H6GD4gi+xaZQKL9RjqOVt9rODGMAZFeIpCEqKSS2XxOb/a18nDw99BahSXbz juFXqOsCKZz/OC5S2PLhjyN+h2kVikVZsKxTG1Jw/kzw6eVXdAtxlm6gHVh1v1U6AVu8kM bnqVBEaSkgHdiLy74OLPY8L1TVDS/eGTtLrgWAl3Sje6EHk4DvV0dcV9QalI3HJj6Gx2eM siID1oynQ5oDHocpnZmfowTY8PtTBCUJ2rb7EI2W41sMeTk7l1q6AMtSQr5Zgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNg3rmtz1S75 for ; Mon, 29 Dec 2025 12:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7d9c6b28e14a - stable/15 - m4: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d9c6b28e14ac4ef6cd175365b21eb624c4a7936 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:15 +0000 Message-Id: <695272b3.32a05.35624780@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7d9c6b28e14ac4ef6cd175365b21eb624c4a7936 commit 7d9c6b28e14ac4ef6cd175365b21eb624c4a7936 Author: Dimitry Andric AuthorDate: 2025-12-26 00:30:25 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:19:34 +0000 m4: avoid warnings about too-long initializer strings Mark `digits` as `__non_string`, to avoid warnings from clang 21 similar to: usr.bin/m4/misc.c:123:27: error: initializer-string for character array is too long, array size is 36 but initializer has size 37 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 123 | static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit a3394b6a23fb66ccb7e588129d2465ef8ea26d30) --- usr.bin/m4/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 1870323ccb30..3091f2ad1f9e 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -120,7 +120,8 @@ pbnum(int n) void pbnumbase(int n, int base, int d) { - static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static char digits[36] __nonstring = + "0123456789abcdefghijklmnopqrstuvwxyz"; unsigned int num; int printed = 0; From nobody Mon Dec 29 12:23:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNj04mjz6MD8r for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNh51hDz3WvG for ; Mon, 29 Dec 2025 12:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dP5Tjq+Q6jlpA6tkTUA8Bu/63PFhDDZUI2Kwg/3HiFo=; b=w7mNdhNAF7r14feNG30hzfyNu5JcryZj10XH74BcClcADD74ypmJilj0b8xNxzoB7EKykV mc1AVFScFZ/BPPeLyspdZMeqRhrkVJ+cFqEGHHXdrUYesqCSukoU1D+828/0rqHwMI2O03 DQsTri50LHZddBdZFFZqHL6p0qPQ0htYgIDv4JfTtvxn3hplg5rMDMfrNfnuPArXsoGbdl rIuLFIcqAdvXP6jexGh4vCJHE7XdtAw8Ru68HkB+wJr+t2nE6kH2+qFfz62N4noAQDlncR SHA3T/zDgQqOMYiipaVYvuFY55UIhvBFMzOWd0zrYo51iWoUw+nphwUam8k27A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dP5Tjq+Q6jlpA6tkTUA8Bu/63PFhDDZUI2Kwg/3HiFo=; b=Fb/kwtvJ3qKNEZW1bVb2XFlRatWmg7w5dcyxT9QcmYYS1AISGLPLpyprU/4nelaos9r/sa rSOE0lcS6F45K+WsPyHQr8Tamwt9d6tMXZNR4X9LTtSXPzkTokXlTDQfNJ88oOglfw/QI4 zKN9kqtt5iDoPQEsKSSnOKKc4Y76xLIPdwzD8pdowEegtkWM3UbJmboU78psB5LpW6oKlz DU4iBiclHr7uk7zVILy/wMpbVdqno3wQx7SzRDKAx6NSnA7ClSpyXC+ksdXg8yFGm01kJ0 grZBdcINZl1/3tgBlm6LY+unlN5+pb4bgho+JjLLaLQ40EU9pJT7U5UzsWD6Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010996; a=rsa-sha256; cv=none; b=AEPmcf2JQkq3Owot43HlUrDXP+W6pzqfRp6Y5vzCafYhwMFH0fUNG8l3dLXKDWvkYtiRjC jMDH2odY1SwP8FJlBPdzt7y31iPTSJFOXnCsBTAgx/lYnDM363Rte0W6hCt4uautDR9LCH QQh3MEK3jqTKCi97lk+s7hV9hb8l+OXRFClLtwd/QVIBr7BD3yNBEej0/0mNh/TN2gfAuK mix7nCsz6hIPVcPwnCL1kks7QZI0Wqo8oqYf0nu4yYdbmIy0PNFOg7i4ICDIssCGrkMj84 mVlW4rZBMln7mliC2rGyHkmZb8zy/gJpq2Re7ZdWSqIlNreH222/Yg1d4y81qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNh4bDZzHc for ; Mon, 29 Dec 2025 12:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ed4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0e8b2ab13317 - stable/15 - makefs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0e8b2ab133172da471d6f817a4ebc6bdac15a09b Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:16 +0000 Message-Id: <695272b4.31ed4.49a64d44@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0e8b2ab133172da471d6f817a4ebc6bdac15a09b commit 0e8b2ab133172da471d6f817a4ebc6bdac15a09b Author: Dimitry Andric AuthorDate: 2025-12-26 00:22:03 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:20:50 +0000 makefs: avoid warnings about too-long initializer strings Mark `direntry::deName` as `__non_string`, to avoid warnings from clang 21 similar to: usr.sbin/makefs/msdos/msdosfs_vnops.c:512:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 512 | { ". ", /* the . entry */ | ^~~~~~~~~~~~~ usr.sbin/makefs/msdos/msdosfs_vnops.c:522:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 522 | { ".. ", /* the .. entry */ | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit ba0a11512237681fc621670023d56195cb8c82ad) --- usr.sbin/makefs/msdos/direntry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h index 9d6c65dfcc7d..675a70e26474 100644 --- a/usr.sbin/makefs/msdos/direntry.h +++ b/usr.sbin/makefs/msdos/direntry.h @@ -55,7 +55,7 @@ * Structure of a dos directory entry. */ struct direntry { - uint8_t deName[11]; /* filename, blank filled */ + uint8_t deName[11] __nonstring; /* filename, blank filled */ #define SLOT_EMPTY 0x00 /* slot has never been used */ #define SLOT_E5 0x05 /* the real value is 0xe5 */ #define SLOT_DELETED 0xe5 /* file in this slot deleted */ From nobody Mon Dec 29 12:23:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNk2g9Zz6MD4G for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNj6QpTz3XBH for ; Mon, 29 Dec 2025 12:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFkGWxF7+pjUIf0M0Gw5zqmm4T4iWFZ799NR4P9CUUk=; b=gxxDOZzTgVfOWlRjeg06x8XYWDlSAIwTI/+Wpq9M1q5tuIIMRd8z2vKMGwtOVlCQwWKLBz KxoBK18Sjqyt4i2+d+7iHqGrlaB0MHiAmp+0SAgFPCevVWfbZBNrBiHGnpCQoUkmxR0VsY Zh1vok1eLuxGp4M7w1wmHCo2WeIBL3B7QzEJFsBw8wiGLxixLIYu2tRYOksHgo8cw/LDSc WCd6ABvzZWYCzhnbTl8/iTh0jLrelvtxNeL4SjSW/4zYf9S/NnI+KM8fJ1ZgsYyu1avfe+ wjHPthAHjyfCWS6U4JDUUj+P+r36zFxkuO6AagpqTDVNJvyjI9UsEd9lkNdcKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFkGWxF7+pjUIf0M0Gw5zqmm4T4iWFZ799NR4P9CUUk=; b=dtwjwMlK5dN78YN2QM7zVoGOlnfceWRpsy9QcuNDhgtB5JDwzKT277NfcjRN4q4cn5CtVo 9hOqwToaUnLs621wMdsyIr0om38bq1DpAVLEhsmW+nW9mLLv5E+fcOx1E2GVDOWE95Dn+M dDQxN6+6NX1aFssPuPqDRlbfrMvkAXB5zf+d7TMFayrSYawm0Gb8yyluVLI3RnIskYjwvD BFILHTek6kDHNAk9qgkPx1B6AOUrYWWQqxmL3jfWnWEvxNGnF5HvDaz7L+2+nDrThOC4ti WJeKZfZtC2GJbZkJU0U8MNEua5weVHjZAZphK0YeNUIEHgM0YF+1dyDTG33RAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010997; a=rsa-sha256; cv=none; b=DRhQxBIdpcyxLToGWIz6PXbNpHTYSjHkbVEAllvbWsOd7rjP9phjEO9DgLDSdyjljRW9Fo PJhUrRRzbuWB/PxIosfZJQECYmchBcUDWBhsofPuaePSkzopFAq9dWVz/j0QY6oizLyPn4 wXQrux5ipa3lSM5OKpRr0mKT0QFG9kgQtUHbr87jvGi5wZXYZMEmOiPY3oQetDAcZEJOds sEm/sNwmc+D0YXiaXtyN0XRP0+oIMwSB+iFlEFCdmtacwWovOwR1/BciFAIDiggow/e9z0 zdfCmO6UhtW7rpQIKCeVIDstUpHdDJS2l3dtsCgKHTq/rxhGqPeVszcLzq8DOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNj5SH7z1S76 for ; Mon, 29 Dec 2025 12:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33696 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1b9ab283da73 - stable/15 - bsnmpd: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b9ab283da73aa1807ef29008dd793f3986ae762 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:17 +0000 Message-Id: <695272b5.33696.49ed11ae@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1b9ab283da73aa1807ef29008dd793f3986ae762 commit 1b9ab283da73aa1807ef29008dd793f3986ae762 Author: Dimitry Andric AuthorDate: 2025-12-26 13:27:08 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:21:15 +0000 bsnmpd: avoid warnings about too-long initializer strings Mark `UTC` as `__non_string`, to avoid a warning from clang 21 similar to: usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c:339:29: error: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] --- all_subdir_usr.sbin --- 339 | static const char UTC[3] = "UTC"; | ^~~~~ MFC after: 3 days (cherry picked from commit 3054e22e4524df24908d7e9379681c1ccf829b93) --- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c index 354ea2ece83a..3957e03a0fe3 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c @@ -336,7 +336,7 @@ static char * snmp_date2asn_oid(char *str, struct asn_oid *oid) { char *endptr, *ptr; - static const char UTC[3] = "UTC"; + static const char UTC[3] __nonstring = "UTC"; int32_t saved_errno; uint32_t v; From nobody Mon Dec 29 12:23:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNl3RtMz6MD4H for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNl0GXpz3X4s for ; Mon, 29 Dec 2025 12:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QzGnLaIcHaja4RavutDscUtXPL7BpOxEBRvGsKEl9a8=; b=nt0EfmZDCRLOGkMfKeOLPp+gEI08EEkjUAS8jj3M3Rnx30PXFx0k9mLuO+0mhqGlmvJDLj afAFotPWqHoBAPMBySwT0ki4VYJVYFXe4ifScQTz4k7cKby08NGUtvmmKw6MkEhQCfefPs wJMwfAD8cqKdqkHAuHqmC+kkp1LjoHcYFsv3jC6v7zEFnk84Za6k3JYI1yHQez/sTVlPZz hIBsydxaZBkxr8Udb51jS8PET2fq2UkgMjurZTkglkiQoc61htEWe7sPooJNU7fiAWdn5F BspnB15UHVUSfJJi3f/HgSH0aC5BMu54z4pdwSoDxQm8ynU3dNlrvcYXokvL9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QzGnLaIcHaja4RavutDscUtXPL7BpOxEBRvGsKEl9a8=; b=ov0rAam8zUXxD2+xmrudKk1XBn7d3rN/PDZeJOEx5YrW3jyCfrcVFaNKjADw3Ek8c0Nhg7 /dyVuHfEa4CGclUr5rH1NsqiWmJ/SihyilHyW1WJWYY/ITRW0SxuHajAytUmbxzF1z/Vf4 3l1xSCLOoOVSWWpRnLnL1oBM3ySNaUGU1+3z0QPEHq8a6LaoBngdNmyjIqj/shTd2i16VK ePUaGLGHamwD11HmjO03yGH5jwDNHD/771FY00zrrbuZWl82okBBQAisqbWzR66YqIHHFB LlkTYT9ZGuboKoXqbTsMK+SvmgWVufrL7yXKR7rcOoc3ch9+06PpiwmMc9LCsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010999; a=rsa-sha256; cv=none; b=TSItYdZwp6pPDV5mL1k8ww+Uw0hmD4Ry/vRvpaVycNzQYRYV0qznluslEod+0b83klAX3S Itp3tILfzcmxDvOQGxikBo4RNL0kK8UAECY6UOhgcXoBj9KOwTP5k0a7yMCkkpsoAstoDM mEWWrk77osRejz7mP2n2hPfsICauk42NMTcp5z1C0SC0MnE2Rp92rQGKL9gmzQAdXbPIia 3KYuWlZX/ZupOeysx7Q7HzmAqrIQBPN6uKeGXCNCqjpzsu0VZYZ3JmJNhC6P9JCJYLne5S CysVfInJO0WwfbiFVMa4hbRRo4OCZ7rSyvMMFFErLxQuhgbexZlgO4GVPhpkcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNk6HFqzLC for ; Mon, 29 Dec 2025 12:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 05924176b7d5 - stable/15 - sys/font.h: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 05924176b7d57f837f95ae1d1325e67edb7ceeb7 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:18 +0000 Message-Id: <695272b6.32a09.24d8ffe@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=05924176b7d57f837f95ae1d1325e67edb7ceeb7 commit 05924176b7d57f837f95ae1d1325e67edb7ceeb7 Author: Dimitry Andric AuthorDate: 2025-12-26 14:31:43 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:22:53 +0000 sys/font.h: avoid warnings about too-long initializer strings Mark `font_header::fh_magic` as `__non_string`, to avoid a warning from clang 21 similar to: /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error: initializer-string for character array is too long, array size is 8 but initializer has size 9 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 763 | .fh_magic = FONT_HEADER_MAGIC, | ^~~~~~~~~~~~~~~~~ /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27: note: expanded from macro 'FONT_HEADER_MAGIC' 109 | #define FONT_HEADER_MAGIC "VFNT0002" | ^~~~~~~~~~ MFC after: 3 days (cherry picked from commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a) --- sys/sys/font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/font.h b/sys/sys/font.h index fb5fbbc9e557..d486dbc3a011 100644 --- a/sys/sys/font.h +++ b/sys/sys/font.h @@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t; #define FONT_HEADER_MAGIC "VFNT0002" struct font_header { - uint8_t fh_magic[8]; + uint8_t fh_magic[8] __nonstring; uint8_t fh_width; uint8_t fh_height; uint16_t fh_pad; From nobody Mon Dec 29 12:23:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNz37krz6MDMb for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNy2n6Hz3XLd for ; Mon, 29 Dec 2025 12:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttIMTWInr96Dt6/F4TekfRi+ePPVfqk/fAKbYFsYqlE=; b=qWORJX0ZrJ2wYyvJSPQWu4+YySzHI2avz66LRmkuQMwzs1AixhjolCA16NGm5d3yT1AgsU ljNdKPJfpxGYEixpOQOhfL9W3YWmA0K4wC80qnVjGnT4g9KxiRWekkb9HO4JVrL50dm0Nr YM4Q9yTM377ay1dj6/tbnikM6y+/0h30aEXfB2sGedGUTLRbe3+F7gOwPPk+jaT6ToqKCR miAOFgUcW3vTEfruQXnPqBd87FzaTiPk+up75pMkb2JT9cY+zDcEYhoo0D7vn8JTHH/UHc /P1lVZaoJGyLd6OhINL5d4pP9GwJE9J7oEZy429uTu+EtTjugFCwZaOY+opLoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttIMTWInr96Dt6/F4TekfRi+ePPVfqk/fAKbYFsYqlE=; b=KwAuigYuAQFay+cRsVQWGV5skpUbiMhE4t7KqQTCUoaSTEHRGiUYF+tkDMb5EVXueaYU4b yEMqd2xQrT5F3Ghg5j/vjfIaQoNk/F8bqH6FKRBFPHDdq8PGxQECvBEpHcnUBbbBOfMowF q/LVLrts72ylXDmPGihIsx7tvITIZwDcZTDhZNnubEJx3dcY7YarS5pzM1pHzhAw7HBVsL 5wES1aJP7vhbhwkdCbtkLmNXHYnAQHvwwvuxBW6GJuvGX7KoWVzE2jiGeCLReAiQ/L+3Gb f9pRv9BVl/5vVo38xuzEHdhJV8HV7bqF8MBNlhOq85mYG8rhamuQZeXYVLsCUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011010; a=rsa-sha256; cv=none; b=iHn6iUuXGoTWoP8OO6nJUQU1yANbyN80J778aCYn8m1jB2qzCI+NpCitA2OvpUPk8h6MdM 2/7SwisnOgzzQamsG3ZMHwu4svVNVfRdc1cCXpXMa2PpQe6eXoc3/87kJ1WOkrNvUIIhG0 xPc66pnP2NXdFKL/6ctRy1Z64pjAgfzvM33flKhzZvxyim+qohi2Hf9IK2n5cDFsl7hemI jGxOpfyImZPFghIGoAwgLQgg+Cn0PnoiOIUUYgXWDCQ1V3Yyt0YNymG5aQtbq91RI4sYvv nQgyO2JpH401otgpf24ScFLP/NQSY9EIcH91iAvmkeI7CwRxPOFezkJ9YDOZgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNy2HbMz2Q for ; Mon, 29 Dec 2025 12:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3191d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9f60c9b76fa4 - stable/14 - m4: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f60c9b76fa4b45c73531073c306e0ddeb32cd16 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:30 +0000 Message-Id: <695272c2.3191d.4c3c5256@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9f60c9b76fa4b45c73531073c306e0ddeb32cd16 commit 9f60c9b76fa4b45c73531073c306e0ddeb32cd16 Author: Dimitry Andric AuthorDate: 2025-12-26 00:30:25 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:19:40 +0000 m4: avoid warnings about too-long initializer strings Mark `digits` as `__non_string`, to avoid warnings from clang 21 similar to: usr.bin/m4/misc.c:123:27: error: initializer-string for character array is too long, array size is 36 but initializer has size 37 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 123 | static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit a3394b6a23fb66ccb7e588129d2465ef8ea26d30) --- usr.bin/m4/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 73ced384466c..7d2473f88168 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -121,7 +121,8 @@ pbnum(int n) void pbnumbase(int n, int base, int d) { - static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static char digits[36] __nonstring = + "0123456789abcdefghijklmnopqrstuvwxyz"; unsigned int num; int printed = 0; From nobody Mon Dec 29 12:23:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNx5BNGz6MD4L for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNx1wc7z3XNl for ; Mon, 29 Dec 2025 12:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqkAQILj2ESSOOAOlCWT8o5U2FvccMfNevl8T8I1L/g=; b=cTEH01sPSV9kZ06vWpXHC4JvOS4E35PlJuk5FTYmvz+m+BqblDmLi3aAUGyOuz5ahtGVNF R6bqJSU3kUzbFgaMmTBivmQxZkbS3i2ctL/Xo5zPbcdDd3d9bqnQxXJjMIkTbkXNOP+zeR UbE+puc45n5AZOd0sFdo2hguiZ2lW5ZCREunPTb9/I+UAN9jvC/UROVaDNMnYgSqR14ODN oZLTzrIpDWXdn2fFy/hkiN3v7KOUO7jN/a8F4MBkLS/2/UGyi2kDe1mnCwNZWQFk0QCOJt 4k6rDMa14AHPIpLPdgT1Jvo/5LH1n5EWxYyYru1ZV7S7ezcAJC5DhEskBD651w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqkAQILj2ESSOOAOlCWT8o5U2FvccMfNevl8T8I1L/g=; b=w4anipsjA0FA9DbLlanfIB2KX1MJZ032jICWyov28TqqmxQl4QS5M09rAf8RR5fQu/eBPg iEPhqewEFQeXwKpGIRRp7rFp2sc8QRPh79iGcGQnuhJbCs+61dlcpkhptubv48t+X3Cc8e daxkY2avu1M2x1SJRyjoxq21x7x41Ypfc+Pg/iUM1tFCsu0BAinJUD48u87MlswfsZfHAl Wi1E6rKVWoJItLPb4Hd9euA6FgrbPLZpT+npe2AnyeJtyOxziEwbUI3tbLBRIMe9hK5PE3 AAWNXJHIJYm7W/w3UyTMDjKZvGx7ED8hAOxKYtCJIxNNoCMcvyceFLQRDHJCZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011009; a=rsa-sha256; cv=none; b=jTmqzfmgLC+okkFhpMw5YLJjKVoH0MHYx0notcMWOx7ukqloJpI3bMDq+T0fIE7/pHeuKp Q/sw3y4dEszcgtyz0bU3jJWD+VekEFccZ4z3Xe+bHzSMv2ArpXgSS8+nORe+UFyPtgATf1 H6sVnpmzqHofNT3aO4PKwRVkebKxYUjZSry2cQIDqQBalw1AIQVhGtA65FQVtmLidDYTPj Uh4vEAKaOFf1nXn4R7VZgME9PzjdBmtmIerQZ1trymBP1BlbenHNvTlR7gUo19+04Eabn6 mQnEn4PiKzLDWVvRXBAtBGYeZLr36o/2yOB2EykHU6iUTreKoyUoI5ZNoBkcRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNx1SDMzTl for ; Mon, 29 Dec 2025 12:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 319b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5402a4d73fe7 - stable/14 - fsck_msdosfs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5402a4d73fe7f26d9ae7d6a9a5937c87ad06b5a2 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:29 +0000 Message-Id: <695272c1.319b7.7067835e@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5402a4d73fe7f26d9ae7d6a9a5937c87ad06b5a2 commit 5402a4d73fe7f26d9ae7d6a9a5937c87ad06b5a2 Author: Dimitry Andric AuthorDate: 2025-12-25 20:28:14 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:19:14 +0000 fsck_msdosfs: avoid warnings about too-long initializer strings Mark `dot_name` and `dotdot_name` as as `__non_string`, to avoid warnings from clang 21 similar to: sbin/fsck_msdosfs/dir.c:466:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 466 | static const u_char dot_name[11] = ". "; | ^~~~~~~~~~~~~ sbin/fsck_msdosfs/dir.c:467:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 467 | static const u_char dotdot_name[11] = ".. "; | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit 98c3d868fb5a7da7356c58e8c51423975bbd078b) --- sbin/fsck_msdosfs/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 19516d882e2a..2d7e4bcdc38f 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -463,8 +463,8 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) return FSOK; } -static const u_char dot_name[11] = ". "; -static const u_char dotdot_name[11] = ".. "; +static const u_char dot_name[11] __nonstring = ". "; +static const u_char dotdot_name[11] __nonstring = ".. "; /* * Basic sanity check if the subdirectory have good '.' and '..' entries, From nobody Mon Dec 29 12:23:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwP04DClz6MD4N for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwNz51jqz3XV1 for ; Mon, 29 Dec 2025 12:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kXpwZ30cGk8nYmZK2sENd5SXfRQklC22KT7sTxFLlI=; b=keuo5/krYH4uzOxC4+1W+HQikzpjGBk6wJO7bWQgKqTQhrZi4fVpNxh5PyT1MkPfpLrl5R t3y8upHL0ANn0bMLUUCHW6hsEguNzRmJYzmPJsyMRrU9M2XAj4t9XpSdmtES0MAs5zaJk8 Ahni5SKD45yy62cx/fq+Kvn/Qr2/HCKVIiqzdmgkxkuOYLOJV/4mj02Vfgc8G/K0GkDUVa rY06tFFR8nGPDm4PIvuVD2CjEmsqBWXCA6HjmDUhcaFhXJwHa/j9eK52vmHk1Yox1BU/VV L+k5qJC6uRLw8MvBLJ/QYNn/D8mdagX7LSfPDmLLZa1eoMWhQ+QLEc4LUIQgBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kXpwZ30cGk8nYmZK2sENd5SXfRQklC22KT7sTxFLlI=; b=Vk3RCWRp3PlGwr9uAj7BKuI6vgM9ZXjLeEK6CJ1Z6G7IxO+h+96evjrDtEbdUroRUZWKww wqygJuD6HdtSWNC5F4BMrjd+4yBcYi1JhO0fs6EDnwi4vIY5xlsi6YePXt6xEdg4nOoTSI QoENZslC6iAF99f9dNrXI5RjTT+qCZQBp3THvl8AXsRjA4iYD4I0AHvMHF4XgghvZgoCMa Nu5LmtzN8rdFexQUIhfxIxFTu7XW7McwM5EBMHYo7qrdnDHgG++i+0FGhmsKwJYwYMrKW9 ZXuLtJaD3259dYna9n5s/fRo5f/kADWPAWTqb1cAox06tiofIoYQk3kcoz5d8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011011; a=rsa-sha256; cv=none; b=KjSWQAzx53HDZLlDXypLEbCd1m6hTecNuBVf+olz1b5VMclzXK1GcGxbqwWQuZ+LdAgsPZ dbz0oB+Kx55kEqSoRIqDuF6w5CvjZnj5V1ThKsJ9EDAEVTA0gfgnaUJwlV1sB+gF7HaHRo mdbQKLMGx0ud+OuDIHM3phLZgg00ZhfPxCDfn8igk6ixGwg0/jNzlZnyGYC+aOmBudN1bv xa6LBUJfr0bb93jRlhiUdSqfrx7floxFT1UwdX3rrJy4TY5oplw7uGCZkewtug52nBMtlb jX7Scqo6Ejsg6q+ROS7fd5LhHlr7DFLIyot+5YRuLg15qN3S4CtH9nSipEWq0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwNz4BQqzFd for ; Mon, 29 Dec 2025 12:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 43d41e72fa2d - stable/14 - makefs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 43d41e72fa2d3365241346c8b122c1a5215f2723 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:31 +0000 Message-Id: <695272c3.32e0b.6e84bced@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=43d41e72fa2d3365241346c8b122c1a5215f2723 commit 43d41e72fa2d3365241346c8b122c1a5215f2723 Author: Dimitry Andric AuthorDate: 2025-12-26 00:22:03 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:20:53 +0000 makefs: avoid warnings about too-long initializer strings Mark `direntry::deName` as `__non_string`, to avoid warnings from clang 21 similar to: usr.sbin/makefs/msdos/msdosfs_vnops.c:512:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 512 | { ". ", /* the . entry */ | ^~~~~~~~~~~~~ usr.sbin/makefs/msdos/msdosfs_vnops.c:522:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 522 | { ".. ", /* the .. entry */ | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit ba0a11512237681fc621670023d56195cb8c82ad) --- usr.sbin/makefs/msdos/direntry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h index 9d6c65dfcc7d..675a70e26474 100644 --- a/usr.sbin/makefs/msdos/direntry.h +++ b/usr.sbin/makefs/msdos/direntry.h @@ -55,7 +55,7 @@ * Structure of a dos directory entry. */ struct direntry { - uint8_t deName[11]; /* filename, blank filled */ + uint8_t deName[11] __nonstring; /* filename, blank filled */ #define SLOT_EMPTY 0x00 /* slot has never been used */ #define SLOT_E5 0x05 /* the real value is 0xe5 */ #define SLOT_DELETED 0xe5 /* file in this slot deleted */ From nobody Mon Dec 29 12:23:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwP105L6z6MD6p for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwP048wRz3XGn for ; Mon, 29 Dec 2025 12:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tGLUkGxuqq9iTCwexYsoNIr1hjAaRHhGgDCBq9KkhmY=; b=ASZ4i3+JNfE33GnL4B1QNPAdmRT5dKIJXyxEpi7X6epWp+Ui9lCco6c7axtf2E+37zrC5T +PPQhvNDzy1/QyM7AsFYsrznnR3jYf0EMp6gN083rU258/RZx9RYPbxzzcl7eBLwiIWVWk UfWmPlfebpLeOsoguc2I6w83MH2VPmXwRInEAoQld7svzDE1booGq4msTKqxR2/RHVaBFO CCPIZUKB3IW8upIgsb4xNaogo894oLoo2C9MUmMkmtUkEKwMzB7icFUTZsXSuQpC7Rs0t7 AYguokmQhSZVKrjhWUOPS/q2e1xCmYXQ9prkGZFYG0VDvb3bHy5/xfedgzyx0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tGLUkGxuqq9iTCwexYsoNIr1hjAaRHhGgDCBq9KkhmY=; b=A09H/MgpWcP25/UD5doH6aOL2m0dXwTjz05nA5r8lVkQ339vCtKmP7K8XCiARUJev5bVjq zLikaVHpZWWWCTMVIIb0clLqYfiSltfqak2fbjyPKhsQKZVN3mzTmSbw16eb4BF+YFjZQE MLua739UQKj/byZvXKy/wimHC1vcFhlAfWAyibjilBpZBKiPp1IUEPGh4upqVOE7pvE74x OOw+FZkUkMcvwAELVyiEaNZWc9oETqHjAWx2DwsEwYXQkVs0R53n8VFhHlQbzvFer100Jk 4m7uQIhT/WM68AzRgRig0LNfSKIVn/TtCHmeWav6kuiirOC1gdvJQMdg88AJGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011012; a=rsa-sha256; cv=none; b=mNM1UNY+6osnO15c9XOnhLouK8zw8dcmhdqVcP+mG6PESkEsUFBfOTon4zSAss+9Av6NlP GzBzG6VvGG95iFOeqSj3Fz3395hvYqdVXjuVTGuJitLbjRBo0QuWErHQL0q5Mu/qQeFDv/ ltdDD8SBmrVPjLeI81VCg0B9sDSAc7noDcqMSD1tN2LL9giLvCPyMuO1yPxdBppoj0SNgb Kvs6qF/eRIaMnCWEGDeHhFnx39e0LyTS0o290JmW5jHfnjouKg6J86uZd7qwM+8ojRkFvs bgdP+nc6Xda2r5GbEucL0FZY+qexWIqaLu2bcdkVXQoZOK8QkAOpJLE4TqvLlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwP03bdJz1S79 for ; Mon, 29 Dec 2025 12:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ed8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4f8f0941c285 - stable/14 - bsnmpd: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f8f0941c285a897beefe1c9795be8d9bbdcf724 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:32 +0000 Message-Id: <695272c4.31ed8.6875ab34@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4f8f0941c285a897beefe1c9795be8d9bbdcf724 commit 4f8f0941c285a897beefe1c9795be8d9bbdcf724 Author: Dimitry Andric AuthorDate: 2025-12-26 13:27:08 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:21:17 +0000 bsnmpd: avoid warnings about too-long initializer strings Mark `UTC` as `__non_string`, to avoid a warning from clang 21 similar to: usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c:339:29: error: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] --- all_subdir_usr.sbin --- 339 | static const char UTC[3] = "UTC"; | ^~~~~ MFC after: 3 days (cherry picked from commit 3054e22e4524df24908d7e9379681c1ccf829b93) --- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c index 354ea2ece83a..3957e03a0fe3 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c @@ -336,7 +336,7 @@ static char * snmp_date2asn_oid(char *str, struct asn_oid *oid) { char *endptr, *ptr; - static const char UTC[3] = "UTC"; + static const char UTC[3] __nonstring = "UTC"; int32_t saved_errno; uint32_t v; From nobody Mon Dec 29 12:23:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwP21LT2z6MDMj for ; Mon, 29 Dec 2025 12:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwP14slsz3XZT for ; Mon, 29 Dec 2025 12:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2sWGEwgdJpbdRGzOBLVJOEq2un7nE3lhqaZcg2K/02M=; b=HZX9Q8Xp4gFTPhPE1emqwzZj6yKeHqVIhN/yVKZYczjgybT/l/wToEmFRI/WyodByyf2yt HLQCEfxScN/vBGCmBvK5Lyz0/fs6+Kkz53OYjrTs3XF8Cz6nzG6rvLMGH9DTU8EI5xtION LK1HXZEF7xuNzouNrv9bdpiXaoJfyPUZcVTOrHP2P7r5cPyRpSuL4T6XilF6bWc1i6BxpE hLO7d+90PVDUpnPFQsQjQpK/IEQxIs3l0fvcJeOJDtFgZcjGOvfOG8x2VzyTHM7wxlychz pk2utce7QhlSKSCEnZAmgliuNs54ouZ3iIFciOt+kVES8SCU9zqacNfW7QTDmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2sWGEwgdJpbdRGzOBLVJOEq2un7nE3lhqaZcg2K/02M=; b=gLjVjsrGW/RWeTEQ19b+2KCh+4vBG0cJn/Bfr2C+ix6X9YMfD53VaeHpIvWZ7qtzJ6lZw4 vlToksES9msufV5Q7UxrSXfxSrivGu43SzA7AVLENh2VHjuX4pttrdCz/a7PwkakDmOGau xGtvz3Zk3oOaqyQcHwHx2nz2jj1AFOzSiH2g0dxRjKaB2RQHsDaD/8I19JLVe8/C1wVjNm AVydK9yabIEAq0+WLd+GczELWKlIt4KH86KjAednmVToUBNdDPt2vPaIH7BIWZUwPDShul VJnwEtm6D2NyYbah/XYePj/riAxWL9UUl3sy1LG+QD20hqjyjDDWhd0HUyHetQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011013; a=rsa-sha256; cv=none; b=VyyuyAyKTM+AOq6HhKUx/cED6U9+t1jx1622OvVCAZt6wf8fnePXpQvXj8M0L2nsAWek/L k+nobmVChe+NMmI6Zo+xuDSLoVgmpXqjuPHHOI0WqjT1iGOrGva86IyCkppe11VoviZt0K IdeJYe8Hm8IxfIBQ4YMLctFJbr7SiiOnB5RuW6fwAOPwvKOLt6UUCtTUNuGLb8AY5P5Xgl 57LRi0GLbzdVz1nIbE7D6rxKsO9KvNgyOJQ7GMwTFBovf17akfR4mA7IGaoTtUT9zghp6Y M9zOhzKYz44eoFUYMvNKSwECC4ySFJ2EXly2ZVQutpMQ7c9xZWnQRdwZcP+sIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwP14Pd4zTp for ; Mon, 29 Dec 2025 12:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 326b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 143273854faa - stable/14 - sys/font.h: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 143273854faae2ad27193ce58cab773356a70e2a Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:33 +0000 Message-Id: <695272c5.326b4.23f86431@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=143273854faae2ad27193ce58cab773356a70e2a commit 143273854faae2ad27193ce58cab773356a70e2a Author: Dimitry Andric AuthorDate: 2025-12-26 14:31:43 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:22:58 +0000 sys/font.h: avoid warnings about too-long initializer strings Mark `font_header::fh_magic` as `__non_string`, to avoid a warning from clang 21 similar to: /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error: initializer-string for character array is too long, array size is 8 but initializer has size 9 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 763 | .fh_magic = FONT_HEADER_MAGIC, | ^~~~~~~~~~~~~~~~~ /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27: note: expanded from macro 'FONT_HEADER_MAGIC' 109 | #define FONT_HEADER_MAGIC "VFNT0002" | ^~~~~~~~~~ MFC after: 3 days (cherry picked from commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a) --- sys/sys/font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/font.h b/sys/sys/font.h index fb5fbbc9e557..d486dbc3a011 100644 --- a/sys/sys/font.h +++ b/sys/sys/font.h @@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t; #define FONT_HEADER_MAGIC "VFNT0002" struct font_header { - uint8_t fh_magic[8]; + uint8_t fh_magic[8] __nonstring; uint8_t fh_width; uint8_t fh_height; uint16_t fh_pad; From nobody Mon Dec 29 12:23:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPY4MBnz6MD9L for ; Mon, 29 Dec 2025 12:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwPX095xz3Y7Y for ; Mon, 29 Dec 2025 12:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SmEIH2r4zORI/E7/nMw2nhA6dUggNjEYEoBqWhb1dzw=; b=UDJ8QlT2MWjX4iErX7XvllkCofUwQA3kP/ZgCGWOV9LT2Opw2Ft3WHg+7y5p4szvBFnu3G KoSXRjnZOCFLcXIJmn1+otGMG3z0Jq6uERlavJiQpPVl6EL58eyoxOFQ7IUvx78stNtadJ MVQoRYeI3pTrK1E22wP7ggJWrokEpPu6uFoMHL2E/C+5Vo21fJfSdt4Y8yIjCLS5z23Wtn u9XE4CunP0zXPkBRPnawB45AK9niyAer15mhXRlgN/gSjGjDVcO3/mtn5EWaWnEG23lakj Ktkxvtegh9odsACF00BF8/7DS37HUYFZcoF6uDtRt4/8jc3b9PP5kva2DOHOMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SmEIH2r4zORI/E7/nMw2nhA6dUggNjEYEoBqWhb1dzw=; b=s6truREsQQU7iKXvM0fZG5klB1d0KHlp0peRhgsXofywzENrfx9NoUqrNzXl9rokrMxAVP Nyv9VW5OD5USiBR/AqKuw86s1rlGl0ZwDhC6hqIPo09ycc3ACapgofUcybTYGk2sJwB83d D1Pnou9lIvvaDiAYQq4nDbulX1Cy3SoiM6zRD+p9dwZhTxSyblMk8NZA+rBScmv/su9HHf 93m7bfyJRO8yP9Zg3PfM48EhRHgJQ6H4qs+znTMl5cpBa40Zg2oqxmIUXDDW44FE90YLSD OpLBKyA7N70B/7YHesdOCIc79Di/blAjEVW4gV/Nc+kY/t8uhGbN4iTJdgAyLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011040; a=rsa-sha256; cv=none; b=F73PHZDxtyeRScLOq5D0K5oPvFFYcy5Lr7uClgGGh7XSMmxpkCttcQfL0tOrV10g4qYxAe QRN7vXumjqoHiKjSTlq++/RmxDEUyi+654VYmbqyZ6So7EKwjk94NMxpSYxJA4UZonDay6 w3WNY1ZSGOHeAPCl1w6MF0IeWjgXMmcn37Dv57TIeL95TjDK0fnr5M8iw8tib5bf3/U+ns rrlytrNjR3Uc7vCytGLaMU0gOm61WenH6lxK/egal2/TYBwM1ZQlAoS5KAS6NsNAdopk+w 5ZROf1QTE2CDr/HbFRTGYo9/jI/WbZ3/d6YqClfXWHAOfGJ9O6PMv2te+j0BIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPW6dQrzTq for ; Mon, 29 Dec 2025 12:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:23:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 21708f480a10 - stable/13 - fsck_msdosfs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21708f480a10738f1930c312c500d9a2a25cb5b8 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:23:59 +0000 Message-Id: <695272df.31f66.2bb34fce@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=21708f480a10738f1930c312c500d9a2a25cb5b8 commit 21708f480a10738f1930c312c500d9a2a25cb5b8 Author: Dimitry Andric AuthorDate: 2025-12-25 20:28:14 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:19:16 +0000 fsck_msdosfs: avoid warnings about too-long initializer strings Mark `dot_name` and `dotdot_name` as as `__non_string`, to avoid warnings from clang 21 similar to: sbin/fsck_msdosfs/dir.c:466:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 466 | static const u_char dot_name[11] = ". "; | ^~~~~~~~~~~~~ sbin/fsck_msdosfs/dir.c:467:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 467 | static const u_char dotdot_name[11] = ".. "; | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit 98c3d868fb5a7da7356c58e8c51423975bbd078b) --- sbin/fsck_msdosfs/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index fbd1929f17f4..d4e9df8f05c8 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -450,8 +450,8 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) return FSOK; } -static const u_char dot_name[11] = ". "; -static const u_char dotdot_name[11] = ".. "; +static const u_char dot_name[11] __nonstring = ". "; +static const u_char dotdot_name[11] __nonstring = ".. "; /* * Basic sanity check if the subdirectory have good '.' and '..' entries, From nobody Mon Dec 29 12:24:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPZ1gngz6MDCp for ; Mon, 29 Dec 2025 12:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwPY0krjz3Xxy for ; Mon, 29 Dec 2025 12:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011041; 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=kmrbiTezFele2C07I2cgeM6Vrx2dKVmBhCm1SrfHMr4=; b=fgvNquvUawQGSXg9WimSsmUWDMOa2FT4IkN3tN5pWwzlE/zEq40caJ2SiGr+EKwU12u8D+ loorILsyUCJvfJkS0KkyT51L/XVf90JhYKgsNhLE/vfBVQ0nK2Qs0G8zKZtsPavCWXhh+v j2NZLHGdQtf1mGMsakWrfcUnEObcQtcQNA9+LIXudWuVZ+bdh5AtU6jkNnUuUKErCjJB5W QabbYw0wLGXrt6zie8bcRlhNE2Aw+xryHd5t5MlC5tsniran92GzBNUeEYTWAuN9kEFBoZ wqqDezHK4xF1hLYQdFpqhmFxKiXPyXrhfJqcEYZ/E0TgVCdYWPJsA2bUc0pZxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011041; 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=kmrbiTezFele2C07I2cgeM6Vrx2dKVmBhCm1SrfHMr4=; b=v/WVkWlp0Dfi2+rtmZIHQhxRVDJwQiPP2VA12D/ia91F2tELocIX1sVX1kuorXqi61cHu+ 0W+fUFAP0GTyayiTGhefKW2M9enfW2U3hXpvz/97IT3EXGR44KsHk7QsX2lXqJGwhbnPhi aeYMcwhAS6HkgBHpz+0JSxA1YLT5zLstnArC9kn/Xj/GCbuoAv785RHQ3WdTjILQvr26tT TvVzfLizhEZjVyu+o6FjhqzYW47OdgSd4DXdvzNYcWHbNw/tp+j4zmvm8PDkkDqF5+9kYM vwxZ5unXw+dFB6jaZrMVA9CavYfYXNs+RRISUpA3826RMdPFRMoEKqbFsW0zMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011041; a=rsa-sha256; cv=none; b=eEjVni+a8zoNv5qLQMYnuvhlOdF5kuKQfS6RWtb7uEOhD8mJmiI60v0NC8NnvF9PrPNx3Y aZENQvDWxgtI4ZfQ2E8k/uT+sPvSJuwkE/tfIDKVXYGUlT/nnOrviNKpa4SBTYtEaios5I 2gJq46oEoPC+TivDeI3E7oMjMMs+2e6VjM6O5ybvv3z2Av/UG5wMDUKp3FXrCfkDGrYWcU pM5pSexFqSc0XY66PwRaLOVnuQin884UGwFMaLIZ/zjIoYd4OlodmjEaVSz4TwpuqGgFIc Un43zw3uymISYd1j1FmoK67vxlgIljqUXbKkfP74nk0Gp2d995HlviETYVJNWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPY05qYzFg for ; Mon, 29 Dec 2025 12:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32892 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:24:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Eric Blake From: Dimitry Andric Subject: git: 4cea8771f773 - stable/13 - m4: Fix OOB access displaying MIN_INT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4cea8771f77330537c99da8d3db2bde315954759 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:24:01 +0000 Message-Id: <695272e1.32892.7716401@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4cea8771f77330537c99da8d3db2bde315954759 commit 4cea8771f77330537c99da8d3db2bde315954759 Author: Eric Blake AuthorDate: 2025-05-24 17:21:38 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:20:29 +0000 m4: Fix OOB access displaying MIN_INT Previously displaying INT_MIN resulted in an out of bounds access to digits[-8]. In twos-complement -INT_MIN is still negative. PR: 287013 Reviewed by: emaste (cherry picked from commit ab4edcd552c967a400e85afc0fd3e6729fa9ee2c) --- usr.bin/m4/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 4533e106a37f..73ced384466c 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -122,7 +122,7 @@ void pbnumbase(int n, int base, int d) { static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; - int num; + unsigned int num; int printed = 0; if (base > 36) From nobody Mon Dec 29 12:24:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPZ3v5sz6MD76 for ; Mon, 29 Dec 2025 12:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwPZ1HW8z3Y1V for ; Mon, 29 Dec 2025 12:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9L3StOTZPuLY/TMnI7QV+2b9w2WJQukdAwBsifEjaz0=; b=CiAfa+i4/lzEO328n+NCkq/BZyNtS/inhZxZoCIJBJThO67wHhVSVsf6jibCJBJ2zEIbbm iZsZjQIo4Xdem9Nr8xc0rU2pe6RcGUiXN9PFTq8s9rSlRcM3v6/QIJokFKIaoBoVeu0yXZ 4vPIJMSHlIDV/ZGyyYfOIWecKNXndqaTPv1WSdbB9X8MiRe4CIrUq+uQOBiWIGaUnplHVn vKXJmGMCslB52UU6LdBgTZpBtq5St1CF3VrzqrQEKB8KmP8hzpYrEJbKhVNLkJ7oY8Bl/m VPhgHMj9eqGnTFv4BlclKImzBlPivHZXIdphLc/8y7I5qDr1zWT6GLIaP1qjcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9L3StOTZPuLY/TMnI7QV+2b9w2WJQukdAwBsifEjaz0=; b=gj1GyPRf5VqJ6WwR9HEJKHVQEuHZOh2fW0OVLdQ6yAeL5L8LxnZgDlNnVsx1XjcQGlkbeH rW1Jsf0cEI2K9PeQ0o5xgYQDL+HDqLrAthYYtLPAtb1hucAFFN4oOzQFlbd8aYMdWLbA9a kL6gonmOQ9784jDButlgfz/s5FILwzXu/Cba7f/5WFwAmIFsDJK/WuqfjVPh77xgBjmv6e 7urT4n/l8VM0lt8Q4GwfdlA7c86osdeGClG6QXxLA3k/JFWh5RO6Yb3GKFtaCP3hhJQrBJ hSzuB4XqXo6Irvb65qQ94xEOo2TICVjnyTTdK007D63xQzVLbmRMgMlXsEU2Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011042; a=rsa-sha256; cv=none; b=bt2hs2vp+pSjQUZJ+dooTIeu161BKUT0IkJObK74Gb+1Oqb1gTbW6FYkeFUaarJiXe02ZW UvEcbqZiVWICaqN5sBwouj8P/bqgaG5Lgeit0OCypQyOVUCOAHeVHTJhoyKppyAHUo2oZX 96+/LCNCrNckbClpok6Z7O+zG5RGsfWudmQZUPYB9nHhxnhW8RDMALQ7NIvT12zNAhYlZE GG8IhQnuy9nIbnT5p9bxlnzVCt4LceiFNl/3LH+8MbElscddTZu57e/3Q23BhrwjDF/2AP ufRIxztPFMLh3r3pUJi0BV16n96V9j/0Kv5dwd/sg3u+ix09OrzCu6o2eYUB3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPZ0pLLzFh for ; Mon, 29 Dec 2025 12:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31dc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:24:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c765646beedb - stable/13 - m4: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c765646beedb49441f6fa782cf90a305417758f8 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:24:02 +0000 Message-Id: <695272e2.31dc6.4a5dc520@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c765646beedb49441f6fa782cf90a305417758f8 commit c765646beedb49441f6fa782cf90a305417758f8 Author: Dimitry Andric AuthorDate: 2025-12-26 00:30:25 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:20:37 +0000 m4: avoid warnings about too-long initializer strings Mark `digits` as `__non_string`, to avoid warnings from clang 21 similar to: usr.bin/m4/misc.c:123:27: error: initializer-string for character array is too long, array size is 36 but initializer has size 37 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 123 | static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit a3394b6a23fb66ccb7e588129d2465ef8ea26d30) --- usr.bin/m4/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 73ced384466c..7d2473f88168 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -121,7 +121,8 @@ pbnum(int n) void pbnumbase(int n, int base, int d) { - static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static char digits[36] __nonstring = + "0123456789abcdefghijklmnopqrstuvwxyz"; unsigned int num; int printed = 0; From nobody Mon Dec 29 12:24:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPb3yJNz6MDTK for ; Mon, 29 Dec 2025 12:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwPb1zjJz3Y5b for ; Mon, 29 Dec 2025 12:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S0ovJ/z6D+8FPFZJeYdVUFIU0a+7T0YK0/9zKFsGEX4=; b=Jdmv3vSDp2z5JWQgKMneRUD+zSJgIGXXhKS/L3WVple2oSVTm/AxJNW9R5HdYGXXKEDUfk xF6QHbMiY6Gp4dIwGe4Jno+Dq3QCutzpeei1hoSxPXL1gD5Lc4sqqAsaZOcS6hnAo8lfC9 dr1qTHX1n8TY6lV5F/rj6jjpOkNAGEM/dd/AGcV3xh2uGHqp0VX7SXocXnBgHXvZjqznAw Czn15KVN0qBQH660X2h139TEdd6aGyePAR1puBeeUQJ/JOOZLgrLheWDDiKII11sZuNItc oDcWW9ewOnpWpggLo1mY/1S27tme2Xpvd0GeZCV7JLrNNtGFIlkCXznBTpz6OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S0ovJ/z6D+8FPFZJeYdVUFIU0a+7T0YK0/9zKFsGEX4=; b=A9/sJ6kPa3OJjzShjxccIkqlpVL+NCcmxViCS9t70bcxv7t/mA9g/HC52Lqrsk9dPYGKDv RiJtxznWeKufXDuJXP4i+tYJaa8BH2gbiANqxX3dNOXFENHsMKLMqumTEGmn5E+bpCMsN+ gAtwy9AnpUOu2amy3fd4myigp361jzEljz3ZUDhBrRM3Z3pCMW7WvLG6ryqbkihDjaobVy Pnrs7HM/hw+v7S/HZV8sUM8SQY7AkvHgco7/bjg2WGKu+Q/fL6AdIFXfiMvWa4Rb11g32N gFvLCO3+rYOJPcCNSMnIpbriXVAbs102TFkRzrEBt3uQBs7aY1FDa6tgs0kAmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011043; a=rsa-sha256; cv=none; b=PZjrfpbLgiJKjq9z5bsRWLfUiv7GyRH7mt/iatFTBOSPGQlICsFUkXtGcVJ2jkb6aBbc3B n92lkocYwnfLKw6z4sLMj7oVheouSIKnPbzeEDI7Cln666WhB/TCMNb71ebW7CP1v71puC B6/t4b9TxmwkNa6i9LmwMlwF3RDxINCHhT6o7lTXiWdCnZmG6eVkGd1KaScgTMUP6lFMuE M/bj/TCx6GCIC9IitIHbwKt+JMp0HwFrh5eDN2nYGONDUZqAdQ+wMr7ZRqpSuz7pkcWDoH T4WFcrVNytcBL09cADQyCKKA164LPEFZKB4w3mcV9pgMGsBUo/dNKnO4fuRPsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPb1b5KzFj for ; Mon, 29 Dec 2025 12:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:24:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8a620bd70880 - stable/13 - makefs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a620bd7088075808103639338e35f730ac93f3b Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:24:03 +0000 Message-Id: <695272e3.32a0d.4739ee2@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8a620bd7088075808103639338e35f730ac93f3b commit 8a620bd7088075808103639338e35f730ac93f3b Author: Dimitry Andric AuthorDate: 2025-12-26 00:22:03 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:20:56 +0000 makefs: avoid warnings about too-long initializer strings Mark `direntry::deName` as `__non_string`, to avoid warnings from clang 21 similar to: usr.sbin/makefs/msdos/msdosfs_vnops.c:512:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 512 | { ". ", /* the . entry */ | ^~~~~~~~~~~~~ usr.sbin/makefs/msdos/msdosfs_vnops.c:522:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 522 | { ".. ", /* the .. entry */ | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit ba0a11512237681fc621670023d56195cb8c82ad) --- usr.sbin/makefs/msdos/direntry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h index 9d6c65dfcc7d..675a70e26474 100644 --- a/usr.sbin/makefs/msdos/direntry.h +++ b/usr.sbin/makefs/msdos/direntry.h @@ -55,7 +55,7 @@ * Structure of a dos directory entry. */ struct direntry { - uint8_t deName[11]; /* filename, blank filled */ + uint8_t deName[11] __nonstring; /* filename, blank filled */ #define SLOT_EMPTY 0x00 /* slot has never been used */ #define SLOT_E5 0x05 /* the real value is 0xe5 */ #define SLOT_DELETED 0xe5 /* file in this slot deleted */ From nobody Mon Dec 29 12:24:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPd6ndqz6MD4r for ; Mon, 29 Dec 2025 12:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwPd3kcxz3YJq for ; Mon, 29 Dec 2025 12:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dc5mTGEu6nFyR5VMjBmyRdptzr5AvGx6pCE/eETGOM=; b=AQ7NUdLVksHOP1I6VOx3AWR7t3P7/HsuVCxiv+6dEvdJGXab3535vxUv8T6pzJxwQr71xJ w3lo44OeW7IEqikK/7iiiDaKkSsLPkfpUDvok7r02bUqjTArvYZR4SuDHWUnV4f01I07Vb qIfgbGwoZKEIsHMW5alSh2oT3H+PEek6IU2+cEMzt6UX41b2jakep+VyNkeXWjGjb2doae io38VEfjTA7rh7k52BoJoBQJV9qNitrgIRze847qW9W1cM+M6y4JjDLNAmOC5xJUqlZvZk Jp+TKxhf9gArnrVl4fsDt/1ec5kSikwimO2EFa+WWZG8PLOppqKh0OIrKuPxJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dc5mTGEu6nFyR5VMjBmyRdptzr5AvGx6pCE/eETGOM=; b=LjYgpZ646VoM1m8cRL7VyJarUK4JpT1XPs2wgwKlikQH+lCvJEP3Ukh00aWvVbGRPALb2p 81VpmLiABv31xAG8YqOicn0+Xib0cyCQxwXOO/kpnD8aPNGdEeDarYCzFP4viFHSbor6OI 6UzAcckZLP5vgf750pmGAeIR/7sIAl6C1taPgq9OgsJGBDkRs9rdAfGt7Tstl1gmi37Al5 nTgU+HD/GfpTeZB6em8DNVfWIwMjxAh3wCZZEemmVZk/P63jxw3o89EjWARBC5aDBG7t2P /QCHPdZjaWPCfpfJCTcN4DNTgrCg3zNQfHdDq/bLDq4AVRkJcIygzC57I6I5sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011045; a=rsa-sha256; cv=none; b=LXR6sjLCSDrxM2cvRTK3JxnFcs4Ik6ss1nwzCLlgMsMSOhAuCSa36jap93NJhBLjddIWDo giuXqoZwXUKQNY3VRRaAI0CFft5kX/KiQLhFdjZR1G29GAZkngQzM+sMfcgY9lHtS3LUNL RECP451uD2bbsh36mFMw9zxiWUUGdCGWalwr5f9IPQ1KnOHZcHxPhKC9AQLoCfM8A6WmYL DwLsvL56ub730umYIoESb1WXDAUkB/ZTiltk9l60eyNLXDi7CLbwopwU82vMjrs2eP2NqF tGl+uSFJZKyZBIF6BAmIgtjpTliBshuW5lCVcsx/Adse03ZE5j5Z85JF/K3tGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPd3CtxzLK for ; Mon, 29 Dec 2025 12:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:24:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d8c35dc1df47 - stable/13 - sys/font.h: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d8c35dc1df476a6fe4666f6dbbb9d6c540eb2423 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:24:05 +0000 Message-Id: <695272e5.31f6a.15e0371b@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d8c35dc1df476a6fe4666f6dbbb9d6c540eb2423 commit d8c35dc1df476a6fe4666f6dbbb9d6c540eb2423 Author: Dimitry Andric AuthorDate: 2025-12-26 14:31:43 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:23:01 +0000 sys/font.h: avoid warnings about too-long initializer strings Mark `font_header::fh_magic` as `__non_string`, to avoid a warning from clang 21 similar to: /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error: initializer-string for character array is too long, array size is 8 but initializer has size 9 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 763 | .fh_magic = FONT_HEADER_MAGIC, | ^~~~~~~~~~~~~~~~~ /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27: note: expanded from macro 'FONT_HEADER_MAGIC' 109 | #define FONT_HEADER_MAGIC "VFNT0002" | ^~~~~~~~~~ MFC after: 3 days (cherry picked from commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a) --- sys/sys/font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/font.h b/sys/sys/font.h index fb5fbbc9e557..d486dbc3a011 100644 --- a/sys/sys/font.h +++ b/sys/sys/font.h @@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t; #define FONT_HEADER_MAGIC "VFNT0002" struct font_header { - uint8_t fh_magic[8]; + uint8_t fh_magic[8] __nonstring; uint8_t fh_width; uint8_t fh_height; uint16_t fh_pad; From nobody Mon Dec 29 12:24:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPd2Vl3z6MDNr for ; Mon, 29 Dec 2025 12:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwPc2q1vz3Y5p for ; Mon, 29 Dec 2025 12:24:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxhIT48WahwlLQZhpaKiJaYTmcDXTI9s4sStoSXUaPg=; b=SujM8sPBzMvf6DyVVOVIFX8eTiKyYjPBIz1/f4AnQ8eL9FhivsHFv8Qe/3WD3gC+hSHqFI /RhmHYTFpAYGvyK6aQ+belNu0PUmItSj+A+l4UJpBAeSP2LnJ0pFRnyZh7fEmqGMaIR/fi vnqi8zq5uu9h3db/xR6DpnLlqzFZDVSjsqbm6EtyMDrHSyzvXEzFoPjyu07+hvEYgVy6sl z+BI42lSB8diIeV83BZAKZPppdM0loXU04bn5TlHojkR075OFjn+hyST+PZr77VctZjI6U bZQzRRKD0ZILKATLjVCzjb2k7Q1AZwPyv85i0zqEGrxKA15c9KYZ5h6gGe/QKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767011044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxhIT48WahwlLQZhpaKiJaYTmcDXTI9s4sStoSXUaPg=; b=qVnjWXi/y405254JkeZE6q3c4wRbzwyN1O37EvqWtTGQpDE2r4SyNW16mNLadGB6G7VnPn M34JCsk1lvd89HfQSfmah/ln+lKxnxk5/l3/fNquybOoff7HcmO0w49zUthS6K7ipIhOV/ DUuDsHRBkx8KgHrVRMYwV61h+lVPfXcRO2C6WVV88cHAeeDvnEVNN56aLR0G/Xy79h6S/g I3zZMxqOwcPyE0aswGsN/bTzGrI04LcVTzPy07RnViELZsNEIKbu+ra5C3M5vDzmMzp2D7 JG2AXg5A9p4B35hZltAzncxcvkuk7LB8NGQ52wDFTF19cBklQAR2kP7rgQwGZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767011044; a=rsa-sha256; cv=none; b=uWpGSWy5VGgEkCyAff703fYUC1AH+FLzGveymRh/1TnPk7dLH0nEREEEwyM6T40Uv++uSV caP63RVWCcwcvfrJl0UMdV0P91sjtYzr+8BFRGvywJypMFQDlVFGFUdaCBS41VUKEaUUhh ZsE6So98PWSWV4RRGrsLU0MbEzYeuBUlYwc3tH7fOYGKakO/q68trmF4qNjiMoqf20H93x UNQGoRtPtNRqZl3L2l65gViGywlZMSaPdeNY4U3DxIYB1kcbvMl4V7NwdHAnjMMpOyaln9 eKfRxns3IHh7sVh/DYa100MMYHGVvlWhdze9qfR0/IoySjSW2ZE1tRZjyyDXlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwPc2P8Nz1S7D for ; Mon, 29 Dec 2025 12:24:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32795 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:24:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 497aab21bd59 - stable/13 - bsnmpd: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 497aab21bd59ee2b0d02970079ab556b15914578 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:24:04 +0000 Message-Id: <695272e4.32795.61c311dc@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=497aab21bd59ee2b0d02970079ab556b15914578 commit 497aab21bd59ee2b0d02970079ab556b15914578 Author: Dimitry Andric AuthorDate: 2025-12-26 13:27:08 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:21:20 +0000 bsnmpd: avoid warnings about too-long initializer strings Mark `UTC` as `__non_string`, to avoid a warning from clang 21 similar to: usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c:339:29: error: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] --- all_subdir_usr.sbin --- 339 | static const char UTC[3] = "UTC"; | ^~~~~ MFC after: 3 days (cherry picked from commit 3054e22e4524df24908d7e9379681c1ccf829b93) --- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c index 354ea2ece83a..3957e03a0fe3 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c @@ -336,7 +336,7 @@ static char * snmp_date2asn_oid(char *str, struct asn_oid *oid) { char *endptr, *ptr; - static const char UTC[3] = "UTC"; + static const char UTC[3] __nonstring = "UTC"; int32_t saved_errno; uint32_t v; From nobody Mon Dec 29 12:53:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfx3l24VHz6MGJQ for ; Mon, 29 Dec 2025 12:53:39 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 4dfx3k1V8Jz3fMt for ; Mon, 29 Dec 2025 12:53:38 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="TTI/FnOw"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of gkontos.mail@gmail.com designates 2a00:1450:4864:20::32b as permitted sender) smtp.mailfrom=gkontos.mail@gmail.com Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47d1d8a49f5so42993985e9.3 for ; Mon, 29 Dec 2025 04:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767012815; x=1767617615; darn=freebsd.org; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=smfU+q5dT5TGH511iDvLTcR0rSrkf+xy71Px2df4StQ=; b=TTI/FnOwqNYXCQwJHHjG+s/wVLMb5HxplbUJEnUifVdc9ZPlijOYzWb3BejaVZccsT phobHyxfuBbUTHCoA3cm5KjAXZcYQPus3YxkOxWKR1rgXVH21Lkfw5mY/SCNnIZzv84V ZNHsi4edF1xGG4QDscaOyBdSrlqYjfLze9o8QTMCL6WFgccf5jiISEkR7SgPol9E8KvV FBlslKMk/UAK+gfu3hqeCDyatD8IxgeifXTFBAkHriAbZTC4P1mT+3Agv3+Ov5fWVGna sk6YhAuWEvRILeWHq9WOHtuhUR1zMS0Wy72c5LB1mZ2F/jtVFTisWLxKYtCAy/XlHMmJ xCwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767012815; x=1767617615; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=smfU+q5dT5TGH511iDvLTcR0rSrkf+xy71Px2df4StQ=; b=YpYpAHdzBqE08l2hu50CKzIiHUvNvbc1LAZbY8UxyfinrHf3HQN3Wd/Xm6MHS2RWsk pMQu7yBWpTkJ75Vj1qmh22gvM8F7J0ykWB/M3gA9p8hdXMeckuPDUlImTtkY32cqgWn3 mdlA4FYk2TpTz1afQLEVlwe6aG8Gu8c8B6gxyIYb1JwSiTNBm5Qb39KJNBOy7tZHOhC9 0JM7N5WKyn2KyLxtmTnk1SDTP8PTXzRBFupFH61y9v2Qm6gnmUPf46uXBqCkA3lbWQrI +sQpiT4Lkal/MjJqrvPCZTK99zm/beS9bO4/mnbnSAFpp2iwNBnqZJUF/k5RcEkNlA3R od5g== X-Forwarded-Encrypted: i=1; AJvYcCWWdb1VYmV1RLe2Lr3RP8eYaff10OfwEXCpMgA6xye9PtgLFgOV7AtgO2VaJurU8VagyfKL4cO+K4MVT4R/3d3OsMc2@freebsd.org X-Gm-Message-State: AOJu0Yxl0IUVFi9iVfKO/0eX1r/0PweEqCKEPYuSPhMmk6l0NlwUdDgm vLJPtsQ8IbdIOoD8ceoOwMHLPx9IItcPLhoL1TXQFiihe/zuWrKLUA8I X-Gm-Gg: AY/fxX49MAC/a0ZHRT2Qu8Or6BZ/srHz3Qgii72Gzsojb/ek4KjFsMMJoFnXv7sT+fU uUH8wCn2IYg4U0/0jQ8b15xrS+dsbDJ0J/TvjvypYH4+WbjwqC67Nf7L+Ym9dgH5zggZcZ+n1D7 EZ5FNaZrXfS6bScZXXfdSKDl5TRTFtdb4vTvpQCGekbJq6Jy97J8mcRWPKshAtcvu8owt+5pCzk TSP6tJy2VasvkKDMVOF+HgPHSlPlqpW9XIgyNYhSULEiXIqMbNTsPWQ2v9k7QREFFbeZRWbPeqI 1fG8NM2lHAfgScvTAZdFwsJ8Rl+gKWzp9KPo3xM1Gt/tG34c4v4D10MEaQBVvm9VA/ChYq61dRk oP2fzcr+8qgTp+2Uii0CVGrVoZh04zz46dB3aRIELe5MZ9TEYbB4OnnvCoXIKjJC1yzgJfJeG6K xdyQ9S/p0ESr1uGRtP/KabSPYvJElwxRhYiw== X-Google-Smtp-Source: AGHT+IHtTWa8Em8XTjUZGHXC6H26IZSl4a+W/ROihdXqalTKVoI+ur2xAZBcgs3++XqUK3oHBc4RBA== X-Received: by 2002:a05:600c:444b:b0:477:8ba7:fe17 with SMTP id 5b1f17b1804b1-47d1953bce7mr290373955e9.7.1767012814952; Mon, 29 Dec 2025 04:53:34 -0800 (PST) Received: from smtpclient.apple ([62.74.14.108]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3aa99a3sm228428865e9.12.2025.12.29.04.53.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Dec 2025 04:53:34 -0800 (PST) From: George Kontostanos Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Unsubscribe Date: Mon, 29 Dec 2025 14:53:22 +0200 References: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-main@freebsd.org" , "dev-commits-src-all@freebsd.org" In-Reply-To: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> Message-Id: <87F2B11F-4D7F-49F6-831F-C759EB6D43A0@gmail.com> X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.93)[-0.929]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; SUBJECT_ENDS_SPACES(0.50)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; TO_DN_EQ_ADDR_ALL(0.00)[]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; BLOCKLISTDE_FAIL(0.00)[2a00:1450:4864:20::32b:server fail,62.74.14.108:server fail]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::32b:from] X-Rspamd-Queue-Id: 4dfx3k1V8Jz3fMt Unsubscribe=20 > On 29 Dec 2025, at 4:55=E2=80=AFAM, Bjoern A. Zeeb = wrote: >=20 > The branch main has been updated by bz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8494be1b5af7fe4f765532f802ac0a14= 5e061d73 >=20 > commit 8494be1b5af7fe4f765532f802ac0a145e061d73 > Author: Bjoern A. Zeeb > AuthorDate: 2025-12-28 19:38:16 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2025-12-29 02:54:03 +0000 >=20 > LinuxKPI: 802.11: fix rx_nss with VHT >=20 > When fixing single-stream chipsets, like iwlwifi(4) AX101, we = started > masking the announced with the hardware supported values. This = would > probably limit, e.g., rx_nss. During these works we fixed a loop > checking from the highest nss=3D7 to lowest nss=3D0 (8..1) and = would set > rx_nss if the stream was supported. This left us with always = setting > rx_nss on nss=3D0 to nss + 1 =3D 1. Instead only update once when = we hit > the first supported MCS value (highest number of supported = streams). > Looking at the diff of the mentioned commit hash which gets fixed = it > looks like even the old code was not correct either. >=20 > This only fixes the logic to calculate rx_nss. This does not yet = help > with modern drivers to actually update the value. Code for this = will > come in a later commit. >=20 > Sponsored by: The FreeBSD Foundation > MFC after: 3 days > Fixes: adb4901ac9ae > --- > sys/compat/linuxkpi/common/src/linux_80211.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c = b/sys/compat/linuxkpi/common/src/linux_80211.c > index f4b534122b87..1ac28dfef448 100644 > --- a/sys/compat/linuxkpi/common/src/linux_80211.c > +++ b/sys/compat/linuxkpi/common/src/linux_80211.c > @@ -693,7 +693,8 @@ skip_bw: > sta =3D IEEE80211_VHT_MCS_NOT_SUPPORTED; > else { > sta =3D MIN(sta, card); > - rx_nss =3D i + 1; > + if (rx_nss =3D=3D 0) > + rx_nss =3D i + 1; > } > } > rx_map |=3D (sta << (2 * i)); >=20 From nobody Mon Dec 29 13:21:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfxhK6kw6z6MHpq for ; Mon, 29 Dec 2025 13:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfxhK5mb0z3jm5 for ; Mon, 29 Dec 2025 13:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767014513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGNS60NiWArqIv+MHvSkh21wXC1Rt0uVDgWGZUCfKxE=; b=Say+VTGApeDyYjqzdEzSbXA9MKAsqK6rlAB0zH0ABpCyq7tKC8nsqEJ0iYWW6yw7pCxXS1 exto+h1uRgCgqwRAxPJaK9mfYZh6xekOd//4yMnzETs9RY0JDxvKX+I/LoUr+ZarSZhklz f4VQ5nEWRudfumqjKZ/k3cHKGpq4KgVgYAtLRBm8GEJcXg2H7ogUjKm2Pvjbtcmns3oPMd BylWBBRQ9NWvcMGNtZohHzmSxaxa8uTGg8sAkjPPS1b7J6OuqPrf9DqOj+envU35kxq8lz tpXXnX+ZQb58rn9YvEmR5dDteq2AuYhmOzouaq6ncDmdeTJ3Wrl7NnPNsNAfdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767014513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGNS60NiWArqIv+MHvSkh21wXC1Rt0uVDgWGZUCfKxE=; b=nU5jwxCsOWaR8n43fVOearwNp5oBtjatwxO00kP08KgUCfZbYnxZ6ugFxGSlCXIH8/uohe fjUGxkqmTNu3Rkn6qrIjm0JCWCe6qKqUJ/CupC5RLXb720sZy1AeumUySaxZVuaHMoD8wr AqtKFGm64xmsbfy7QuopAjVqlFD4hYYNX6mMSZsc2YMltf8LxJoNlm6hYzNSPuHRIwsOl5 UFx4XS/KFkBHJtxbfdUqqwHYA2X7v5On0bv/KvBbIrVTknaYOrKQr391uW9M4XFc6KkMkW eBEQ1y3pUUk/szi3Hb+qygGivuX9QDmhOJCvExeFG7wURX81z3IhI26VKZ18FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767014513; a=rsa-sha256; cv=none; b=gQB9pBIwAmY+54j7t0qkUDeidx8/54++L3SIEZ5KoZMrgecsVpolDWFUL3/k1ztfDJXDDI FY09wtAVa4OCVhSJNNOPjHEG3WebggxGb9hS1k5ok/bLWrkfwxzbF8RwwXnwjom8mGu0Gh ycKwytgdqv5TXoFblFgdO7QO3W49N65SKrAklvdbdE54UPfCxHtebdAuYsV5JCd39IMk1c dnqtvA//4L2xI0gpRMPI516qVrcvdNLDT02dlWeSCQsLJ2b0kfWCePNMGzkTuKfLvruzBt g4E/4o+weJ39WFSYd0jm1j2PgegL2A/iPptWWl2+nzIG94U4ag1ox4VOy94NFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfxhK5Knwz1v4 for ; Mon, 29 Dec 2025 13:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3686a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 13:21:53 +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: faff7013187b - main - geom_part: Fix format string 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 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: faff7013187b03f4240af6f52f608e7ebafe19f3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 13:21:53 +0000 Message-Id: <69528071.3686a.455119c1@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=faff7013187b03f4240af6f52f608e7ebafe19f3 commit faff7013187b03f4240af6f52f608e7ebafe19f3 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-29 13:20:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-29 13:20:52 +0000 geom_part: Fix format string issues This fixes a segfault on i386 and armv7 and numerous style violations. PR: 292008 Fixes: 4f809ffec69c ("gpart: add libxo support for "show" subcommand + man page updates") Reviewed by: js Differential Revision: https://reviews.freebsd.org/D54393 --- lib/geom/part/geom_part.c | 69 +++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/lib/geom/part/geom_part.c b/lib/geom/part/geom_part.c index ac1bc25118f1..852eec2d790a 100644 --- a/lib/geom/part/geom_part.c +++ b/lib/geom/part/geom_part.c @@ -46,6 +46,7 @@ #include #include #include + #include #include "core/geom.h" @@ -651,11 +652,12 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) pp = LIST_FIRST(&gp->lg_consumer)->lg_provider; secsz = pp->lg_sectorsize; xo_open_instance("part"); - xo_emit("=>{t:start/%*jd} {t:sectors/%*jd} {t:name/%*s} {:scheme} ({h:size/%ld}){t:state}\n", - wblocks, (intmax_t)first, wblocks, (intmax_t)(last - first + 1), - wname, gp->lg_name, - scheme, pp->lg_mediasize, - s ? " [CORRUPT]": ""); + xo_emit("=>{t:start/%*jd} {t:sectors/%*jd} " + "{t:name/%*s} {:scheme} ({h:size/%jd})" + "{t:state}\n", + wblocks, (intmax_t)first, wblocks, (intmax_t)(last - first + 1), + wname, gp->lg_name, scheme, (intmax_t)pp->lg_mediasize, + s ? " [CORRUPT]": ""); xo_open_list("partitions"); while ((pp = find_provider(gp, first)) != NULL) { @@ -670,35 +672,43 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) idx = atoi(s); if (first < sector) { xo_open_instance(s); - xo_emit(" {t:start/%*jd} {t:sectors/%*jd} {P:/%*s} {ne:free}- free - ({h:size/%ld})\n", - wblocks, (intmax_t)first, wblocks, - (intmax_t)(sector - first), wname, "", - "true", (sector - first) * secsz); + xo_emit(" {t:start/%*jd} " + "{t:sectors/%*jd} " + "{P:/%*s} " + "{ne:free}- free - ({h:size/%jd})\n", + wblocks, (intmax_t)first, + wblocks, (intmax_t)(sector - first), + wname, "", + "true", (intmax_t)(sector - first) * secsz); xo_close_instance(s); } xo_open_instance(s); xo_emit(" {t:start/%*jd} {t:sectors/%*jd}", - wblocks, (intmax_t)sector, wblocks, (intmax_t)length); + wblocks, (intmax_t)sector, wblocks, (intmax_t)length); if (show_providers) { - xo_emit(" {t:name/%*s}{e:index/%d}", wname, pp->lg_name, idx); - } else - xo_emit(" {t:index/%*d}{e:name}", wname, idx, pp->lg_name); + xo_emit(" {t:name/%*s}{e:index/%d}", + wname, pp->lg_name, idx); + } else { + xo_emit(" {t:index/%*d}{e:name}", + wname, idx, pp->lg_name); + } - if (strcmp(element, "label") == 0) + if (strcmp(element, "label") == 0) { xo_emit(" {:label}{e:type}{e:rawtype}", - find_provcfg(pp, element), - find_provcfg(pp, "type"), - find_provcfg(pp, "rawtype")); - else if (strcmp(element, "type") == 0) + find_provcfg(pp, element), + find_provcfg(pp, "type"), + find_provcfg(pp, "rawtype")); + } else if (strcmp(element, "type") == 0) { xo_emit(" {:type}{e:label}{e:rawtype}", - find_provcfg(pp, element), - find_provcfg(pp, "label"), - find_provcfg(pp, "rawtype")); - else + find_provcfg(pp, element), + find_provcfg(pp, "label"), + find_provcfg(pp, "rawtype")); + } else { xo_emit(" {:rawtype}{e:type}{e:label}", - find_provcfg(pp, element), - find_provcfg(pp, "type"), - find_provcfg(pp, "label")); + find_provcfg(pp, element), + find_provcfg(pp, "type"), + find_provcfg(pp, "label")); + } idx = 0; LIST_FOREACH(gc, &pp->lg_config, lg_config) { @@ -713,7 +723,7 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) } if (idx) xo_emit("]"); - xo_emit(" ({h:size/%ld})\n", pp->lg_mediasize); + xo_emit(" ({h:size/%jd})\n", (intmax_t)pp->lg_mediasize); xo_close_instance(s); first = end + 1; } @@ -721,9 +731,10 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) if (first <= last) { xo_open_instance("unallocated"); length = last - first + 1; - xo_emit(" {t:start/%*jd} {t:sectors/%*jd} {P:/%*s} {ne:free}- free - ({h:size/%ld})\n", + xo_emit(" {t:start/%*jd} {t:sectors/%*jd} " + "{P:/%*s} {ne:free}- free - ({h:size/%jd})\n", wblocks, (intmax_t)first, wblocks, (intmax_t)length, - wname, "", "true", length * secsz); + wname, "", "true", (intmax_t)length * secsz); xo_close_instance("unallocated"); } xo_close_list("partitions"); @@ -1112,7 +1123,7 @@ gpart_bootfile_read(const char *bootfile, ssize_t *size) if (sb.st_size == 0) errx(EXIT_FAILURE, "%s: empty file", bootfile); if (*size > 0 && sb.st_size > *size) - errx(EXIT_FAILURE, "%s: file too big (%zu limit)", bootfile, + errx(EXIT_FAILURE, "%s: file too big (%zd limit)", bootfile, *size); *size = sb.st_size; From nobody Mon Dec 29 14:21:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfz190K9fz6Ls0Q for ; Mon, 29 Dec 2025 14:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfz1860K0z3qKK for ; Mon, 29 Dec 2025 14:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767018092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TAmlZqaXkNkLdaeMriXbuaKGQUaoZ/iYqRgSlYhaqs=; b=lSJT5AyQUk6LoMZ5g0JDl2/NSTIdiDEMFmD5uqSFmaALj9gwlfNB8LGtpN26etCtBWBOXx vPOtORfscf3o7D8ePrQW/ttceaPU9iQYnfvjJHI2EJM5z5XA4NuHWthn0GFB0NjiNUVyIb kYjNsQ6bKq28lgC9rcjebkBno7QUInQmT/3Me/8epQOJOjDiGl8zz01kiSiD4NWS94fMUC 6pJmyFFh+w/OA3NJWE+8dl1xsGJ2VT/tfX33vtM54HfWaLJGtUKEeU37t4kF6zOTEK10jN 0gEuO67//uW5zjgXBKNJhnr5np15leoV9ImlLqBY2E3452dwTmpR5dcXdGNVVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767018092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TAmlZqaXkNkLdaeMriXbuaKGQUaoZ/iYqRgSlYhaqs=; b=PJuKa3s8C8FEnI6pvivBovC5ipqRFnrCzWpNXmiHRAiXyTHcccJ1Rf0tpQ9AClR9H96+Ow d3PR06z3HqUI69BaX/g03yVPFqPA0E8UhdKap3zsOfZ1snMfHq0I9X37pCHt9/hvvsia+o rzhC6goOuvNpwAzVUMFxMjxUkeJnvsIeNWJVKi24hShFAzuD48SrXCyKpCswb4mXnb+IVw m7T82E6MXh1OV8zH5fa3ZqwZ/hicTvMV/1Ei3YlyYkBrQLg8/xhv2iwGMCogzRHIcZImhx rjLMr/fnkyLCzf5j6QDUaNaXlkuoitRV+bs19cE5IcvqW/Lve9mMLqt2rcTmzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767018092; a=rsa-sha256; cv=none; b=WboqRdUgRHcjhC1a99XMOQgCeeHlrsCHyLmYBI7PahUpP+RT7sv3IB5wlecbI3QArhbWmW a66H0/0TkHlQ+VpDz3s7za3XuVLdjXjW/FnvyzCWTHImX07cjHnHQ71UpGjt5ZVAYM7y2l bUlo4KT88AqsWQEGTwa+0L92oJ9B2yX4FuUbzdN558GwzFxi86eUpz7oLxEM8f3AfhEiHJ y4I0hbJsGxKnxxYHij1JI9QK8QuGMQkGkXSUSbryvLUiTsbK22R1fVWVLzozrSwd3TwzOb ZEXC9d1jl0ai6k/O3TKbrEk+j9Gox5NnfJ4DvGGRBZ/bfiVBmXDYKxfPJEA7Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfz185YJ3z2TH for ; Mon, 29 Dec 2025 14:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d50c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 14:21:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 85f499be90c1 - main - qlnxe: Avoid out-of-bounds reading the multicast ethernet address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85f499be90c15a3de02d1c62ce03b99fab52f925 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 14:21:32 +0000 Message-Id: <69528e6c.3d50c.1d9cf8d5@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=85f499be90c15a3de02d1c62ce03b99fab52f925 commit 85f499be90c15a3de02d1c62ce03b99fab52f925 Author: Zhenlei Huang AuthorDate: 2025-12-29 14:20:12 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-29 14:20:12 +0000 qlnxe: Avoid out-of-bounds reading the multicast ethernet address The correct length of an ethernet address is ETHER_ADDR_LEN but not ETHER_HDR_LEN. MFC after: 1 week --- sys/dev/qlnx/qlnxe/qlnx_os.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 9963f472c615..99110e5e2d8f 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2539,7 +2539,7 @@ qlnx_hw_set_multi(qlnx_host_t *ha, uint8_t *mta, uint32_t mcnt, break; } - mta += ETHER_HDR_LEN; + mta += ETHER_ADDR_LEN; } return; } @@ -2552,7 +2552,7 @@ qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) if (mcnt == QLNX_MAX_NUM_MULTICAST_ADDRS) return (0); - bcopy(LLADDR(sdl), &mta[mcnt * ETHER_HDR_LEN], ETHER_HDR_LEN); + bcopy(LLADDR(sdl), &mta[mcnt * ETHER_ADDR_LEN], ETHER_ADDR_LEN); return (1); } @@ -2560,7 +2560,7 @@ qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) static int qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) { - uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_HDR_LEN]; + uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_ADDR_LEN]; if_t ifp = ha->ifp; u_int mcnt; From nobody Mon Dec 29 14:49:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfzf06TTRz6LtmH for ; Mon, 29 Dec 2025 14:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfzdz6Q9Cz3s8T for ; Mon, 29 Dec 2025 14:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dx5q8csNEq/KJVfIWSk9XyriJaAxZdccZRHY3SDoaHk=; b=TgUIkCIsLQl8wjeCY2jKcJp7xfxueGQie0RQxWZKeb1y0IwS6aBVLvJG2mWCR9XWuDiAwc d+IQRH5eY3dFuUuJ58xuMCgsJ4gBl+jzAVmBCBL6zxhcQsoKGq22/hadCNQiJ2xrsmEDsE 2TVehojNN+b1Gbpxswf+w0czOQr2FdbLnFLv1HayhPPhxpXcj9yfUh4I64cEslQZDMWttF 3L9dpauZaoQGanmmRdpzKQydmE4PS2aGPI38klvYpdsA6kRUbrxWpwdw5zQUqvxIiTIAYb eNPen0v1JuVxSEIph54RbRjs8a1v2TZxGdI56IVEn0oni4n3ntfX9nmPQ9DoWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dx5q8csNEq/KJVfIWSk9XyriJaAxZdccZRHY3SDoaHk=; b=Wvch3pPv1sdfV2sjjXER3AcGvaA7u7vlI/kv00Ds6qCFnbqOa5negkoPhqq85y9vAmVcGP ciB5W3tMimCVU5DyhPzcfhDGBCzPgkIfLsh0ydbWajJL6K88rtMHHuUE+In9kmQiXXKXEi XNGUXtrLAhMp1RnnQxReTw9EFVvTJ0tQy9JfG/W+uY2u3l1pLDaGh3AJt7zT0969NW3vA9 2yWFNpKNuU26UCqHMtM4IUzwGBQ4qRbHT3u4YpxcD5qj6OYTi/4BDd4Ol7NAHPJqGHnwn7 B00rGW/vRjkQc4tU3g3uwpWk9N/HRG3DQoXsy1XK/ZkkrM/1pY9q0lIj6U0a1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767019800; a=rsa-sha256; cv=none; b=o9kVtOApnnnJKXMVktMIzQYI2nXeiKUc92VY2vxzbBfunzyZ4D/AsWyJSDsN60/P21FBja jbM0SQYg2iJUq+eVGcaAn41Mbe2Njx+8iBb4ajr8L8V5Jk8PKRsUU+JzVNDze7y1qy9tWv nBWae1MwaeMDiYW1QCjZKb+KV6xnhae63qTYPSm+appPq8cFZIaCVInJHe9TBq9gDFE/Ry iGM6Fbvxaqet4vo7mqcq3EPfPPXK0Ytmzfpb+VlvAMc6zF3T/bvoPxqf5V5gOqelhXOQ2K IJkXx6W8Ni43+MDd6jJANwCfpXmi9m5myc7/P19kaTenWVPnc2xqFLo1nZnPuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfzdz5GtCz42K for ; Mon, 29 Dec 2025 14:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 85d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 14:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: daef625cf884 - main - bhyve: Use a blocking socket in the helper process List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daef625cf884dea33d50ad7a0e2da0879a442495 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 14:49:54 +0000 Message-Id: <69529512.85d8.626d8131@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=daef625cf884dea33d50ad7a0e2da0879a442495 commit daef625cf884dea33d50ad7a0e2da0879a442495 Author: Mark Johnston AuthorDate: 2025-12-22 19:12:34 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:49:24 +0000 bhyve: Use a blocking socket in the helper process The send_packet callback does not handle EAGAIN, and on the recv side we already use poll() and MSG_DONTWAIT to implement a non-blocking loop. PR: 291616 Tested by: novel Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") Differential Revision: https://reviews.freebsd.org/D54340 --- usr.sbin/bhyve/slirp/slirp-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c index 06f393aab724..9fb9784662fe 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -503,6 +503,8 @@ main(int argc, char **argv) memset(&priv, 0, sizeof(priv)); priv.sock = sd; + if (ioctl(priv.sock, FIONBIO, &(int){0}) == -1) + err(1, "ioctl(FIONBIO)"); if (pipe2(priv.wakeup, O_CLOEXEC | O_NONBLOCK) != 0) err(1, "pipe2"); From nobody Mon Dec 29 15:09:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg04R287Tz6LvVt; Mon, 29 Dec 2025 15:09:27 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg04R0gwZz3vKk; Mon, 29 Dec 2025 15:09:27 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767020967; 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=L0Pbmpf0+u8M9XX3k4qkpw/BtE20taHYwIxk55qOSGA=; b=JImZ9kEIJbMepqc+rWC+dlUnbAxeswwtfBV3WLcnQwsqTayVuFw5TV1p9t7kFLXAEwC3qR /NecdBOb83FeDNjLrSFPCKzujoPWfIXbgf78HG5Cw/iBMOcj6gIJLKdEy+auG2i6BZKtQm MhBOh7JFSvc3bpQTEx5BHVqS3/kksTcezs4h49LnJGITI7MLhtDhjwH0WTAGWiN20Q4c0P J/qSH71XbHBXz9/3TvmC1z0ZUqqq3hITygO8ZoBf13VBzQJFAzDF/cJslK05MFgNv144md EBkjnZ6RO5zKj1ZoS3eqMFUaB7tHAYfxlh5+NYTVlfyxH0QxPYghovPOOklpjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767020967; 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=L0Pbmpf0+u8M9XX3k4qkpw/BtE20taHYwIxk55qOSGA=; b=auREVMUe6lZbSsKkIQhmsCgHSgZ5DnNnqZOPF2REhY2JtMOrVqtfubhlY9GQwMjbPTZiC9 xQXfVIh+jXmZh1ED42r2ruoX4dbW6jDfKEAl3nC1m7zx6nf5EkRNvn1d0xu/Mn7L9i/a72 xqH4McfLE6/wkAOKYqiNsAD6QK0knsZn1+MBOlvY9DE6wOmVG4SVzBoJmqkvN09SNJUXRf uuGFSKCDzivMCRJloAd8/wDGpZU5E1SQDRJTJtrzGpmocP8gfApiB6s5cH8uxMbJeNSvq3 Bvd0dbaR5UvxVTakjqrGr0VB3Y2jMSaR6cimT59UYVj9b0Cz01fgFSGsuJlAEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767020967; a=rsa-sha256; cv=none; b=A2GRW7baDbbSKE4DxLykVy1BY/42t2QmbSjOS/mml1BCpGvU1dUtf9vCDeUGq42xbo5ZcM Ei67vFTFRR6qzFynn0LHc1fPnznRiDQMb11MrpnXul/Z/lVElQWM57m2pzQSBdy4FALKCi PMw8dpPfVyodCp7J4hvshac/O/eB/lPRDGPA7uiVeKQq+Y/fmQKe3myZAh3Mqzq0x1crEt Dp1rGVmsoXUboWufBjwKHb3QPsT0wk7D599dVtUk2qIJuuSi+d+WfGU6vpQZNxizipw5Ka iyrVJ2VGlOM4doNJeR8OtAiqBy/eP+N55u8tCVSS93tqQdMZq9sa0nYHem1U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dg04Q68MgzNhd; Mon, 29 Dec 2025 15:09:26 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3040A59BDD; Mon, 29 Dec 2025 16:09:25 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: faeaa25f5624 - main - kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src From: Dimitry Andric In-Reply-To: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> Date: Mon, 29 Dec 2025 16:09:24 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <86EF92B6-B19D-477E-8BBF-2B25190C781C@FreeBSD.org> References: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3826.700.81.1.4) On 28 Dec 2025, at 09:17, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfaeaa25f562493370a5da84b429ab0a1= 17c3213a >=20 > commit faeaa25f562493370a5da84b429ab0a117c3213a > Author: Warner Losh > AuthorDate: 2025-12-28 07:31:05 +0000 > Commit: Warner Losh > CommitDate: 2025-12-28 08:16:39 +0000 >=20 > kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src >=20 > There are many environments that you do not want the paths to be > canonicalized. For example, if I always build a product from a = specific > path in a jail that's dependent on the product version, I don't = want > that to be sanitized to /usr/src because when I have profiling = tools run > against multiple kernels, I can't do A/B testing and results = processing > if everything points to /usr/src (sadly, the profiling tools cannot > remap back to the original like gdb can). Since we need both active = at > the same time, symbloic link fallbacks don't work. >=20 > We do want the rest of the build to be reproducible, however. We'll = get > the same binaries if we rebuild later since we always rebuild with = the > same path. >=20 > Turn them both on for maximum reproduction for environments where = that > cannot be guaranteed. >=20 > Sponsored by: Netflix > Input from: emaste, ivy > Differential Revision: https://reviews.freebsd.org/D52959 This breaks at least the devel/libsysinfo port, which error out with: =3D=3D=3D> Building for libsysinfo-0.0.3_3 make: /usr/share/mk/bsd.debug.mk:19: Variable "MK_REPRODUCIBLE_PATHS" is = undefined in /usr/share/mk/bsd.lib.mk:525 in /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3/Makefile:16 make: Fatal errors encountered -- cannot continue make: stopped making "all" in = /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3 *** Error code 1 I think bsd.debug.mk should now include src.opts.mk, not only = bsd.opts.mk? Either that, or MK_REPRODUCIBLE_PATHS should be moved to bsd.opts.mk. -Dimitry From nobody Mon Dec 29 16:14:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg1Wc2Vygz6M0JX for ; Mon, 29 Dec 2025 16:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg1Wc0tdkz414Q for ; Mon, 29 Dec 2025 16:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767024876; 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=oza9BVGBU5hVi/u8ah9COFLcSVcphN2rXs/4HAJHf8M=; b=BqUD7y0KrG87vB0Ke+lHAMkITDEVLDe44W11xH5rSO8FFqebSkRrDgqSLrAPHHBNqjydgy teudvt7gUuQTU4cL2M3DpSbremcZddr48jWNk29nbWzBugMOmcnIPu98XM6AJznnNJUiJr L3UnX07//FduIRBrYEXUZjCWqTmNDfMs/E/pPFYzzkeYUTPLD2rq9lwaljUyrMrj6mHsan 0E6JBPmsCBHb6wQZzL9GjBNQWQrVni+3HhrOXde9f+Az+sWsG0IqqdkAnS9+WuzZv/IIzf KwcMaI55odGgVqqKGrLNZFKiYdgB6rAhhMty8D5cqFJAYIaStVmq9k6CWEkn8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767024876; 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=oza9BVGBU5hVi/u8ah9COFLcSVcphN2rXs/4HAJHf8M=; b=B003jfBK1hA1c3RS7u3ELTbcO9HRauWIo8seMcbVBQspCDfLiW6fZNv4I7LYCiMfv2uf4h YxOlglGPfY9eC1kZvOCTdltGA7epaUtFoLuxaW7DxIsJ9nrDQVa1/2CKwROTRaoPGjdHZF 5e7QJMp5LJAa4JgYBsoxyRwm2HZ0vjTzWElMS9CzGXN7HvyauUb/zU/KKha3+QXyS/zsB3 xDAmG8O047Jsj6Bo01+V47A548+MBZPbd6DU43FKfIqtfloVo1Fkbtb8lTIW+3JSRexlC5 X0mxuU8p3YkFPRsCL0Fv0U6OojogS5+/RogxZBBwtXtuprkPjC64DLLjQS9EZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767024876; a=rsa-sha256; cv=none; b=ozOSdygNOsn/g5bd4gr4yEnWjdnf+mrvdQiUE304uhvp3pFY4rkHaTjh9Fu1VwsJ420BQM o9OM0d+KzU8bxTbwf9TFkfZJ0C72XX7RbROQ/On7tOxjrwQW5926TvLJW5SYor09EUVFuG Qho/Ee0nqtfCughAhbJZfwSO23F8wTXf3vA1x8x3Yn4IxOa04z5Ggo/SSIp9baW43eZ+sT gnuwB+p2BSWLnLrKyY1Butpc/xDRe+fYO39KgyYzfix0gZfkPxoT29ZpT+j0NJXmAqIWF4 fuvDgFuhlr+9tdgWrSAxA2MFcrsxq3Iy7YrXs3yVnBOXNnaloYertTg//J8SQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg1Wc0C0Tz6J8 for ; Mon, 29 Dec 2025 16:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 211e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 16:14:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Rupesh Pilania From: Mark Johnston Subject: git: 6ea05372bea5 - main - qat: Export missing symbols in qat_common List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea05372bea5bdb19ca329c27c4c6510cbeed7c8 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 16:14:36 +0000 Message-Id: <6952a8ec.211e7.bc6770e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea05372bea5bdb19ca329c27c4c6510cbeed7c8 commit 6ea05372bea5bdb19ca329c27c4c6510cbeed7c8 Author: Rupesh Pilania AuthorDate: 2025-12-29 16:13:48 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 16:13:53 +0000 qat: Export missing symbols in qat_common Some symbols required by dependent modules were missing from qat_common.ko and qat_api.ko, causing load failures when local symbol resolution is disabled. PR: 291271 Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D54107 --- sys/modules/qat/qat_api/Makefile | 2 +- sys/modules/qat/qat_common/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/qat/qat_api/Makefile b/sys/modules/qat/qat_api/Makefile index 24fbcb46a987..22802c87758d 100644 --- a/sys/modules/qat/qat_api/Makefile +++ b/sys/modules/qat/qat_api/Makefile @@ -84,7 +84,7 @@ opt_qat.h: @echo "#define QAT_DISABLE_SAFE_DC_MODE 1" >> ${.TARGET} .endif .endif - +EXPORT_SYMS=YES .include CWARNFLAGS+= -Wno-cast-qual diff --git a/sys/modules/qat/qat_common/Makefile b/sys/modules/qat/qat_common/Makefile index af8ce86d6be2..541a5da91d40 100644 --- a/sys/modules/qat/qat_common/Makefile +++ b/sys/modules/qat/qat_common/Makefile @@ -40,5 +40,5 @@ opt_qat.h: @echo "#define QAT_DISABLE_SAFE_DC_MODE 1" >> ${.TARGET} .endif .endif - +EXPORT_SYMS=YES .include From nobody Mon Dec 29 16:41:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg26p0gW5z6M1qm for ; Mon, 29 Dec 2025 16:41: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg26n66hQz43qC for ; Mon, 29 Dec 2025 16:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767026497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ULzMq/HU5zXIPyNQv45AOTAUFt/x5ml30BN1EE4+j0=; b=JpUcH5zK8O8t6FoxtDTUOLMDvMdW4PVDMowR/qNd1PDJGic4Ps/X8SPNFwFIz0ZuZNNUy6 BBjKj5LYI0izuFIPwLcRoZI7UDRbkfbL+AS3vag3sV2eJ7KYQXb8BDtmnaAbF8cT9l9FkK JFUtzxMzgj0OYHltGnQusdjSlG5hu/58SUunkP0doJJDfHFfVPhp9eVlNbkJbb/ayWUFoZ BlISc3KWGEv2Wq6hdMtDabtGqsj6Yj5wim7gtE3mEXwXN8hSaHr3f1QL1PN8AVAXdWa9NZ W+YqNBHMz8MiwjIsiebT98C3EgTgMdA4qjWZFHU28C6/xhvwL1gXn82RC25GPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767026497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ULzMq/HU5zXIPyNQv45AOTAUFt/x5ml30BN1EE4+j0=; b=J/vZ04EvLLEPdnQt1YaVey6Pbx8ahSkRcLYHwfsPX6Fo2pfLfU5iRhNt2Za2Lkk3bRShMD geYwU+DtbjjwXYHDC10M4Nuo+GCG+4J/J75k+DeOaUcCKfuSnmlvY0JVcX8O7GWqqa+zQ7 TOPyhIvdp9o9wSs/Z3oWt4+s9CfdozKPrixKc2+OJucZ8L/1bR04L90ua+1vwR89lqLBwz QunShN+zuPaKvIJWPcil6/5CeHv9OXnN98mT0cw4gl+qYJWVZSRePiyJAxHsd2AJzz7KJA bHVvPz4oBWuC574gtTVEEX+dfBDC1BMP6nsGzmUkgKbAJy95GcLWOzDVHZriQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767026497; a=rsa-sha256; cv=none; b=U7NzuMgc6wooqfTq1vEAjAyJFtIPtf9fhclejDSv8Ch0hb/xB0in4gwoE5SaO2aHavJS7z jbExcn9u/cQ2N90Bx2v0A5zZiMKloWckA6pCr1ZhPZqOYa/uofq0CxZ14z+5aub81j/wjs SZW1l8JeWW0ae71LhzaVZo9M8yuwaS+c3KMB9U+EfJPPCuxctnjXmnRdOkOIFUhaHSJU0D UoQviIHgINKPKKOvvPpubN2hLoM4qU4MtmFSKokESqsvHm+mKN25BPz2D/AYrkq8uGYpS0 LzJnfL+NS423hPXTs2kCkaYrMht5Ip4Agg5oG3F+HljqwkVdwFZ5446A/Iy/pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg26n5ggSz70B for ; Mon, 29 Dec 2025 16:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 16:41:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3e2093de4725 - main - linux: Add required symbol to EXPORT_SYMS list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e2093de47251de5e6e61c08d2955251137afd01 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 16:41:32 +0000 Message-Id: <6952af3c.248a4.598e824@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3e2093de47251de5e6e61c08d2955251137afd01 commit 3e2093de47251de5e6e61c08d2955251137afd01 Author: Ed Maste AuthorDate: 2025-11-28 21:25:26 +0000 Commit: Ed Maste CommitDate: 2025-12-29 16:39:28 +0000 linux: Add required symbol to EXPORT_SYMS list PR: 291270 --- sys/modules/linux/Makefile | 1 + sys/modules/linux_common/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index eb4e17ec706b..8904e8005416 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -76,6 +76,7 @@ SRCS+= imgact_linux.c \ .if ${MACHINE_CPUARCH} == "i386" EXPORT_SYMS= +EXPORT_SYMS+= linux_device_register_handler EXPORT_SYMS+= linux_get_osname EXPORT_SYMS+= linux_get_osrelease EXPORT_SYMS+= linux_ioctl_register_handler diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 291fc6d25f8c..1fa740b8b823 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -13,6 +13,7 @@ SRCS+= linux_x86.c linux_vdso_selector_x86.c .endif EXPORT_SYMS= +EXPORT_SYMS+= linux_device_register_handler EXPORT_SYMS+= linux_get_osname EXPORT_SYMS+= linux_get_osrelease From nobody Mon Dec 29 17:07:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hG3xD8z6M3Pc for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hG2GvDz46bw for ; Mon, 29 Dec 2025 17:07:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+EcrzBJrXsAMt+XGCbQizm/OMjB+u8i6pZrjuQJT6A=; b=R2c9n3ZcaRAXM1iQ2S70wQ47sGWQ4tTomi/V6J60jaVEbwFRM3rq6sJYPARY1nvICdN9/D 6lmaiI49ryepzdFkQAokVyphh24E9cvvSgD3nDdWIUDNqJN30PlP1WQ3c4FfvX0f5DY48c sUN4/P4VBGedjePHz6anLRHxmWu+cN1mDKiHavymdPKDESQndWkcKSDHYrL+7eFHYcMmz0 a66ZXR2WPku6ecz9PeGKaXuAiNwAzsktwdrBow2e4lyMfwfzSHJ11p8AtueybwK3Z4Sn+K A0OLSa9cwTnLUerCorl+/K5tRV/glDrd2xTEQeDxrN3v2cH7ou24kBZNTRssKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+EcrzBJrXsAMt+XGCbQizm/OMjB+u8i6pZrjuQJT6A=; b=RfJezHvmQKRnnir/t7N5hPHz5IpmDAzmiIUvCTDlgZdbGB0kkFi47ADaD3hPUFTfpt7wd3 oiu76d6VqWaUBeI5X8Mumao5jDuCZIu6zvJODyc1sal+zHGGDUZwueQaa8einO5oTgRt3j 67dw8FNOiRAfch+PReXudVobfeQnKvsPHd/KoLexqUu7qHMzs2hABVaiOU2qSmv44DnLFq GkcA450TOqkInSW3uD9UhpN9swehURHBIXNG0iUqDp//sdJmYQBFTiGHpE1EaMf8X4uXNd qeeMxxWkazIO4nqgRhYK/wgzYo8wQ7rvHB9iZChd8FeA107z+Aney6VxgA56fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028030; a=rsa-sha256; cv=none; b=Sx87cde+q/FHUZMMxh2wvSn/WHHKs5oHj8Xm7W5cc/vL5PBdGdsxWHtVp50gWvLx7fAxhY SG1OvUh9S2vvI237taK1njxTXO0XUChOuls6GnUMUQutz5Cjv7tarDt4Ej62WJ0GIQnGcw MxCvlJ1/rqhSj/oFohjn8GIvlzi7lGYUTksITwI3unDY4Hk2mwqJZlNJo50vJ1KkemNzLq SmhTd6b2AG7omLj15hY4aJveKBH5eajyYH5ahqTuaw2qttRp/uWOdh821+Eszqno3T3N2i fIH5BNUWWp8W4p84KFZLoHnQYfC1GrAyYBbMaKsGvfEVhs0HjoIzfsdI/CkuMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hG1bXrz83D for ; Mon, 29 Dec 2025 17:07:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 251d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 13b9f78e33c9 - stable/15 - netmap: Let memory allocator parameters be settable via loader.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 13b9f78e33c9cdbcd7312afff9f1d5f1bd29f400 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:10 +0000 Message-Id: <6952b53e.251d9.233113ff@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=13b9f78e33c9cdbcd7312afff9f1d5f1bd29f400 commit 13b9f78e33c9cdbcd7312afff9f1d5f1bd29f400 Author: Mark Johnston AuthorDate: 2025-12-14 15:47:48 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:30 +0000 netmap: Let memory allocator parameters be settable via loader.conf This is useful when dev.netmap.port_numa_affinity is set to 1. When interfaces attach, they get a memory allocator that is copied from nm_mem. Parameters in nm_mem can be set using sysctls, but this happens after their values are copied. To work around this, we can make it possible to set these memory parameters as tunables. Reviewed by: vmaffione MFC after: 1 week Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54178 (cherry picked from commit c694122f3cfb7d52b882fa79086d49f45a2c7fd2) --- sys/dev/netmap/netmap_mem2.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index d69e9305f6f0..865a663da364 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -628,22 +628,26 @@ static const struct netmap_mem_d nm_blueprint = { #define STRINGIFY(x) #x -#define DECLARE_SYSCTLS(id, name) \ - SYSBEGIN(mem2_ ## name); \ - SYSCTL_INT(_dev_netmap, OID_AUTO, name##_size, \ - CTLFLAG_RW, &nm_mem.params[id].size, 0, "Requested size of netmap " STRINGIFY(name) "s"); \ - SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_size, \ - CTLFLAG_RD, &nm_mem.pools[id]._objsize, 0, "Current size of netmap " STRINGIFY(name) "s"); \ - SYSCTL_INT(_dev_netmap, OID_AUTO, name##_num, \ - CTLFLAG_RW, &nm_mem.params[id].num, 0, "Requested number of netmap " STRINGIFY(name) "s"); \ - SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_num, \ - CTLFLAG_RD, &nm_mem.pools[id].objtotal, 0, "Current number of netmap " STRINGIFY(name) "s"); \ - SYSCTL_INT(_dev_netmap, OID_AUTO, priv_##name##_size, \ - CTLFLAG_RW, &netmap_min_priv_params[id].size, 0, \ +#define DECLARE_SYSCTLS(id, name) \ + SYSBEGIN(mem2_ ## name); \ + SYSCTL_INT(_dev_netmap, OID_AUTO, name##_size, \ + CTLFLAG_RWTUN, &nm_mem.params[id].size, 0, \ + "Requested size of netmap " STRINGIFY(name) "s"); \ + SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_size, \ + CTLFLAG_RD, &nm_mem.pools[id]._objsize, 0, \ + "Current size of netmap " STRINGIFY(name) "s"); \ + SYSCTL_INT(_dev_netmap, OID_AUTO, name##_num, \ + CTLFLAG_RWTUN, &nm_mem.params[id].num, 0, \ + "Requested number of netmap " STRINGIFY(name) "s"); \ + SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_num, \ + CTLFLAG_RD, &nm_mem.pools[id].objtotal, 0, \ + "Current number of netmap " STRINGIFY(name) "s"); \ + SYSCTL_INT(_dev_netmap, OID_AUTO, priv_##name##_size, \ + CTLFLAG_RWTUN, &netmap_min_priv_params[id].size, 0, \ "Default size of private netmap " STRINGIFY(name) "s"); \ - SYSCTL_INT(_dev_netmap, OID_AUTO, priv_##name##_num, \ - CTLFLAG_RW, &netmap_min_priv_params[id].num, 0, \ - "Default number of private netmap " STRINGIFY(name) "s"); \ + SYSCTL_INT(_dev_netmap, OID_AUTO, priv_##name##_num, \ + CTLFLAG_RWTUN, &netmap_min_priv_params[id].num, 0, \ + "Default number of private netmap " STRINGIFY(name) "s"); \ SYSEND SYSCTL_DECL(_dev_netmap); From nobody Mon Dec 29 17:07:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hH5mx6z6M3rC for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hH2zK6z4712 for ; Mon, 29 Dec 2025 17:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dSBGRaIM7HxssVCsNeIw7nH5lDBO1xk2vxt1IArQqjM=; b=FQqFNIltF8jJj/W5id6KknRVH0riG1iE9skXXLvt98Zms5VvHcdA9km4T6CILzaQbqfU4v dOSTq2VGiP5r0f4nPgQURnNDPw/uxH2xmhyUy545CzhxIyOhDp55rdoTalz+yeP8swN8Bq aIBY25uwu9ojE2LIn5Gn4lAtu1lBuOuSgfudrDSeYBGpJEQTZcHOjrXvDdmxaY32I2KFkm xJ8JsOr6l0TOFch7EKyljwmqUl14cVd+7bJUoMoUJMoZtKZBYglopXWwPNr+axisJoC3RU AdcVuVEzyrz5P6GHCzrbyJj4+wX1+dS7/ua49YpCK/++uYd5P4rYt+2wGSyYPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dSBGRaIM7HxssVCsNeIw7nH5lDBO1xk2vxt1IArQqjM=; b=ymU/syHmgZLE/9c/1B02UJAiiHhcwuBmUGE2Z34TRlwMeANYOB39IzG1OL8iporlLZgzPt el3vhP4CQDW9GwXQ3BP4xPecZqDj3vHbI0v/HCp1BbOY+fQwDp+fExCfPqHL6Or4/8yRt2 kNqsPmCfXwG0ujhSHw4+VQBSnuzRe/tx/l4F/HFKx1WOBdt2rGxI2SKEDgURA1A4Y0F7yo GY9ZocCVyGQVweVyQ7+E3o/sSXlADd7g5BtpAGQGoqEXp345g18uCIcZO9s5/Hu/Fjp4fp +GeuYovKqd/t1FzjpNINDqj1+YSVvVmtKzAmfsrSMbAdVVoO4iCr7uxjCkFxqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028031; a=rsa-sha256; cv=none; b=OsCiWwwGNnN/C2CKbcq2RpVy0aQan2WZIpBEs3Jqv/43j+B2N1amdVmIn8Dpsn+l5jdcsd yIlpHLLvU/W9I9iFx3mCXTC5cT4GVwilQjqwmYhy3GN7QhJ1UNAtglCPa6TqfqiccC7T7k PnV7opxWsIyK0zPXHnFjVkOvDmbxiggbM+oA1HIpE7hhrh26YiMEMcZdkx4ICPdwZ/UYEX Bl415EHUom4TBajwJyn2hemscPL++eXs2aF+35F3gTeej3HxEHWSumGoo/xG4zahTm95V4 t+cpAkSYj/kWJa39AvIRLR89Z8ELZP2XAv7eKeHcX5BZnyCxGKWMVo229+MA8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hH2MRJz7rk for ; Mon, 29 Dec 2025 17:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2455b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 26ebe093f414 - stable/15 - socket: Fix the name of a parameter in a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 26ebe093f414099d331c7366e979a4cbf5103c12 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:11 +0000 Message-Id: <6952b53f.2455b.372ab3ec@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26ebe093f414099d331c7366e979a4cbf5103c12 commit 26ebe093f414099d331c7366e979a4cbf5103c12 Author: Mark Johnston AuthorDate: 2025-12-14 15:47:38 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:30 +0000 socket: Fix the name of a parameter in a comment Reported by: des Fixes: 0a68f644dca1 ("socket: Split up soreceive_generic()") MFC after: 1 week (cherry picked from commit a0d607957533c7fbefaac5cd81d34c037cc27344) --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 9eba3ad2e082..b7e4646fea68 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2749,7 +2749,7 @@ sockbuf_pushsync(struct sockbuf *sb, struct mbuf *nextrecord) * time. * * The caller may receive the data as a single mbuf chain by supplying an - * mbuf **mp0 for use in returning the chain. The uio is then used only for + * mbuf **mp for use in returning the chain. The uio is then used only for * the count in uio_resid. */ static int From nobody Mon Dec 29 17:07:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hM1lsWz6M3mJ for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hL51HFz46qQ for ; Mon, 29 Dec 2025 17:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lirmJSlSx18/moTueoOHKyut+RMSI2QfuHGDdmU/GU=; b=C85MdnLgWaw0Q/kyNMDmIIDZRzlVxtgdNB+u2r91A6bU1bp6R2/wELL4wIYuyzZsTbCs/w UBcpnVKkbfAghFrkphzqUaaA1Up8ZJoJXx5H2naUyalBWSzW/w8MxKyFNDoGF/NWHWnmgN AJu6QL5Pso12CQjV6lIa0Hppfk4j50EOPHRavI9jVSkpC0WVmu3kLvRjn5romwtCiQE09c SyBSdC6BKVuTYKRTN6H/vEj3t3xgQh5f0EdN2oPxxj2mOvNRmRkXe9k49s6RjYBtNyjJGE exemEXpCj/fL9uqZcqQxideZIO2BPrFkHt6dwT2NqYtpn9N7wjzr4ZSer3WxbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lirmJSlSx18/moTueoOHKyut+RMSI2QfuHGDdmU/GU=; b=R0/5ru7BliXXt1Z0C4VutkdHsvDzaMwYfpabuV0D8+aIr+6CZJP4iy43pVPbcHtkwyVsve 14ttOsulYFxgsw5Nx//XcrpTdv3igeKDDKIeKAvx44YzuOZpW6SpzOYa1z8yFyR5HkXQWb Db+Eiz2b1soeRJsfGosO1py7RTIJrXKnuXpG8hOlVCxBJx/NgTI44iMEuaiVSboHNR7oKb isM6+CpoRHzhSWnNhKim9vIyyPEa5WQrCmhK64neVxfAJsxnuhOqw5uVOZQQRAFn/KYfUr UqrryojTuBE/rWm62aWI4PPFZmYR/2SkuoUSSmkydmGrX7kqj78NNx90ggopKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028034; a=rsa-sha256; cv=none; b=JW6WsI6FeoZBfaW5oZy07q7TqrOASuka7+kE1njoPpHryESBHiz+pD8E+oQTobX8MhoGNb ZFTti4hXKgUQ0fX3u9WwVwlWFbBN42hY7vnN94Wcemc1kuxP5Zp5lOCtAFp9uKmCAuA2G2 JZv0FSS2jPllrxitnGGf/2RMMLrSL+HPCd/5ahMfSuz1nXtH5dVOXK4VcrR9lsmqwduFU0 WP9zqJ17qCqp+jrNEhyMqMQRn2y5efePmXBMAmybVD+EGJ7EZZ+c+m+5YymN0VeKQioMV3 V9bEeNkRYOf0ZTZDOaCq9pQagVb/GqWFgJKaFtvxkm/hWeb2PK6tRXbWGEEiYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hL4TWZz7jd for ; Mon, 29 Dec 2025 17:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 75293aaeea78 - stable/15 - inotify: Avoid resetting the cookie List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 75293aaeea785b342da41aac811213889ea0512c Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:14 +0000 Message-Id: <6952b542.262be.7670f0d2@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=75293aaeea785b342da41aac811213889ea0512c commit 75293aaeea785b342da41aac811213889ea0512c Author: Mark Johnston AuthorDate: 2025-12-21 23:49:26 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:33 +0000 inotify: Avoid resetting the cookie The IN_MOVED_FROM and _TO events only apply to names in a watched directory, never to a watched directory itself. So, the cookie value there is always zero, and in particular we should not reset the caller-provided cookie value, as it may be used later. Add a regression test. Reported by: arrowd MFC after: 1 week (cherry picked from commit da8ab13249420e85935b89794f333f0755e56385) --- sys/kern/vfs_inotify.c | 7 ++----- tests/sys/kern/inotify_test.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index fd1ef39b13f7..716fdc96e5fb 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -723,7 +723,6 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, } break; case IN_MOVED_FROM: - cookie = 0; selfevent = IN_MOVE_SELF; break; case _IN_ATTRIB_LINKCOUNT: @@ -734,10 +733,8 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, break; } - if ((selfevent & ~_IN_DIR_EVENTS) != 0) { - inotify_log(vp, NULL, 0, selfevent | isdir, - cookie); - } + if ((selfevent & ~_IN_DIR_EVENTS) != 0) + inotify_log(vp, NULL, 0, selfevent | isdir, 0); } /* diff --git a/tests/sys/kern/inotify_test.c b/tests/sys/kern/inotify_test.c index 713db55afc22..0a4df4e5fcaa 100644 --- a/tests/sys/kern/inotify_test.c +++ b/tests/sys/kern/inotify_test.c @@ -761,6 +761,36 @@ ATF_TC_BODY(inotify_event_move, tc) close_inotify(ifd); } +ATF_TC_WITHOUT_HEAD(inotify_event_move_dir); +ATF_TC_BODY(inotify_event_move_dir, tc) +{ + char dir[PATH_MAX], subdir1[PATH_MAX], subdir2[PATH_MAX]; + uint32_t cookie1, cookie2; + int error, ifd, wd1, wd2; + + ifd = inotify(IN_NONBLOCK); + + wd1 = watch_dir(ifd, IN_MOVE, dir); + snprintf(subdir1, sizeof(subdir1), "%s/subdir", dir); + error = mkdir(subdir1, 0755); + ATF_REQUIRE(error == 0); + wd2 = inotify_add_watch(ifd, subdir1, IN_MOVE); + ATF_REQUIRE(wd2 != -1); + + snprintf(subdir2, sizeof(subdir2), "%s/newsubdir", dir); + error = rename(subdir1, subdir2); + ATF_REQUIRE(error == 0); + + cookie1 = consume_event_cookie(ifd, wd1, IN_MOVED_FROM, IN_ISDIR, + "subdir"); + cookie2 = consume_event_cookie(ifd, wd1, IN_MOVED_TO, IN_ISDIR, + "newsubdir"); + ATF_REQUIRE_MSG(cookie1 == cookie2, + "expected cookie %u, got %u", cookie1, cookie2); + + close_inotify(ifd); +} + ATF_TC_WITHOUT_HEAD(inotify_event_open); ATF_TC_BODY(inotify_event_open, tc) { @@ -858,6 +888,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, inotify_event_create); ATF_TP_ADD_TC(tp, inotify_event_delete); ATF_TP_ADD_TC(tp, inotify_event_move); + ATF_TP_ADD_TC(tp, inotify_event_move_dir); ATF_TP_ADD_TC(tp, inotify_event_open); ATF_TP_ADD_TC(tp, inotify_event_unmount); return (atf_no_error()); From nobody Mon Dec 29 17:07:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hL1cXgz6M3rG for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hK4fT1z46kt for ; Mon, 29 Dec 2025 17:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=geYcUi6uJ04BYpSU7qt0k/4ucMDmmddxakilAi71jro=; b=Y7AiBAUC4Gr8otFq0kLxwEQCvyF49LmakUn4qH9ZOvdhYLqAvZS3scr1sP3ZpFzSBI0KJA ohhqDCv0Q21IKW4n4HfFvrAKs7pRzWhPuteHul71+L6W423IzBpelX9spGUwerkm931frE JuAgp+FRBP00WpEowRwbTsvr4LYHpBACz8hr6cC5ssUizOGJvyRtylY59romZlWwBQ7AR5 rHJV/K1oEKR0cVSfPSpKGrA/tXcrSmVFFCwNTXKFiVnKCXuAfa3DZr2XJz9fFQ2AxVil+3 DSYOIBHDs3mbM4B1H5Asp1jq5e1EMgi9PE22M/jNaKsqfWpT5ggdKE7IE7+vwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=geYcUi6uJ04BYpSU7qt0k/4ucMDmmddxakilAi71jro=; b=vbNgIR0EMCu7Jg/Nh8XP6nCwvkPV5ZMypnnyWsBGg0Q3cbtYHFRIaj5jVdljhssTf9/T8f CWaBonrguvzcFiEUcEBCM3iuCSIsb5RXdNak+E/ICdQQM+KkPNhmiulqiFZSziXqU2LZhB hN99fPQIr8P7WGEn8DzyuDC9mmxC74Gv26t+eDZdm/HwHQ2HMUyBc3s00z+lmVzPkAR9YZ NgAkA6ykkvdXrS1UnIT2A9D5vIOtLpVQ/dYV6/6aJ6QVMuGbgZnwjqMnJCrO4U1QiQdshJ d6o4L5JqqHko0QOpjdEF9+DcQbxRDZ9zpQtb83uYd5a040KtpfaqhLmTF5kSlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028033; a=rsa-sha256; cv=none; b=BxPO6zJJdavqiOaudzfi13y36IaHMIDi7DgF/6QcvpYIuhz9BaoBL1pZ95EV9fTTwfbY8f l0fw3RyGRqSZfru+5vlg9WxwXsfq0RZsL0wBiS+KEDhJJeL2ISJENHfIKjjg5AUcvQ3ndv QoXnMBq8DIuB1xS6LW3pcjc+roPMXpGBIoodkD8CPpYJPtXRm+4EJCU9CZDqhiYuuKrOca tGf4tqH8ONcTywWc9/TDcLVKWfkvZsW2RQ6Qwzq5Y76bZSmO2CiyPxCw6hkah4rvHyssyE LPZX+I3xhxIU85Pin5yCv8PqYq6AVVj4GetBXMa49oIAdXOLH/cSVh3bi1nPiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hK3y95z83t for ; Mon, 29 Dec 2025 17:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2705f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7999ce0d290a - stable/15 - rc.subr: Use the variable we defined to invoke setaudit(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7999ce0d290a5e996e7d4b1dafc22a5da8a72414 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:13 +0000 Message-Id: <6952b541.2705f.1338c97c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7999ce0d290a5e996e7d4b1dafc22a5da8a72414 commit 7999ce0d290a5e996e7d4b1dafc22a5da8a72414 Author: Mark Johnston AuthorDate: 2025-12-14 15:47:06 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:31 +0000 rc.subr: Use the variable we defined to invoke setaudit(8) Reported by: gtetlow Fixes: 39ee24182b92 ("rc.subr: Support setting the audit user when starting services") MFC after: 1 week (cherry picked from commit 9dda51f13cd85791c0f18782461219f5a88e2d67) --- libexec/rc/rc.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index c6f29c6b0c99..4e19d10f5e4e 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1151,7 +1151,7 @@ run_rc_command() fi _setauditcmd= if [ -n "$_audit_user" ]; then - _setauditcmd="setaudit -U -a $_audit_user" + _setauditcmd="$SETAUDIT -U -a $_audit_user" fi # If a specific jail has a specific svcj request, honor it (YES/NO). From nobody Mon Dec 29 17:07:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hK0PyJz6M3lr for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hJ4B8rz46xY for ; Mon, 29 Dec 2025 17:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVozPFnFpwqaLCKH296/FP9Dqa+EXcrNKrCYnZpnEcc=; b=y0loMwhVEr70YtaXkdRVhAtRDy3EiD+LibkHkKCaxwzKmE/AB311VYZpVzRlU+N5RW1xzL 5fW2IqbxxcM1eTNPk3T2F52c+zjZ7JKcPSNUNJ9q0OR8oNNrGSsE3TOlRQThVKoa09DEGg 9cvfWPieXNXo+mRDVrW+VOdeyhHhHd81sVGuMB1vpQAupqQAuPHwzpWUBNJlq8rKppZedL Cj+aH0yP3mtvpaWyB5x8bUKJ8XU9SFnxtHXf/RDIw7RrdgjmmTijnXHTVntDUXjhT7KMes Efp8MwSWIwapb/gA0gn0F5NCI7LSRt9nrAuaQ7rYuLmwLBsZPJO7Dsp/wYtBzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVozPFnFpwqaLCKH296/FP9Dqa+EXcrNKrCYnZpnEcc=; b=WRJuvaUuG4KMOtKRIc3LcDC5/g/AEWok8krn2NycAPsNgw/Yj0wq99dmwL+5o7DBJKakES N8EXuVonus6oRHKcFjshwN+1UWDnvHH2LaPHq8BE4p7iyt5EHXki2anxLdBxXGHQIDhCjB m6hGF3E7wbIBvwjOLnBLmuPfRd9WA5Nyyso1X5O4meM5nyJIKCJ/Rm8kMI+/lv0S1E5xda ekIOwek78R1fY5q7WIdNoq9S0BYsgeaCOZi4BGmQgMZglJKN9p2ELq7TUDEYFKzOL6ANn5 m6IpRasqRLzCt2CNawpkTADtNTJe/DgK+ZoX2hk/oMDIin/HVJhOJNxwvPx3mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028032; a=rsa-sha256; cv=none; b=iXT3cgGIj4QCTGoyUDo0kpMsKlajnxrJFK1e3YeKKhuR1AaOamFrqbTBiHmiTL0ovCpBmH nms1g506Hje8sdYjhEIGmTGtZGNKTE89WKMKAqAlp28zU/ImJ7il/Lj2oVm8Tege6BBBnK gis+LS/45wnBWXl2bgLh1WSzStnM6d3IbXbUv7AnGoOWIfV/tdi/nWL0fpXXZ5AAxr4bwh OnXC910FcJqGQSth+Y8UWUee+rnIOyN8gubzLwQMGdxDrn2G0Zyn65/JSnp/jSatHNpIqD 6zgSomNU0LzAlJzvYIEN9TWBL0M0livsUwENubnK62/sGeEBYEhhur7WYhE4bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hJ39CFz7pR for ; Mon, 29 Dec 2025 17:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0eb81bd89dcb - stable/15 - pfsync: Avoid zeroing the state export union List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0eb81bd89dcbbf21ff4722aca01a7559dc7bcf9f Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:12 +0000 Message-Id: <6952b540.26c1f.3b0ae512@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0eb81bd89dcbbf21ff4722aca01a7559dc7bcf9f commit 0eb81bd89dcbbf21ff4722aca01a7559dc7bcf9f Author: Mark Johnston AuthorDate: 2025-12-14 15:48:27 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:30 +0000 pfsync: Avoid zeroing the state export union pfsync_state_export() takes a pointer to a union that is in reality a pointer to one of the three state formats (1301, 1400, 1500), and zeros the union. The three formats do not have the same size, so zeroing is wrong when the format isn't that which has the largest size. Refactor a bit so that the zeroing happens at the layer where we know which format we're dealing with. Reported by: CHERI Reviewed by: kp MFC after: 1 week Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D54163 (cherry picked from commit 796abca7e281f0d4b7f72f48da4f941e1c8b139c) --- sys/net/pfvar.h | 8 ++++++-- sys/netpfil/pf/if_pfsync.c | 15 +++++++++------ sys/netpfil/pf/pf_ioctl.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 55b841f970ea..a6b2f8f11e0f 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1336,8 +1336,12 @@ VNET_DECLARE(pflow_export_state_t *, pflow_export_state_ptr); #define V_pflow_export_state_ptr VNET(pflow_export_state_ptr) extern pfsync_detach_ifnet_t *pfsync_detach_ifnet_ptr; -void pfsync_state_export(union pfsync_state_union *, - struct pf_kstate *, int); +void pfsync_state_export_1301(struct pfsync_state_1301 *, + struct pf_kstate *); +void pfsync_state_export_1400(struct pfsync_state_1400 *, + struct pf_kstate *); +void pfsync_state_export_1500(struct pfsync_state_1500 *, + struct pf_kstate *); void pf_state_export(struct pf_state_export *, struct pf_kstate *); diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index b571734b4250..3edf08aefeb5 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1900,25 +1900,28 @@ pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data) static void pfsync_out_state_1301(struct pf_kstate *st, void *buf) { - union pfsync_state_union *sp = buf; + struct pfsync_state_1301 *sp; - pfsync_state_export(sp, st, PFSYNC_MSG_VERSION_1301); + sp = buf; + pfsync_state_export_1301(sp, st); } static void pfsync_out_state_1400(struct pf_kstate *st, void *buf) { - union pfsync_state_union *sp = buf; + struct pfsync_state_1400 *sp; - pfsync_state_export(sp, st, PFSYNC_MSG_VERSION_1400); + sp = buf; + pfsync_state_export_1400(sp, st); } static void pfsync_out_state_1500(struct pf_kstate *st, void *buf) { - union pfsync_state_union *sp = buf; + struct pfsync_state_1500 *sp; - pfsync_state_export(sp, st, PFSYNC_MSG_VERSION_1500); + sp = buf; + pfsync_state_export_1500(sp, st); } static void diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 856bbd6cb9cb..e2b63965d1e1 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4120,8 +4120,7 @@ DIOCCHANGERULE_error: goto fail; } - pfsync_state_export((union pfsync_state_union*)&ps->state, - s, PFSYNC_MSG_VERSION_1301); + pfsync_state_export_1301(&ps->state, s); PF_STATE_UNLOCK(s); break; } @@ -4187,8 +4186,7 @@ DIOCGETSTATES_retry: if (s->timeout == PFTM_UNLINKED) continue; - pfsync_state_export((union pfsync_state_union*)p, - s, PFSYNC_MSG_VERSION_1301); + pfsync_state_export_1301(p, s); p++; nr++; } @@ -5797,11 +5795,10 @@ fail: return (error); } -void +static void pfsync_state_export(union pfsync_state_union *sp, struct pf_kstate *st, int msg_version) { const char *tagname; - bzero(sp, sizeof(union pfsync_state_union)); /* copy from state key */ sp->pfs_1301.key[PF_SK_WIRE].addr[0] = st->key[PF_SK_WIRE]->addr[0]; @@ -5934,6 +5931,30 @@ pfsync_state_export(union pfsync_state_union *sp, struct pf_kstate *st, int msg_ pf_state_counter_hton(st->bytes[1], sp->pfs_1301.bytes[1]); } +void +pfsync_state_export_1301(struct pfsync_state_1301 *sp, struct pf_kstate *st) +{ + bzero(sp, sizeof(*sp)); + pfsync_state_export((union pfsync_state_union *)sp, st, + PFSYNC_MSG_VERSION_1301); +} + +void +pfsync_state_export_1400(struct pfsync_state_1400 *sp, struct pf_kstate *st) +{ + bzero(sp, sizeof(*sp)); + pfsync_state_export((union pfsync_state_union *)sp, st, + PFSYNC_MSG_VERSION_1400); +} + +void +pfsync_state_export_1500(struct pfsync_state_1500 *sp, struct pf_kstate *st) +{ + bzero(sp, sizeof(*sp)); + pfsync_state_export((union pfsync_state_union *)sp, st, + PFSYNC_MSG_VERSION_1500); +} + void pf_state_export(struct pf_state_export *sp, struct pf_kstate *st) { From nobody Mon Dec 29 17:07:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hN1JJZz6M3Pl for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hM5gJbz46y1 for ; Mon, 29 Dec 2025 17:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cTpxOBRPb3MDy7xwbKDIMnNGTp9YUURrtud6YpKfQA=; b=kDeXymSXCW/L4JtTFXJI0QcrmONR4G8UZReTVgA0dpkg//Sz29OOAdGNWC35HXnFr7GFd4 UwKsPx0IBU3o9JcwiOrYakiKym/a5TbqIqphqTWk41Crih/zgraf78p+7viRAWmFAX1gDY UCQZFqvM+WAdvwWtrKd53dfDg4UKgHbq1ma/p5NsnTFCtGfrglnXZzho/dEyAIN7p+P2Nk 5KKZGckVC4iuJoH/6mJMJtWXU+U0Wxugj3B1blLaysFXh6H8anreuQGtlodiUJJFU++Edg vV9k3FkZAyV+uPJ6BgA2m8X/L5hk+l0UwPvgWXSJ4etWMjm/SN0Vd69U7H/NiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cTpxOBRPb3MDy7xwbKDIMnNGTp9YUURrtud6YpKfQA=; b=E8j/wkkfsbCOVkGFaC8YzkHJwvC+fFqe/utfT0k1fo8p48Za3PHvBD4RjyJeErKMk5EYeD YqGw3ed36mbxb9sJNu8RaU3sZApBgPiLCSxc71aykeK+6BIJQO0FEYG5iUJMtVYA3q7j/h 5xn9qkrgFyD7r1c4d2ju2NAIQ5gbXrK/ixHCuSO7+I0ad80C8+dUPncLdtYR5tmvaDcXpR V8C4nEYoSyVMHzSrS85xIunG0TED7FsUCq59AQRp22GMKUCcja6uTASh64Xl6n4P3cvtRm AXKo+MTD22qks3Znw+z+OWzhByn6CJNipSGCL0fnAfcBxiNr1EsVN02kKCB1MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028035; a=rsa-sha256; cv=none; b=nlVWsB9WRlwFWsOVHGYmWgJdACwrfC37IWZWHt+vV4nlDpRRMu9ZektdgcFjq9vQGmZAQY 2k8MbaDnN4Uy2dWBH9EIqLxEmIECRLkMvkH5ktHcNEcdwydag8Au6l8RdoVrkpgrHzUeFK rqicqQN0se+eNoH2gt0ZzN9XMkbX1124uYrODxhYP+PGau1Pk4edSCH2DnPSDRvN5b0xaF Q0m0GeeXM2slnBq8/HfZ+s8GJPMT1SB6TUnzhPMxajaF1lKkiW7Zdb2URpWolp79L9Wf6M 6EJWUFQRnGKw8i04oKeA1Vv7Gb25gOSUQ+NJk1mV4jbRniQXC2V5njfvSWHUSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hM5FCmz83H for ; Mon, 29 Dec 2025 17:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eb92fbcadeec - stable/15 - telnet: Remove usage of ALIGN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eb92fbcadeecb677d90e3cac572b64b862545015 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:15 +0000 Message-Id: <6952b543.26c23.461e27e7@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb92fbcadeecb677d90e3cac572b64b862545015 commit eb92fbcadeecb677d90e3cac572b64b862545015 Author: Mark Johnston AuthorDate: 2025-12-22 15:18:52 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:40 +0000 telnet: Remove usage of ALIGN gcc doesn't like ALIGN() being applied to an array type. Just use __aligned instead. Reported by: Jenkins Reviewed by: brooks Fixes: 80203a27e964 ("Add sys/_align.h replacing machine/_align.h") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54290 (cherry picked from commit 3a4275a5f1f5dccd6918c4eff3b84488e322ad5d) --- contrib/telnet/telnet/commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c index ca3460e455ad..2005362b5326 100644 --- a/contrib/telnet/telnet/commands.c +++ b/contrib/telnet/telnet/commands.c @@ -2848,7 +2848,7 @@ cmdrc(char *m1, char *m2) static int sourceroute(struct addrinfo *ai, char *arg, unsigned char **cpp, int *lenp, int *protop, int *optp) { - static char buf[1024 + ALIGNBYTES]; /*XXX*/ + static char buf[1024] __aligned(sizeof(void *)); /*XXX*/ unsigned char *cp, *cp2, *lsrp, *ep; struct sockaddr_in *_sin; #ifdef INET6 @@ -2888,7 +2888,7 @@ sourceroute(struct addrinfo *ai, char *arg, unsigned char **cpp, int *lenp, int lsrp = *cpp; ep = lsrp + *lenp; } else { - *cpp = lsrp = (char *)ALIGN(buf); + *cpp = lsrp = buf; ep = lsrp + 1024; } From nobody Mon Dec 29 17:07:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hP37wjz6M3mM for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hN648Sz46vk for ; Mon, 29 Dec 2025 17:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfBfp7TucXloGaDgdVNsnxRwBiTw+9C4sR95F4Z4naM=; b=INO2a+f7eeEP9Oi8S+dCit5mq1dUmr9gotJCpzeHRt7m44313SQNbFwa3HGgdd57aP7xWb KIzz9qqyk4PxMBra/OHcEtU89wOArB3/nu90QzdnKkmgYGyDzW2HXqbreoDqnYN0Miabwi GDc79qbeVnOYyugA9yxy3Yn6dlBGF2TtH8KRRZSSAJ1Qz7Tdd0SY5WNoSIFe7xJvcaK+2f 5YVcykzZejuFyIYxVyXOXl4FgPRJTMhOnxCLqz05K2+WZtVEY5hGV+xuCAIWpSyI6qESWJ VHCE2vZmDOJ3wUqNs9PMi9iXFMxLaYXXHdTV6pfA4e4SgDFYXFw9y4vE+OoTAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfBfp7TucXloGaDgdVNsnxRwBiTw+9C4sR95F4Z4naM=; b=CHQyL6hsfBkxnIYbptfnPuoydGztb4aiEyxZK6LxabTYML77hOWaQ4ZO1REzMtcMaOQSIa C2TaUaYXbpHlFHEPHeioHXb1NK45CzZYl529ooVdF+87d+/sP2z0dc644ypNoEDGYRZFku wdH6GrD9r+AcJE276K87FbUw9gBMa2LOvNRsKToeuO+G20H1GdCvXQ0stLH6ktAIcpxyXM 7YzIZkqN61KGNRC/oTts3FyT3ehNns3SMC9a/Wvrv3oHFlyV+P2WkIIffgQAeDKz8VdWee 6yQOEKJaXo7+Gb05P/ArShz882qZ0ibhFDw593FoWItC4qycP0EzYlnOndceiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028036; a=rsa-sha256; cv=none; b=ur1fGHFo0IHQKVBjXXe2f3fsspkKOb0v2r9eLeHT5rGvF4l7h1nK5kaT/4Gr/2X9AROMVt qrHVAZQNvcSsalGsiGahy5cIvl6JuJYptpNf3WB+1DB5avTtu4kUONubVO2NRdJm3m9gaF I/l6HpQ6KYpqQ3FnBKMD2lZaXtxHbNLPhfE0HF1lVuperm2lQgFAPhiKWSIlBcGSfwrYxx V+Ei+CRI/Fbm2Lghqs+rwzhGIKHuFH37jtCqhPzLY6htA8a0pp7NgZONr74evonpwm0kzq KykiKHaxLFHouyeQGeJjUurZk69eSHaitAg9L/hwuM15UgE1kmkLVj4Fjfeh4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hN5dLPz7jf for ; Mon, 29 Dec 2025 17:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 261cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 859fcbb91908 - stable/15 - vmem: Fix the 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 859fcbb9190827a62b1410f5f7ddcb87ef28ce6e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:16 +0000 Message-Id: <6952b544.261cf.77819cbe@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=859fcbb9190827a62b1410f5f7ddcb87ef28ce6e commit 859fcbb9190827a62b1410f5f7ddcb87ef28ce6e Author: Mark Johnston AuthorDate: 2025-12-17 20:54:40 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:50:12 +0000 vmem: Fix the gcc build gcc complains when building libuvmem because the last two operands of ?: in ORDER2SIZE and SIZE2ORDER have different signs. Add explicit casts to address this. Reported by: Jenkins Reviewed by: alc, kib MFC after: 1 week Fixes: 1ecf01065b45 ("libuvmem: usermode port of vmem(9)") Differential Revision: https://reviews.freebsd.org/D54268 (cherry picked from commit 377e6050c1cb9edce90d2a3caa2833fcc09b8c68) --- sys/kern/subr_vmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index afc327c512ce..8b834a2e2a79 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -285,10 +285,12 @@ static LIST_HEAD(, vmem) vmem_list = LIST_HEAD_INITIALIZER(vmem_list); #define VMEM_CROSS_P(addr1, addr2, boundary) \ ((((addr1) ^ (addr2)) & -(boundary)) != 0) -#define ORDER2SIZE(order) ((order) < VMEM_OPTVALUE ? ((order) + 1) : \ - (vmem_size_t)1 << ((order) - (VMEM_OPTVALUE - VMEM_OPTORDER - 1))) -#define SIZE2ORDER(size) ((size) <= VMEM_OPTVALUE ? ((size) - 1) : \ - (flsl(size) + (VMEM_OPTVALUE - VMEM_OPTORDER - 2))) +#define ORDER2SIZE(order) ((order) < VMEM_OPTVALUE ? \ + (vmem_size_t)((order) + 1) : \ + (vmem_size_t)1 << ((order) - (VMEM_OPTVALUE - VMEM_OPTORDER - 1))) +#define SIZE2ORDER(size) ((size) <= VMEM_OPTVALUE ? \ + (int)((size) - 1) : \ + (flsl(size) + (VMEM_OPTVALUE - VMEM_OPTORDER - 2))) /* * Maximum number of boundary tags that may be required to satisfy an From nobody Mon Dec 29 17:07:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hQ5Yshz6M3Vl for ; Mon, 29 Dec 2025 17:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hP731sz473c for ; Mon, 29 Dec 2025 17:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syX97FnSp3rX8eRuonVXIUS4wjwc/mDfLMrubjs+6h8=; b=vWoRI7c5MgIZnNkD6cY9G0oCF5Eejug/c6fxEnlACbEMEU4xW1nnSwxz2mAQGXiPsH+6ya ogNsh6dZ7bs2s1Re3v49KUyXHQaXFX1qfFBGGbX+6hfn9nx9jFF1IuEET7k2XUkrnY0382 Bg7lbjl24eyU7nHcl/v55ypd+O6eeIkKz5lOOdYOETBuKOy/lTKHaz30G+8Rn3qKQPMyaM h6lLq9880nf/xI8lF81perMsgpk3ihySGF7UCLzOOzb+8iLTHvFhCuv5Z66XcGiKSCtHlK YcQxwQkAZND+PBEyt2y5dOZjS+T9p92PRmhNl1uVA3dAQNsw3BsC6XdrbWHBlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syX97FnSp3rX8eRuonVXIUS4wjwc/mDfLMrubjs+6h8=; b=naai77rxmXHZNarwTE7X9sMHzPocgB/bELe+UWDHYA4uEbMxQ98J82n0fmTYbzclM7qWOX sN0gSMAz3/9WV9Gd/e/CsFNvA0xugFqjCoomWlzHps1blGvYfNgtxEJ/oLTzFqwTE7+6ad 6KzbGFdXzukPUoVlkak3oRKDAVnotYb8bO+pFbvgz39mEq6rQanqmaV6maCHlSw5GpIAT5 2E8uelcJgb8t/pBlFz7ClSJuNSUA+m+AR/qy1XAyvRe/WabgikFGM+05qyNiOsh0KvRlAH wJaeJb6QH6Dvw/xRZjvDm5uvZd0GbCFxk543horgkSQBJPSWzG6KS5fOGOesbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028038; a=rsa-sha256; cv=none; b=JdzDl6bMyLG1nFU0/+bTCjPzEhAVpiRIrMjGYSY0HfQtbaLqw5RWZkuPh+fo84At56GfyD +qN13fazF4OoBvPokI/wM3U9PLSGnc+5wcDMMxucbS9z4piRM/bxnhVTqzU3NcDgjgkV+L 7df1+J9PxU2+DoPzSikriRaIXyHaZD61Z1R5X/s4bVjJI3jlpHYyeu/bIG3/XxHXOB5sjl YLonU9sibgreyAUkU7cdEDYD/nZ+rrXQUQKV3PGHs0HKw0XJTM7FrffwCsqJDkQ1h6sDTr CYNtaZb8VsYNaNbouB83pLEMvJILWAHt+CfwPMqSxQG7Qd80P/6Jz+B4J++CSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hP6ckrz7mJ for ; Mon, 29 Dec 2025 17:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 255a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 108e4f31420d - stable/15 - armv8rng: Fix an inverted test in random_rndr_read_one() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 108e4f31420d8c765d883afaece49a782d35943d Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:17 +0000 Message-Id: <6952b545.255a5.3550ef2@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=108e4f31420d8c765d883afaece49a782d35943d commit 108e4f31420d8c765d883afaece49a782d35943d Author: Mark Johnston AuthorDate: 2025-12-18 14:17:20 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:50:34 +0000 armv8rng: Fix an inverted test in random_rndr_read_one() If we get a random number, the NZCV is set to 0b0000. Then "cset %w1, ne" will test whether Z == 0 and set %w1 to 1 if so. More specifically, "cset %w1, ne" maps to "csinc %w1, wzr, wzr, eq", which stores 0 in %w1 when NZCV == 0b0100 and 1 otherwise. Thus, on a successful read we expect ret != 0, so the loop condition needs to be fixed. In practice this means that we would end up trying to fetch entropy up to ten times in a row. If all attempts are successful, the last will be returned, otherwise no entropy will be returned. Reported by: Kevin Day Reviewed by: andrew Fixes: 9eecef052155 ("Add an Armv8 rndr random number provider") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54259 (cherry picked from commit 93811883500b99f9f1fb4ffd6e764226d37dcfd0) --- sys/dev/random/armv8rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 524d80317681..9573c09aa77a 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -64,7 +64,7 @@ random_rndr_read_one(u_long *buf) /* 1 on success, 0 on failure */ "cset %w1, ne\n" : "=&r" (val), "=&r"(ret) :: "cc"); - } while (ret != 0 && --loop > 0); + } while (ret == 0 && --loop > 0); if (ret != 0) *buf = val; From nobody Mon Dec 29 17:19:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yC3Kjgz6M43f for ; Mon, 29 Dec 2025 17:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yC2PBjz3CGd for ; Mon, 29 Dec 2025 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gbHP/CyaSGp0g+z6RMMu6EET/+FtmkGf1I4APg2ZRg=; b=qpKCMsfC/L2H32faDVvwL5JDR2MyMoxPoB6quWm0Jv4++r499uu5tGWCYoSBbUN3T/0FEc lAiZxhKUcfsiBpQ/LbHsmKpFz/yJAAL9kf0vTX+RHPq+SyFMO+oFc6i3GUv3lSsj9ksKqB GJhlp/UtN93N+eiOLpYWhOLeB8o3i0mE7vghPRu4/wOYRhZaAHsTSJj2/bV3mlnCUGPKpH 7T+MORKIldZfO1U2QVZsyam0YR8uJFxYWia597uQxgvdH7yhMAoo1Pp7oTVAijjOOLxnoG rzF27Ivt2MKvcu8ckVURBrmY8pd22YxHJq84m5FEg4aJINKhz/dsZPLY8x3MPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gbHP/CyaSGp0g+z6RMMu6EET/+FtmkGf1I4APg2ZRg=; b=JbJ4jsRkE5GWYypHyWIggVAUB226Tdc4vEXFA5y9tHjka3n5ze6T4VgI9X+dtpCEP9zG7j TnvLVZWfneP95C7n+fCc/DZUQ8rM5pEmdioV7II88EoEGAciptkohTsPUOPDYYP3KZyaYe Ywv6oq/eJvMhWeNx7SB+DsKo+KApCv8VBjGwIxt4AUQk+J1rXsZtTTXUIuMnyRdImxDsW+ ebtXN6Ym5BX4v2nj1mMoTBE0ibTWgeriZz+TFVAnOGtBEYXE8+weR4DOP+pt/uLT4idNmW ccKY2Hb8McfXGF6KHPuVFIUzCM0EOWrHh7111qfsPK26aUkYpMaBWIAlO23sww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028755; a=rsa-sha256; cv=none; b=UQaDxck2xZwG5JukWjVHdeGoMHDvGHhO+No3XGWADNi6jIknyZyiJFD0YOco7bVghzpZGu RyRtQMGIqHWvfpr+h8rmqZBfBTLXbFS+ZoQFdeKctLmF3cf6E0Psz/HH3J55PPfbWTrxsh Rqrs6aH5PvOop72oENibH0tlMbwY3NFBFNWQKk4kc0IGIUpkhboQFunqTvPaZ4nZYoUkBE bZpcKkycx9Qo+3SoZYCYKKHwCLumF4Mu0KdRjSurQKKjGFmgNW1V57y0oySvrs8RRAt+rA 7NkIqrj7ux6g93Q+4cOntWop9D5tuJXX6m9fxjR7dy7nnauwqFqA1icriie3Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yC1jJGz8JJ for ; Mon, 29 Dec 2025 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 04a664d87607 - main - libc/stdlib/Makefile: one line for each source file name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04a664d87607d25d87baf56903090707cc91e2e0 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:15 +0000 Message-Id: <6952b813.264b6.4544022c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=04a664d87607d25d87baf56903090707cc91e2e0 commit 04a664d87607d25d87baf56903090707cc91e2e0 Author: Konstantin Belousov AuthorDate: 2025-12-25 23:36:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 libc/stdlib/Makefile: one line for each source file name Reviewed by: alc, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- lib/libc/stdlib/Makefile.inc | 82 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 13 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index b878a7625e9f..37a927b0597b 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -1,19 +1,75 @@ # machine-independent stdlib sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib ${LIBC_SRCTOP}/stdlib -MISRCS+=C99_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ - bsearch.c bsearch_b.c \ - cxa_thread_atexit.c cxa_thread_atexit_impl.c \ - div.c exit.c getenv.c getopt.c getopt_long.c \ - getsubopt.c hcreate.c hcreate_r.c hdestroy_r.c heapsort.c heapsort_b.c \ - hsearch_r.c imaxabs.c imaxdiv.c \ - insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c memalignment.c \ - merge.c mergesort_b.c ptsname.c qsort.c qsort_r.c qsort_r_compat.c \ - qsort_s.c quick_exit.c radixsort.c rand.c \ - random.c reallocarray.c reallocf.c realpath.c recallocarray.c remque.c \ - set_constraint_handler_s.c strfmon.c strtoimax.c \ - strtol.c strtold.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ - strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c +MISRCS+= \ + C99_Exit.c \ + a64l.c \ + abort.c \ + abs.c \ + atexit.c \ + atof.c \ + atoi.c \ + atol.c \ + atoll.c \ + bsearch.c \ + bsearch_b.c \ + cxa_thread_atexit.c \ + cxa_thread_atexit_impl.c \ + div.c \ + exit.c \ + getenv.c \ + getopt.c \ + getopt_long.c \ + getsubopt.c \ + hcreate.c \ + hcreate_r.c \ + hdestroy_r.c \ + heapsort.c \ + heapsort_b.c \ + hsearch_r.c \ + imaxabs.c \ + imaxdiv.c \ + insque.c \ + l64a.c \ + labs.c \ + ldiv.c \ + llabs.c \ + lldiv.c \ + lsearch.c \ + memalignment.c \ + merge.c \ + mergesort_b.c \ + ptsname.c \ + qsort.c \ + qsort_r.c \ + qsort_r_compat.c \ + qsort_s.c \ + quick_exit.c \ + radixsort.c \ + rand.c \ + random.c \ + reallocarray.c \ + reallocf.c \ + realpath.c \ + recallocarray.c \ + remque.c \ + set_constraint_handler_s.c \ + strfmon.c \ + strtoimax.c \ + strtol.c \ + strtold.c \ + strtoll.c \ + strtoq.c \ + strtoul.c \ + strtonum.c \ + strtoull.c \ + strtoumax.c \ + strtouq.c \ + system.c \ + tdelete.c \ + tfind.c \ + tsearch.c \ + twalk.c CFLAGS.qsort.c+= -Wsign-compare From nobody Mon Dec 29 17:19:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yD5gbJz6M4nm for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yD2BgNz3C0C for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mib+1ecjjZeZ9DO4KXLJPZDK8GXq81ivnQARm1+QKmE=; b=jdqfwXsJuIVLUet0EzvdMhZ4e2WM3GnOVaJslhDmJaC5sm6kdDdjmsbZI7zTuhUNxeK7CC 64N0sZX0GZXS8u6Y4wCQoc2cD9yt3h1+NZLDq1Li0r2OraYQeBGhHjoDE/reR38Ojp8hMF 4OY94231ObxRi5DF2hbnMoq6Nem9khrPVs29h9mIgVi5lfOX61LoSRwzz3l7ZNTGpuj/+e UgUy3gcPNQcHtQ9FHNo3rxZeuGtE+eXL6MczUIPlslBnxvExBTI3irX+3DXNJT7DpRlbrt Mvmn26cffSVPs0Jzau7EikvD9Pux75TjvoimjhLUUTkV1Z/c/bCdURdLs7o7fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mib+1ecjjZeZ9DO4KXLJPZDK8GXq81ivnQARm1+QKmE=; b=cv50X66W+0AwnPH9A/T2fgB0WsdIVBXkC2m+tNTcgfIfcpeRjaVq+evMXebzA1Llfs0kLy zgyQG0Scj9XF8UX3vsKMMU0AAcHF0WY3vKkNBvBWf4CCw+79SuzW0M47VqxKlTJICPas3d dVjOgnOxADhz9uGVeNaE78st4zJbGu6Fj4J/iJeiI2Fqg01GfHkYRx7M2gumq8RDC1Yb+y 9ejXB9X0/+500qdTLFtFDSONV+UNu9IJ6Zpndjx3+VWPMUFCOiC8+rQA8W6V88CQ55a2wc JRNQIY8MJr4iMqUbxNIXnXYwvCzH5AYbZc4Hb9HAuIgacPGCjII74cUFq4SGRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028756; a=rsa-sha256; cv=none; b=g7lk4Ocjdl6xwq+E9rz+3B7sJiADArW3+/qOpaPJUBGaIVzkZFxtZViyBzKNbvnlu0nLLD Cbd7qlCOxnL8Qo03kMM2ilodhc5Hl9Edsiv0w/aOrAuQF7D3HGSGc50fP50Xpl0oO05+z7 KrSLvAwfa4imueVmkszagvs2ucjuA9jqSD3aKfv/eXnjZDGbKsffMzt7WMu5gBxvXCatd/ gwoxVs+7DWGFALLbxOyj/wz5r+5HcG86MIw/jlZ8EQy0AXv+NemOfzotP9MoQLK4TfL3vl H+IYaJjpcPiaYs68kBGO0Cew5GvQ/l2thyNMFoJ2N1GwvGiL0PPNCVC35AQpwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yD1X7fz84p for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30207 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b8c99e7d912f - main - libc: add glibc-compatible tdestroy(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8c99e7d912f0dad84cec80f8c4331646b87a3ec Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:16 +0000 Message-Id: <6952b814.30207.47661323@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c99e7d912f0dad84cec80f8c4331646b87a3ec commit b8c99e7d912f0dad84cec80f8c4331646b87a3ec Author: Konstantin Belousov AuthorDate: 2025-12-25 23:38:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 libc: add glibc-compatible tdestroy(3) The function clears the whole tree. Relnotes: yes Reviewed by: alc, emaste Discussed with: dougm Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- include/search.h | 1 + lib/libc/stdlib/Makefile.inc | 1 + lib/libc/stdlib/Symbol.map | 1 + lib/libc/stdlib/tdestroy.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/include/search.h b/include/search.h index 0615da2b42ba..5ac25a0d491f 100644 --- a/include/search.h +++ b/include/search.h @@ -77,6 +77,7 @@ void twalk(const posix_tnode *, void (*)(const posix_tnode *, VISIT, int)); int hcreate_r(size_t, struct hsearch_data *); void hdestroy_r(struct hsearch_data *); int hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *); +void tdestroy(void *, void (*)(void *)); #endif __END_DECLS diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 37a927b0597b..e46a8d7340b2 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -67,6 +67,7 @@ MISRCS+= \ strtouq.c \ system.c \ tdelete.c \ + tdestroy.c \ tfind.c \ tsearch.c \ twalk.c diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map index 8b7e97c3cbdc..03a6d0b543ac 100644 --- a/lib/libc/stdlib/Symbol.map +++ b/lib/libc/stdlib/Symbol.map @@ -134,6 +134,7 @@ FBSD_1.8 { FBSD_1.9 { memalignment; recallocarray; + tdestroy; }; FBSDprivate_1.0 { diff --git a/lib/libc/stdlib/tdestroy.c b/lib/libc/stdlib/tdestroy.c new file mode 100644 index 000000000000..c324e151da11 --- /dev/null +++ b/lib/libc/stdlib/tdestroy.c @@ -0,0 +1,68 @@ +/* + * Copyright 2025 The FreeBSD Foundation + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#define _SEARCH_PRIVATE +#include +#include + +static void +nul_node_free(void *node __unused) +{ +} + +/* Find the leftmost node. */ +static posix_tnode * +tdestroy_find_leftmost(posix_tnode *tn) +{ + while (tn->llink != NULL) + tn = tn->llink; + return (tn); +} + +/* + * This algorithm for non-recursive non-allocating destruction of the tree + * is described in + * https://codegolf.stackexchange.com/questions/478/free-a-binary-tree/489#489P + * and in https://devblogs.microsoft.com/oldnewthing/20251107-00/?p=111774. + */ +void +tdestroy(void *rootp, void (*node_free)(void *)) +{ + posix_tnode *tn, *tn_leftmost, *xtn; + + tn = rootp; + if (tn == NULL) + return; + if (node_free == NULL) + node_free = nul_node_free; + tn_leftmost = tn; + + while (tn != NULL) { + /* + * Make the right subtree the left subtree of the + * leftmost node, and recalculate the leftmost. + */ + tn_leftmost = tdestroy_find_leftmost(tn_leftmost); + if (tn->rlink != NULL) { + tn_leftmost->llink = tn->rlink; + tn_leftmost = tn_leftmost->llink; + } + + /* + * At this point, all children of tn have been + * arranged to be reachable via tn->left. We can + * safely delete the current node and advance to its + * left child as the new root. + */ + xtn = tn->llink; + node_free(tn->key); + free(tn); + tn = xtn; + } +} From nobody Mon Dec 29 17:19:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yF4Tnfz6M4Zk for ; Mon, 29 Dec 2025 17:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yF2SqCz3C7h for ; Mon, 29 Dec 2025 17:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqOZDNPpSU/VpK88IKcaFCyPvBDnV2d10mty0ucfYlM=; b=YhQg4p16xwcS6G6ZNV2y2RyMci7NfVJP4Cl2Hf40xxNNSVf0VnvZcg5Fnb0GvSNQpWuLwI ze1+OIsDOPDPHr84MWbH6RXybIJ8dNiUdv1a8Wxth9OsxZGSAN2mSe7qqpFjEwgtqazTz5 Eo+JluYHIDm2PN8Kf/FmyJwgFWLLCSBfzYW+6QQMmHPiJzusf3OuJqVn/Uh0eVxrHOHlb8 4cmiDvvfcYAXmqFakYMIu2K/83BngK9zixIB4Awhv+h+El4p7FdEgERvqi7R/AyXa/KFg1 +b46JLOu7inci9fuHq6TC8y5dqcQoJKTpCUe5Y4fijG8XwqSRhLnkFUrsZxMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqOZDNPpSU/VpK88IKcaFCyPvBDnV2d10mty0ucfYlM=; b=ROqKamEPEBChNzd6lry9exG4mS3scJMSYp2xrZE9rWsrGnJpqfCHPpE87pgO8ZJ/A+/QFl NGholKgYHCv8R25tlDpHWM/bWk5B8BPab4s6ywvzWRjSa9U896pz6ALZuSkWZ4dczxdTod +4elTot+e7rriraCUKwP7oT24KJ0fmoWX7OgROB7yGt7UOSTCm2o62iZFw3LtPccORb8m3 eavbdgiCY7VYRiFwx3LNKNUugX/B7jhXuoT2ulHGB53YIpdSgQTuhyQRRtnAvz+pOuDM1q 7VDnoS1cv5YrXwa/VX1OtTe/1DrknAvmqMzqAH4/5JPIPmZsGCA3KrP1FT3fFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028757; a=rsa-sha256; cv=none; b=fcYFidg9zyN5Q1+mHS7UG7pY8QQSpEl2jzlx/arn5hCt0/sBQ8UTltBE6lmmwePOeMpR2T QbDttyHeS0kYbo4bRS+a6cx7IPXDQHbp9GmLk8Q7/aE/1WNMne7585wJgxjRNjuJbxFSwF tV0yYyB0yN/Q2MFP38yFnfYQuG+scqCnBrnEUX8qbOicpkeglbpN12UpgnLUHuT8XzbR5a vcXWpKfQXQKVXHvF2aX8NSuJpxppn/jB7yUxN/egpAtoGDALJI0A/NIR3WurFbtvejfux1 TaZmLPFu9SN3lPFbzJKQB+wZOstkLvG1OyJDEd7sppbAznPQ+UKHNV5BP5f/6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yF1vwWz8JK for ; Mon, 29 Dec 2025 17:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2630f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b0d4b059cf84 - main - tdestroy(3) man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0d4b059cf8425cbe094f93362a61c56a26d45f3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:17 +0000 Message-Id: <6952b815.2630f.5f78ec2a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0d4b059cf8425cbe094f93362a61c56a26d45f3 commit b0d4b059cf8425cbe094f93362a61c56a26d45f3 Author: Konstantin Belousov AuthorDate: 2025-12-26 18:27:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 tdestroy(3) man page Reviewed by: alc, emaste, ziaee Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- lib/libc/stdlib/Makefile.inc | 3 ++- lib/libc/stdlib/tsearch.3 | 25 +++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index e46a8d7340b2..c311ba3d2bcc 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -147,4 +147,5 @@ MLINKS+=strtoul.3 strtoull.3 \ strtoul.3 strtoumax.3 MLINKS+=tsearch.3 tdelete.3 \ tsearch.3 tfind.3 \ - tsearch.3 twalk.3 + tsearch.3 twalk.3 \ + tsearch.3 tdestroy.3 diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3 index edee01cafc52..f412c37a4ef0 100644 --- a/lib/libc/stdlib/tsearch.3 +++ b/lib/libc/stdlib/tsearch.3 @@ -36,6 +36,7 @@ .In search.h .Ft void * .Fn tdelete "const void * restrict key" "posix_tnode ** restrict rootp" "int (*compar) (const void *, const void *)" +.Fn tdestroy "posix_tnode *root" "(void (*node_free)(void *)" .Ft posix_tnode * .Fn tfind "const void *key" "posix_tnode * const *rootp" "int (*compar) (const void *, const void *)" .Ft posix_tnode * @@ -45,6 +46,7 @@ .Sh DESCRIPTION The .Fn tdelete , +.Fn tdestroy , .Fn tfind , .Fn tsearch , and @@ -95,6 +97,13 @@ If the node to be deleted is the root of the binary search tree, will be adjusted. .Pp The +.Fn tdestroy +function destroys the whole search tree, freeing all allocated nodes. +If tree keys need special handling on free, the +.Fa node_free +function can be provided, which is called on each key. +.Pp +The .Fn twalk function walks the binary search tree rooted in @@ -128,7 +137,9 @@ is NULL or the datum cannot be found. .Pp The .Fn twalk -function returns no value. +and +.Fn tdestroy +functions return no value. .Sh EXAMPLES This example uses .Fn tsearch @@ -184,6 +195,7 @@ main(void) tdelete(four, &root, comp); twalk(root, printwalk); + tdestroy(root, NULL); return 0; } .Ed @@ -192,8 +204,17 @@ main(void) .Xr hsearch 3 , .Xr lsearch 3 .Sh STANDARDS -These functions conform to +These +.Fn tdelete , +.Fn tfind , +.Fn tsearch , +and +.Fn twalk +functions conform to .St -p1003.1-2008 . +The +.Fn tdestroy +function is the glibc extension. .Pp The .Fa posix_tnode From nobody Mon Dec 29 17:19:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yG74Kcz6M4l7 for ; Mon, 29 Dec 2025 17:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yG3RkYz3CJP for ; Mon, 29 Dec 2025 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO+7Mx+9Gw+UFedDZflnSy4r60CY2pTNnQMij5GS2u4=; b=fs/qnQm07uCJ/5qLZY7Rh47FBiwZcXtLjZPByiWyJd3rZkGHVrL+iHFC4XRHLCPaQONIoo JTndARoT3aMTkjplgMJDl42y5kHgGWmh6QtFv1BUAT3iSDpGxtZ4sStR3Otn362s97y5RN He+IF9OR0wzjziYzGxgqEGq4lsqxbE4zGL3FnsW1f6JUWyo6Uazv/qT+W4wH2qDh0mDssP +hixI4KyLhDKzXg6zxjAWf2pbZ4UXheIetE48ZvGU+8/8Pcx72HCA8xGDvLY0L2RNSMIUX NyBEkbd87tecsFEQbalLij+EZMw0M5Q4lb7XJLL5wotCkOFf0bENZUWGTVkGGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO+7Mx+9Gw+UFedDZflnSy4r60CY2pTNnQMij5GS2u4=; b=ZV0SAPIZ6H5+ySpAw/bC1JRn7oV+b/7NZkOtTMTGWPtUNtCA56grL077lixsSTrMnfh7r7 d8Fumg8QIwYfRIOelr7jWewZcRGsanSWY9FwDZQGtyG4WhpnYk+6Sktom7HU+rDr/ljdfi 4SO0KjhfxgrlO+Ftt+0JCQJtohC4oYRTaoVDJQnSVJ4dt/u19HNBTmCvvDiLPoOui/sJFt jIpCQ/cahPPhZ3XjXg2zmUzOm6e5AOJs4oYsQ0IzYALDI2tCoigFVQv7jn6l9BhweaSLI2 t5IRw4fAal6fli3i79mLHz2i42XxV5xGEWjHbpii1cnjGWsjW8PdWryEbXIl3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028758; a=rsa-sha256; cv=none; b=OvWOvgrX0ob/eDDgMfCD6k4kVrZijvqx7h/7xtPX/cLWVx/H22U3umC480VpRvifUibOMQ fSamqCIMHaQsPA7/t1ayZXgxhp4Tw3Q9pTsnlUXysQ3t6VCxJLzzkl4MzEEFpbZStXRR3G Ltx8VN1uHh6aLXQ6zufcLGeFRt9xxJp8zqHub2m3X9xeyv0pVSZYdggm+7D4kNjIcPqQZ/ 1crrI+aSlLrb31Kt4v+qBWxyvyxe62Nw2nevY5ojN+QlBQ7VB60+EspOikwMx3jb+5ugym zxVbPiZ/OUW/+czOjI8a2JzrMi8fYTmf4NU0zkrtOMeR8Yt2WJmjHnPrmq4Dag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yG2fkGz7hT for ; Mon, 29 Dec 2025 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26561 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3204c097fd08 - main - tdestroy(3): add tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3204c097fd08436805f059c0d7f676d29ee9bb62 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:18 +0000 Message-Id: <6952b816.26561.773af449@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3204c097fd08436805f059c0d7f676d29ee9bb62 commit 3204c097fd08436805f059c0d7f676d29ee9bb62 Author: Konstantin Belousov AuthorDate: 2025-12-26 22:00:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 tdestroy(3): add tests Reviewed by: alc, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- lib/libc/tests/stdlib/tsearch_test.c | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/lib/libc/tests/stdlib/tsearch_test.c b/lib/libc/tests/stdlib/tsearch_test.c index ee9deec588cb..f42729e5e75c 100644 --- a/lib/libc/tests/stdlib/tsearch_test.c +++ b/lib/libc/tests/stdlib/tsearch_test.c @@ -147,10 +147,75 @@ ATF_TC_BODY(tsearch_test, tc) ATF_CHECK_EQ(NULL, root); } +static int nodes; + +struct my_data { + int key; +}; + +static struct my_data * +new_my_data(int key) +{ + struct my_data *res; + + res = malloc(sizeof(struct my_data)); + res->key = key; + nodes++; + return (res); +} + +void +free_my_data(void *mdp) +{ + free(mdp); + nodes--; +} + +static int +compare_my_data(const void *mdp1, const void *mdp2) +{ + const struct my_data *md1, *md2; + + md1 = mdp1; + md2 = mdp2; + + return (md1->key - md2->key); +} + +static posix_tnode *root = NULL; + +static void +insert(int x) +{ + struct my_data *md; + + md = new_my_data(x); + tsearch(md, &root, compare_my_data); +} + +ATF_TC_WITHOUT_HEAD(tdestroy_test); +ATF_TC_BODY(tdestroy_test, tc) +{ + root = NULL; + insert(1); + insert(100); + insert(1000); + insert(5); + insert(6); + insert(12); + insert(2000); + insert(3); + + ATF_CHECK_EQ(8, nodes); + tdestroy(root, free_my_data); + ATF_CHECK_EQ(0, nodes); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, tsearch_test); + ATF_TP_ADD_TC(tp, tdestroy_test); return (atf_no_error()); } From nobody Mon Dec 29 18:12:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg47v3rRgz6M7p5 for ; Mon, 29 Dec 2025 18:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg47v0lyxz3JsN for ; Mon, 29 Dec 2025 18:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767031963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwjcXAzW6Alx/imrgkvOj++uehq5lOpQ3vR/AQc4XVQ=; b=tFakjg9r2V/8uNZ7ZEZsAM+Wl0L7VHyJc7dCJgBElJCqOTQ73chxybyC5RxX8Ir1qfJFJ8 XtliQjY0GnQEEDUh64ru2YG6wMz+9FpZ+d/X+YqpLF1ROTfCXNcDTEufUUmzQYzIlzIo1v EdcV8Gz/0f+WfsV0vwCgzlbvu4mGsa54FHFPtsdLg+ktsytOrMdNgDaEfYHGvcB2vkZgFY MItZCPyOBub6Ygpqsar0lBi4vVAWOrrq/QknTbZzIMDT6cGa/TCB0lgS5mdgvUsmhf+Ogk g3Yb9maaHwbM94fjXhEVKSOjXO9vByHZTV0avniU9QQcD3DUz7o+Z5cpLqbvNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767031963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwjcXAzW6Alx/imrgkvOj++uehq5lOpQ3vR/AQc4XVQ=; b=By6nOX2PL13LPoXhKumgN/RtF7Hvl7rbGttmIFJWMEoJk7aR1rrUquILSLaeUDqKCPybi+ Ur9hhU2zMYJP8pT2HXDLY2pf0N9BAcBXETafTkCQBneb/OB1Ba+v5sHwOcQiWDyLwZnl1D 92psyhxPwrAoWoOWtuqvLngetx9jarsH+ZGRyhxxuNnvUX63KvtF6aB1ni0OPYp4JniZ9C XGhqtRLea0GiwxkIy/AQvte6borumcpi0FX3MK5xz1gNNgOhUb5vpbuXaVk6nA0+3+kidz G3wDypL+6kuTlhwQdb6bD76Na06TeUOFPhSly1FtR0K4z/ykUx3Rc3oCVtKF2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767031963; a=rsa-sha256; cv=none; b=i5pqj2dE3MIGB4Bv81r6hBjvYRDOpGzD+sBOia96LTc5UFyBnGZHJA2t5kjrKnlPfjQ0Rr kredrn/1TvhALluHgQqPsrfEqz6ZmrTqPl7ARPhSX82wSpBIb11YlVosRqneMXpcIOWu09 7i3mbmslTDk8HAILqc/Np2uKn0HX7CJgoVvB2Z86hvYb+PZYttibkgNh6AHYFtfFNjGdvC xAGvbNNMXhlNtIRN4taISz/IYUD4AzqHZP22jW2EKHgUFcPjKBA6zifx6iF198VgMR5GPX 7ud1vjCYKggKJQG5yIdcpvh9z8Q9ufKdwujOHpUUIfQb71b+iB8fzb4E0ta9wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg47t6v2bz9Y0 for ; Mon, 29 Dec 2025 18:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3572b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:12:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Salychev Subject: git: 22f8973d1e5a - stable/15 - dpaa2: Setup interface caps 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 22f8973d1e5abb8413ae859fa3b805a35702e490 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:12:42 +0000 Message-Id: <6952c49a.3572b.41be8898@gitrepo.freebsd.org> The branch stable/15 has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=22f8973d1e5abb8413ae859fa3b805a35702e490 commit 22f8973d1e5abb8413ae859fa3b805a35702e490 Author: Dmitry Salychev AuthorDate: 2025-10-28 22:30:05 +0000 Commit: Dmitry Salychev CommitDate: 2025-12-29 18:12:29 +0000 dpaa2: Setup interface caps on attach 39d4094173f9 ("epair: add support for checksum offloading") revealed that HW checksum offloading is not enabled when the dpaa2_ni driver is attached despite being declared and enabled on the dpni interface. I modified dpaa2_ni_setup_if_caps to take into account both IPv4 and IPv6 checksum offloading capabilities and added a call to re-configure interface capabilities on attach to fix it. Reviewed by: bz Fixes: 39d4094173f9 ("epair: add support for checksum offloading") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53436 (cherry picked from commit a731cb93a66271713d6ea197946e4a307e5b0837) --- sys/dev/dpaa2/dpaa2_ni.c | 52 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 698b440376e3..98a6c6047188 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -559,7 +559,8 @@ dpaa2_ni_attach(device_t dev) if_settransmitfn(ifp, dpaa2_ni_transmit); if_setqflushfn(ifp, dpaa2_ni_qflush); - if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_JUMBO_MTU); + if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | + IFCAP_HWCSUM_IPV6 | IFCAP_JUMBO_MTU); if_setcapenable(ifp, if_getcapabilities(ifp)); DPAA2_CMD_INIT(&cmd); @@ -627,6 +628,12 @@ dpaa2_ni_attach(device_t dev) __func__, error); goto close_ni; } + error = dpaa2_ni_setup_if_caps(sc); + if (error) { + device_printf(dev, "%s: failed to setup interface capabilities: " + "error=%d\n", __func__, error); + goto close_ni; + } ether_ifattach(sc->ifp, sc->mac.addr); callout_init(&sc->mii_callout, 0); @@ -1569,8 +1576,7 @@ dpaa2_ni_setup_msi(struct dpaa2_ni_softc *sc) static int dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) { - const bool en_rxcsum = if_getcapenable(sc->ifp) & IFCAP_RXCSUM; - const bool en_txcsum = if_getcapenable(sc->ifp) & IFCAP_TXCSUM; + bool en_rxcsum, en_txcsum; device_t pdev = device_get_parent(sc->dev); device_t dev = sc->dev; device_t child = dev; @@ -1582,6 +1588,17 @@ dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) DPAA2_CMD_INIT(&cmd); + /* + * XXX-DSL: DPAA2 allows to validate L3/L4 checksums on reception and/or + * generate L3/L4 checksums on transmission without + * differentiating between IPv4/v6, i.e. enable for both + * protocols if requested. + */ + en_rxcsum = if_getcapenable(sc->ifp) & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); + en_txcsum = if_getcapenable(sc->ifp) & + (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + error = DPAA2_CMD_RC_OPEN(dev, child, &cmd, rcinfo->id, &rc_token); if (error) { device_printf(dev, "%s: failed to open resource container: " @@ -1627,6 +1644,13 @@ dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) goto close_ni; } + if (bootverbose) { + device_printf(dev, "%s: L3/L4 checksum validation %s\n", + __func__, en_rxcsum ? "enabled" : "disabled"); + device_printf(dev, "%s: L3/L4 checksum generation %s\n", + __func__, en_txcsum ? "enabled" : "disabled"); + } + (void)DPAA2_CMD_NI_CLOSE(dev, child, &cmd); (void)DPAA2_CMD_RC_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, rc_token)); return (0); @@ -2574,13 +2598,27 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) break; case SIOCSIFCAP: changed = if_getcapenable(ifp) ^ ifr->ifr_reqcap; - if (changed & IFCAP_HWCSUM) { - if ((ifr->ifr_reqcap & changed) & IFCAP_HWCSUM) { - if_setcapenablebit(ifp, IFCAP_HWCSUM, 0); + if (changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + if ((ifr->ifr_reqcap & changed) & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + if_setcapenablebit(ifp, + IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6, 0); } else { - if_setcapenablebit(ifp, 0, IFCAP_HWCSUM); + if_setcapenablebit(ifp, 0, + IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); } } + if (changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { + if ((ifr->ifr_reqcap & changed) & + (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { + if_setcapenablebit(ifp, + IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6, 0); + } else { + if_setcapenablebit(ifp, 0, + IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + } + } + rc = dpaa2_ni_setup_if_caps(sc); if (rc) { printf("%s: failed to update iface capabilities: " From nobody Mon Dec 29 18:15:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4CN0h62z6M84B for ; Mon, 29 Dec 2025 18:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4CM4S3Kz3Khb for ; Mon, 29 Dec 2025 18:15:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767032143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VB6PPHWhuR1FzcjhFSAsOwhY6Wf1FEbwCxR2n3u0mb4=; b=qalxryn234jAWS89gNz/T26hDTvcwLA9GJa2egAh1PGj2d7JaLMDroD9IuNKnLxdEk1n1s a5ZQiwGGphoZSxO1n8RQhh7X5yFL1eFdcSx1i97QGYqr365k+b7PyhmAC1N2lyz8NRRmEe ty3pK/PFiJSWCyC1htTuYlQgiK9ngXOic17/22qOwvkBAta/oG3pARSa+Wi0g7M2wmncS/ DZp3LRhwAzZm8q/Temme0lsVFVClRhyHR1DXJ2HS9t1YMVmfXpI1ARZ7kFysNCtoj0tOhr YkjJZ5HHN2H8nEnrC9nFuqDqwQxco1Wlw7iF2ynfCO8ATh46T3wqz+wDCP7tLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767032143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VB6PPHWhuR1FzcjhFSAsOwhY6Wf1FEbwCxR2n3u0mb4=; b=ZqdOvYISfNGRksDMVkNOiKcQX6C0RRuRe+oEUshQv5+FsATBNeo3NqgDh/bInnfJYhoDKl 7FgoPv6PUkxQoafuV7I7OscYF5FjF6GVdlL5H5wJGpVn/yIw16Y9I5gMePWWBuwfG/4Bq9 0jnUc1vj6LXGyuKGtDv2IwobmeRr9m8TBJcgb2vKRaF6TmcSnI181kQDJIZ/4fD61JXf9k m7TwRjpQbRHpm2CZcpQQje2lj7aLrlXhc+1qxrW+zKwJ8upYchi2QsRCp1YScdIKm4Uoxb /lderzUyBKwtfZBHePzfWn8B+GOqygL8dKCBQreoMK9cXKNDbo4hL3ti/7h6uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767032143; a=rsa-sha256; cv=none; b=W+vV5H9qpxMl1vYNt8hPQwELUiJEewvJp4FvuuoXIdnOHtYXggFkZh5WYrpvo4gBSPuBhN /tmI8Z6pYJ/z3fytJoLKghR7jOJTsVJg1QbwYxTHqHp82zqu9CU2zr70IH2jZwxzs9THAV RY6sT0eS2ounNQ7UZ4n21+TAIdYFzAfegVdO0I5E+76vnbbeb1j6eMs5UPitfjtFjM6zPc prbDPs9hydalpzDKVfJUAM7JhiD6YiQH+NWYZ9AZVvEX74VytBX9evFqdXU1Ppy9umq2th o/EBSYEa6Ziyv0LIHOMjUZ1SjKiBhx6yOyYPucvHNiQCIHOzm9A25DH3DxLnEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4CM28pWz9K6 for ; Mon, 29 Dec 2025 18:15:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3336c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:15:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Salychev Subject: git: 23b83bfeb767 - stable/14 - dpaa2: Setup interface caps 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23b83bfeb767eaf04ea15bf65aaa6a47761186b9 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:15:43 +0000 Message-Id: <6952c54f.3336c.33ce34a4@gitrepo.freebsd.org> The branch stable/14 has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=23b83bfeb767eaf04ea15bf65aaa6a47761186b9 commit 23b83bfeb767eaf04ea15bf65aaa6a47761186b9 Author: Dmitry Salychev AuthorDate: 2025-10-28 22:30:05 +0000 Commit: Dmitry Salychev CommitDate: 2025-12-29 18:14:52 +0000 dpaa2: Setup interface caps on attach 39d4094173f9 ("epair: add support for checksum offloading") revealed that HW checksum offloading is not enabled when the dpaa2_ni driver is attached despite being declared and enabled on the dpni interface. I modified dpaa2_ni_setup_if_caps to take into account both IPv4 and IPv6 checksum offloading capabilities and added a call to re-configure interface capabilities on attach to fix it. Reviewed by: bz Fixes: 39d4094173f9 ("epair: add support for checksum offloading") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53436 (cherry picked from commit a731cb93a66271713d6ea197946e4a307e5b0837) --- sys/dev/dpaa2/dpaa2_ni.c | 52 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 698b440376e3..98a6c6047188 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -559,7 +559,8 @@ dpaa2_ni_attach(device_t dev) if_settransmitfn(ifp, dpaa2_ni_transmit); if_setqflushfn(ifp, dpaa2_ni_qflush); - if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_JUMBO_MTU); + if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | + IFCAP_HWCSUM_IPV6 | IFCAP_JUMBO_MTU); if_setcapenable(ifp, if_getcapabilities(ifp)); DPAA2_CMD_INIT(&cmd); @@ -627,6 +628,12 @@ dpaa2_ni_attach(device_t dev) __func__, error); goto close_ni; } + error = dpaa2_ni_setup_if_caps(sc); + if (error) { + device_printf(dev, "%s: failed to setup interface capabilities: " + "error=%d\n", __func__, error); + goto close_ni; + } ether_ifattach(sc->ifp, sc->mac.addr); callout_init(&sc->mii_callout, 0); @@ -1569,8 +1576,7 @@ dpaa2_ni_setup_msi(struct dpaa2_ni_softc *sc) static int dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) { - const bool en_rxcsum = if_getcapenable(sc->ifp) & IFCAP_RXCSUM; - const bool en_txcsum = if_getcapenable(sc->ifp) & IFCAP_TXCSUM; + bool en_rxcsum, en_txcsum; device_t pdev = device_get_parent(sc->dev); device_t dev = sc->dev; device_t child = dev; @@ -1582,6 +1588,17 @@ dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) DPAA2_CMD_INIT(&cmd); + /* + * XXX-DSL: DPAA2 allows to validate L3/L4 checksums on reception and/or + * generate L3/L4 checksums on transmission without + * differentiating between IPv4/v6, i.e. enable for both + * protocols if requested. + */ + en_rxcsum = if_getcapenable(sc->ifp) & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); + en_txcsum = if_getcapenable(sc->ifp) & + (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + error = DPAA2_CMD_RC_OPEN(dev, child, &cmd, rcinfo->id, &rc_token); if (error) { device_printf(dev, "%s: failed to open resource container: " @@ -1627,6 +1644,13 @@ dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) goto close_ni; } + if (bootverbose) { + device_printf(dev, "%s: L3/L4 checksum validation %s\n", + __func__, en_rxcsum ? "enabled" : "disabled"); + device_printf(dev, "%s: L3/L4 checksum generation %s\n", + __func__, en_txcsum ? "enabled" : "disabled"); + } + (void)DPAA2_CMD_NI_CLOSE(dev, child, &cmd); (void)DPAA2_CMD_RC_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, rc_token)); return (0); @@ -2574,13 +2598,27 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) break; case SIOCSIFCAP: changed = if_getcapenable(ifp) ^ ifr->ifr_reqcap; - if (changed & IFCAP_HWCSUM) { - if ((ifr->ifr_reqcap & changed) & IFCAP_HWCSUM) { - if_setcapenablebit(ifp, IFCAP_HWCSUM, 0); + if (changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + if ((ifr->ifr_reqcap & changed) & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + if_setcapenablebit(ifp, + IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6, 0); } else { - if_setcapenablebit(ifp, 0, IFCAP_HWCSUM); + if_setcapenablebit(ifp, 0, + IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); } } + if (changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { + if ((ifr->ifr_reqcap & changed) & + (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { + if_setcapenablebit(ifp, + IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6, 0); + } else { + if_setcapenablebit(ifp, 0, + IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + } + } + rc = dpaa2_ni_setup_if_caps(sc); if (rc) { printf("%s: failed to update iface capabilities: " From nobody Mon Dec 29 18:35:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4fW00w8z6M9Xd for ; Mon, 29 Dec 2025 18:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4fV4Twsz3NrD for ; Mon, 29 Dec 2025 18:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8mGiO8rAO6f4srKvZkV177K96gQXzi8Jddubt78eUw=; b=aJ/mgPWl66FjyUA0AGcX+1nn1hgPoQARmHRp8LIRdwOKgEyGwm7cdojqN0jzzd6s+RH4rK 1lN9PC2O/xQgmugJeNU93d0QDBi2XqJd9HgMIdXpqwtB8X3A60jgm1l8uJxv05AwilrcT3 p9FpKkG8xFMTLCU7/i27SxiQBf6MjTNydjWB37MOsrhsHcujJOLtav95Br3+Wqe80Sk+9T tjpWD0lcPCq1Vdf6ZU/HmHcN+axSohg6BGBT738EmgYJnDh7DCS1Vm6KWmZdJ/X2YuIZmA EU1fb8+TXgvU8sFbUfozaOvCWZu7/PH7Fu0KXtIP8auQQ7t07IT7YeRSXhiINA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8mGiO8rAO6f4srKvZkV177K96gQXzi8Jddubt78eUw=; b=Qjsi+j6ZifWFwvkhNnCOelSWn0GLp/EQeN+HlHZxy8283YiN8XKAW2pAnrnzps1BAQDLKX nVLeKV3dU7K+aKf4hNdi5RHwh3FMGetdVHZBLkR1VsQjb6zuWEjYaYepemZ5P8u0FEFpfp Uz+VtoROcOhv2TaMjWeMy+6xYIoJxV1TwkBdd4/sn80ziLA5I4Ir6dbVwXI5L2p+30M9ol 5cthkanNKNmmlVWDV0jjmFWpaAZ3veHcEdrfjTg+tVbap94z2WYouak1Ncf6jDYK/GOHz0 zA3IepGkLpnzB735bvsQem5kKxni48GNpGrTlIWNAGZc0CpbMbXl2SX8oM3qhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033346; a=rsa-sha256; cv=none; b=wHSJtEzEsJY8ayrASPSazQ9SsH7zjZJc+kZyHQZPdsDW6ToEKb6v76rDjMX0Ii3d1nw9Uk Qf2xd/4ZadAYWK45b58if6KoWecgzmqnrW4rteEdsZj4KHqqMAjuBSJwJHT8QeGtSqzUHU SFp6qPLwL8BvearGxPc82Jc2Ba6ypgoIox9bpB2BHtxBKzwgawyvTCuPGRd+UsGjTR9c+d VofJUy2QfDMUhUGUKjqKmaAHab3b6CFJs0FM8hKGo8L7Tb0IDN0HDZw8NFHgkRtn5yzM1g MZi8gYU179npOzWOWB3gG5oMBHCyViCU8ZVdx6d+P4pR6mdHGlJJCxjiExrVbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4fV3tW4zBH8 for ; Mon, 29 Dec 2025 18:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35ecd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:35:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 919cb70724d1 - stable/15 - bhyve_config.5: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 919cb70724d1ddc40db111e54eee9c42e7409ac4 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:35:46 +0000 Message-Id: <6952ca02.35ecd.78875190@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=919cb70724d1ddc40db111e54eee9c42e7409ac4 commit 919cb70724d1ddc40db111e54eee9c42e7409ac4 Author: Michael Osipov AuthorDate: 2025-12-26 12:12:03 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 18:34:53 +0000 bhyve_config.5: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54370 (cherry picked from commit 66604463e737f4754ae6268171031ceefc226837) --- usr.sbin/bhyve/bhyve_config.5 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 3dd24ca5fe69..b511d5ef6bfd 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 21, 2024 +.Dd December 26, 2025 .Dt BHYVE_CONFIG 5 .Os .Sh NAME @@ -135,10 +135,10 @@ All variables will be persistent even on reboots of the guest. Generate ACPI tables. .It Va acpi_tables_in_memory Ta bool Ta true Ta .Xr bhyve 8 -always exposes ACPI tables by FwCfg. +always exposes ACPI tables by fw_cfg. For backward compatibility bhyve copies them into the guest memory as well. This can cause problems if the guest uses the in-memory version, since certain -advanced features, such as TPM emulation, are exposed only via FwCfg. +advanced features, such as TPM emulation, are exposed only via fw_cfg. Therefore, it is recommended to set this flag to false when running Windows guests. .It Va destroy_on_poweroff Ta bool Ta false Ta Destroy the VM on guest-initiated power-off. @@ -284,7 +284,7 @@ Intel e82545 network interface. VGA framebuffer device attached to VNC server. .It Li lpc LPC PCI-ISA bridge with COM1-COM4 16550 serial ports, -a boot ROM, and, optionally, a TPM module, a fwcfg type, +a boot ROM, and, optionally, a TPM module, a fw_cfg type, and a debug/test device. This device must be configured on bus 0. .It Li hda @@ -494,7 +494,8 @@ or .Dq hd . .It Va nmrr Ta integer Ta 0 Ta Nominal Media Rotation Rate, also known as RPM. -A value 1 of indicates a device with no rate such as a Solid State Disk. +A value 1 of indicates that the device is a solid state drive, i.e, +non-rotational. .It Va ser Ta string Ta generated Ta Serial number of up to twenty characters. A default serial number is generated using a hash of the backing @@ -574,12 +575,12 @@ Settings for the COM3 serial port device. .It Va com4 Ta node Ta Ta Settings for the COM4 serial port device. .It Va fwcfg Ta string Ta bhyve Ta -The fwcfg type to be used. +The fw_cfg type to be used. Supported values are .Dq bhyve for fwctl and .Dq qemu -for fwcfg. +for fw_cfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. .It Va pcireg.* Ta integer Ta Ta @@ -656,7 +657,7 @@ IEEE Extended Unique Identifier. If an EUI is not provided, a default is generated using a checksum of the device's PCI address. .It Va dsm Ta string Ta auto Ta -Whether or not to advertise DataSet Management support. +Whether or not to advertise Dataset Management support. One of .Dq auto , .Dq enable , From nobody Mon Dec 29 18:35:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4fX3fk1z6M92H for ; Mon, 29 Dec 2025 18:35: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4fW5NsRz3Njf for ; Mon, 29 Dec 2025 18:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSVRg6PcbFx3TnpjshGKyp3+L0hG0A2gIroORBn5Whc=; b=e/Ga5h1hLQD+MiqQG2VcJkK+BjEwTqYNiJDmZ7sDfcLGaeNt4t9FHUPy3vxtlxonp18Z6l wPBspRMbx5KB9te8FzM3r0ILIhV3msDCNowXxpLt/sIyKYM7JnMY7IDz78drGbzLzfnvHa Yh02ERliAOZtMhVrK66TiGG0J+Kz0oQo0cKBnaQFiwkw1wLXbwQ2YDKzcLB0oaiT7Ey1PZ tl+H/kAxy/Z0w6Y8gBMP6NvY/MOx+f8yn975ZsDj7fZTTEd9o7l64Kr4JRUpseMs4rV+x+ yidr3uJAQW1z9g2A05T2GBjmv8bi2F1XGiMdj/1zOdzyzAeDV1RvTD7nw0Nqzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSVRg6PcbFx3TnpjshGKyp3+L0hG0A2gIroORBn5Whc=; b=mlzmdD/roKJg5pShYi6F8NbumZ8ylRZ7Zm98fKQld/sFOmdt52Zf4y5V5R4PzmKzYp6kiw 8k8yDbQaUHn+TRRqdM9KVTmAa5xjiYQftW36Ac23u39mA7CT8Mkv8pszOXDwiWY6FF89pW gYD4cf3pB4A5XVkOb5FzcNmO0ea3R0+G/1Luf7cI64JhoBQ12BI43V8+JESedC5bYqXodQ imG+71n5ciAH4PBHJaLW3O5hNwCyzBKiELDnvdxnscjg8ouwiGItZ/6bxLlzuH9448jvJ6 dBQlqatV4//ZrFgqUJBTXxwl6TXeAQHzjZoRlvv8XpljBYSgBnEPc1XR+XY3Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033347; a=rsa-sha256; cv=none; b=aM8oxQWPNwA7bbb0Jspy2+v2Ta73L64z2JJ+Q9Q6HlSZrBJ6WVnnWFrF5Saj771tP+jk9g GzayBpDci1yKqkX6scUd+wfhfpz/M5VDODO0DPjpgeUbpEzj7KBoA1vrK5lOfDkFp67hVS UtCdM5OsRBfoirgW5viJuFKnYtDX0UBVxShore6nAeG0BudN0ZYd2Om+rRtDjUMzduc1kY vnSgd7J4PRu4xsz/HprqBSJU+KfmWxvAi/XeJ3xcNTj/DiGm2nwvsv69rpsaJ7+1ShfXSc CgiYfGCmqGNTlb5+S09hbzLDagBXQErQAKFz5VmkpTmfZNnHLOfJfnFvcQnmKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4fW4gQ8zBG7 for ; Mon, 29 Dec 2025 18:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37550 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:35:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 980c44df42fe - stable/15 - bhyve: Document that MAC address has to be unicast List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 980c44df42fe1fcb29a4ef24af5e4e5c27cc2370 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:35:47 +0000 Message-Id: <6952ca03.37550.52927dda@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=980c44df42fe1fcb29a4ef24af5e4e5c27cc2370 commit 980c44df42fe1fcb29a4ef24af5e4e5c27cc2370 Author: Michael Osipov AuthorDate: 2025-12-26 13:40:37 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 18:35:08 +0000 bhyve: Document that MAC address has to be unicast bhyve accepts any MAC address even foreign as long it is a unicast one. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54372 (cherry picked from commit e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb) --- usr.sbin/bhyve/bhyve.8 | 3 ++- usr.sbin/bhyve/bhyve_config.5 | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 483462e0b98b..1d81280b8f75 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 December 23, 2025 +.Dd December 26, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -542,6 +542,7 @@ If is not specified, the MAC address is derived from a fixed OUI, and the remaining bytes from an MD5 hash of the slot and function numbers and the device name. +If specified, it must be a unicast MAC address. .Pp The MAC address is an ASCII string in .Xr ethers 5 diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index b511d5ef6bfd..4ead94690d91 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -517,8 +517,10 @@ Intel e82545 network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .El .Ss Frame Buffer Settings .Bl -column "password" "[IP:]port" "127.0.0.1:5900" @@ -746,8 +748,10 @@ VirtIO network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .It Va mtu Ta integer Ta 1500 Ta The largest supported MTU advertised to the guest. .El From nobody Mon Dec 29 18:35:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4fY21nJz6M99g for ; Mon, 29 Dec 2025 18:35: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4fX6XwLz3Njs for ; Mon, 29 Dec 2025 18:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jW2gR2y/pjASHMt/TnPcPya0FIaTDaRrQSw7Qfc8GuM=; b=D/0NWIcSnnyUjx3V4mw2COxrm+JBTz6kcW0yP6sF4fDSfb6yihoqyKF6M+DHpiGAtcLFV5 kPLodVYQmWm0VtKMuXuj7K0I7VKV9eemABQPOm1IwEZGFZmC4gKJQnvClZWsXzt59ybF5E a6nC9b82P0tnwQnz9oBLAPtJQlw2vqYGS9UbsDKfADxfhFtPt+UJz66oJ0vAYqeIQ23X/Q ZOh/7cRE4XC4tt9e5HQ2WjI29E7xyAGO+e49s0Igvu2hvXI2jFAr3tofEfZNUsyXf+bPUm UAWeIzHe02mzGgHgIkRLgf1/exgSydKN8okD/IkGAySMEJnoUfYVXmTXostr0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jW2gR2y/pjASHMt/TnPcPya0FIaTDaRrQSw7Qfc8GuM=; b=Cq3Ioe0mZ2oVkFZBrv68wx7r+6BCmCYFPd7uDZnW5YBvBYbtrCokitCRyWFu1Lxni9hK+w /f/2JWnZpNB+x/UVmNq5wLpFmj52Gc2xHsslrkAmudUHeJkYe98fJ5NsjcQIh7ll704VA+ 02GM4KUviR8iBRxQbxa4obrTj+j/GvUa9WkcETbXtz0+ofJ+mxLJAldn/35ZNB6xwui33W rBmFyT/eAHdzVaDw2Sw/zgzNdzxesANB70e5R98IjOSmndz9wKWGuoyMmKbuZ8yc10vHVq VF+TvKRhPZRdRh3IFd+gNgeNrY1QAig9WKPqdBKE4kWo03adya/7+Uj+PtykRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033349; a=rsa-sha256; cv=none; b=EXZXQOuluk+d+mOwi0Q0HmddufGWJWAC511tLj8Pz+EoYx3pWr15GVFCvjAMIXYSWASWG5 SqlveYf5MF2D5+7kD/JKsak449D2NveH1usTlJwEUgyvxpFgOHchtoGhqMAVAtBwzZts4x DGdRFGNoaX9dA/oeHjSZE+ekAKAu/SwO48vCY1U1euo6GaO25BeMWJAeN6Zlv5S1O1d0n9 IxYbhCCUWPfgSc4nv9eaaI1seb0pYHAeq/JuKZ3++cnCQ93rD5UEUrS/D+mj8M2Ifo1WX5 gA39Rxn9BFD/y+bKplAxi1N02vBDExVm3VdOOXSWiAzkQz7X+MWPHg7KG/IMPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4fX5SrgzBH9 for ; Mon, 29 Dec 2025 18:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:35:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: ad6381a6ebf4 - stable/15 - linprocfs.4: Improve docs around pid/self entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad6381a6ebf434a6e84a4b1862f6538a763e1ea3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:35:48 +0000 Message-Id: <6952ca04.35f45.7bf7d298@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=ad6381a6ebf434a6e84a4b1862f6538a763e1ea3 commit ad6381a6ebf434a6e84a4b1862f6538a763e1ea3 Author: Michael Osipov AuthorDate: 2025-12-24 18:12:25 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 18:35:32 +0000 linprocfs.4: Improve docs around pid/self entries Mark as a placeholder and document that self is a symlink to a directory. PR: 283080 Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54358 (cherry picked from commit 0d31189cbce4de142a43b65037beb7bf8c09cf26) --- share/man/man4/linprocfs.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/linprocfs.4 b/share/man/man4/linprocfs.4 index dcd1c642b409..043dedbd723a 100644 --- a/share/man/man4/linprocfs.4 +++ b/share/man/man4/linprocfs.4 @@ -1,7 +1,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd May 29, 2025 +.Dd December 26, 2025 .Dt LINPROCFS 4 .Os .Sh NAME @@ -126,11 +126,11 @@ Information about the swap device if any. Time since the last boot and time spent in idle state. .It Pa /compat/linux/proc/version Version of the emulated linux system. -.It Pa /compat/linux/proc/pid +.It Pa /compat/linux/proc/ Ns Ao Ar pid Ac A directory containing process information for process -.Pa pid . +.Ar pid . .It Pa /compat/linux/proc/self -A directory containing process information for the current process. +A symlink to a directory containing process information for the current process. .El .Sh EXAMPLES To mount a From nobody Mon Dec 29 18:40:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m35KKHz6M9nb for ; Mon, 29 Dec 2025 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4m342WJz3Qcc for ; Mon, 29 Dec 2025 18:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlt8f4HT/Q5rI2XS2O5tJppnsSvsghdq3/EVXb7O0Tc=; b=qo69aRN4AGXZH8SvUOtR/vOyEen/rxXk9aJkvXKWBPThq2lI9+0oeGVfHfN5aCp2nyd0Sf AQMfkLTmELjArJyxUj4f7+DAZallBhtf5QYfD5UsBF4eIQKm3RyozPOQ2kFWT6u//Klyux 5D62KIXAdigFlHBT5dr48lQJZaSMQxnAuprpVzbk7bsTSSdnS+9fBDMm12qRIENsQDDuPl ko97KKWNl4bYGnyHXI/k7Y28mRR1auN9cboFTtVElbb1aqHGnpVTiWdwhqsvSkj5f/bgEC Ph6/726aih273R3sU5uxeV3QSr+Jl1bN+E6kOakZJyoYVeQVisIGET81WnqUrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlt8f4HT/Q5rI2XS2O5tJppnsSvsghdq3/EVXb7O0Tc=; b=CdJ8QevOPFDnouglxVNdf1z0xWUtW/2U70r0bHv1m7sGRm0b5fNo+MLvr5Uy8Ad1q8g2FR lVY/nOJ7Kpx3KOyeUSQFWpZhtDZIeNE8ov0E2EGvNjZgz7vMVBawknXybHv3SuHji+sxq9 yETQsAI+l7dEruidf2mZEJMFPM5Q4+OvXO1jNV7qT3bHDD69ZVKIPGT5fGjnx9zpTgEWDK N5hW7/TJ9cna8DoWiWgojs3d3g5MyCtDkR9MC905w4FQEmUvab1uhZgkhRw7Ij+9KQp/sH vBGmXao54tNOAh7eC5v/IwnLg1XbneQp/kfofthY4FXqfmfzHncZ5lLjFN4ipA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033635; a=rsa-sha256; cv=none; b=D51SpSuYy4Axf2sxWkQkNV2Mwk3fj7Z9Buy1xh4Un3B9XuvAf0U5p/IsOowvzWyula9JiF Fr/biqcI3S39bh7WV6yJ0qtNcpp2K3LfREj65Or6XR2k8HiN7xgWc3dZxoe3GdzEJG4O9V 2eZuQiObv7dZaZh3hArZGwYAPde6wPX23ugFBxJtewtF9/9RLya4IYcgZn0RE77lnof88K SwRiY/iw8vq8tFfwtdhh3Bc5fDcF3yhlxHEGhXLOX5Bin+JGBFKBgvZRuBh5WN+CY75AeY 3Hv1qVGC/xp7IkXxWmI/dvq0Fy4pndvk4s17YiwcaECcghUyQbN/mZdBeBUj/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m33WJhzBKS for ; Mon, 29 Dec 2025 18:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38638 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:40:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: c4bd487da73a - main - genet.4: Only for AArch64 + tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4bd487da73a28887f86750a5dc5832303592c5a Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:40:35 +0000 Message-Id: <6952cb23.38638.11c27510@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c4bd487da73a28887f86750a5dc5832303592c5a commit c4bd487da73a28887f86750a5dc5832303592c5a Author: Alexander Ziaee AuthorDate: 2025-12-29 17:16:37 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 17:20:05 +0000 genet.4: Only for AArch64 + tag spdx MFC after: 3 days --- share/man/man4/genet.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/man/man4/genet.4 b/share/man/man4/genet.4 index 665aaff49507..1de92294ee9d 100644 --- a/share/man/man4/genet.4 +++ b/share/man/man4/genet.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2021 Michael J. Karels .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd December 8, 2021 -.Dt GENET 4 +.Dt GENET 4 aarch64 .Os .Sh NAME .Nm genet From nobody Mon Dec 29 18:40:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m503VPz6M9yQ for ; Mon, 29 Dec 2025 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4m44mxfz3QZP for ; Mon, 29 Dec 2025 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vr5aB+p5NEh4nmhgsVQbKqKFNfxF8ByS4/7GQ97LfOM=; b=huNUbcwu+VyK09E1V8SXIo4yu11cae0M2CkYelRRMepiwxl/MvBQ+eMS379nvMojGnZiLd rfsfJmtomzhWCUSGReLATkxwxtYuztOKXauU8HxNOG0xB+mG2F4qA8byUG0DfxpznQ6hcR gbxuhuElgkvGRT3d/L8fEcuCWIllpr8CuiGhCAZ02DZOqzv8earByZdTq7pBIQH2OHB6ra w6FPmc15G+45JUqRASlsz7LU2fm/tgjFC81kBNqnK4z+yg48FW5Dlrkpe0yJ8gVE2vh3CY NqLXI9ToNm6VDZ1ygq5yfsBGHvE8I1JZ3aYtAfHwBtUFj2FOVu+jJZIptfzP1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vr5aB+p5NEh4nmhgsVQbKqKFNfxF8ByS4/7GQ97LfOM=; b=op7QNCND/TkPzjVfEedds8Bx64b1cvTu884hp3N6Nmr2KNscLdJFMkvw8O7c+NqlqOXI0X Etulpy9K4q4/Yv1oHBwYbpWC1OiYm/VPRAGauw15Z1MHHX2hsoPKHUgpLV74qTNPG0azRF Urj36uQugYDZFfBXIpw3KslgsZ0XTPlYUoed9LeftppGUAzKp3SDXJlF2pKZSpR9T0spNp 6NLOa4dhr3AzIS+SlDnkdO6ZW9pIgJqRWSOKTgyC6OoH1+T7cCJzJrTPPgbSIWuFQlICYL Qs3WEXhwBifjqKGfuMw6gAwHNPtVEqTJbewxEhcbFAPEMHu5YL3TTM/sYrzdqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033636; a=rsa-sha256; cv=none; b=Ery4zJnhCID3m7npzJYhUGCpF76jMKkh1CvFjjPELB50Jym6YEx1e+RyZD75US98zb95/F K3kG8jtyLM+C4t6P7DkTLcR/u9Ppvuhny/dZHqHGeDjlVXUKA2Oh8qkQHUjPtn/kUps6bi hn7gaURpVWUnavhM5HQFGzxHiPbdEi7YN+qhJEqssRad1QkDanJoZu9DkV0wXnUuMSRwNA HMdY5rxzwaEGsEuIsjnfFRNlyCZIAGVMvucegd+t4bVa4qqmsuHiiGzt6+30BOX++DD1pD f60cqxW0luBgK9jlU6PCjFBBMemJrO1FHDeKVN56FYgxfwyC6M1oztIMhG7rGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m43qJ6z9tR for ; Mon, 29 Dec 2025 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: c6bd2aa8353c - main - cpuctl.4: Formatting nits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6bd2aa8353c6c34dbff487132a7f7372752d0ad Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:40:36 +0000 Message-Id: <6952cb24.384bb.23e57d15@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c6bd2aa8353c6c34dbff487132a7f7372752d0ad commit c6bd2aa8353c6c34dbff487132a7f7372752d0ad Author: Alexander Ziaee AuthorDate: 2025-12-29 17:17:09 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 17:20:05 +0000 cpuctl.4: Formatting nits + Align ioctl list + Pad code examples + Tag spdx license identifier MFC after: 3 days --- share/man/man4/cpuctl.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4 index fc42cf14f254..5846fc4129f8 100644 --- a/share/man/man4/cpuctl.4 +++ b/share/man/man4/cpuctl.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2006-2008 Stanislav Sedov .\" All rights reserved. .\" @@ -63,7 +66,7 @@ All of the supported operations are invoked using the .Xr ioctl 2 system call. Currently, the following ioctls are defined: -.Bl -tag -width CPUCTL_CPUID_COUNT +.Bl -tag -width indent .It Dv CPUCTL_RDMSR Fa cpuctl_msr_args_t *args .It Dv CPUCTL_WRMSR Fa cpuctl_msr_args_t *args Read/write CPU machine specific register. @@ -92,6 +95,7 @@ typedef struct { uint32_t data[4]; } cpuctl_cpuid_args_t; .Ed +.Pp It is equivalent to the .Dv CPUCTL_CPUID_COUNT request with @@ -107,6 +111,7 @@ typedef struct { uint32_t data[4]; } cpuctl_cpuid_count_args_t; .Ed +.Pp The .Va level field indicates the CPUID level to retrieve, From nobody Mon Dec 29 18:44:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4rb0zT4z6MBD7 for ; Mon, 29 Dec 2025 18:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4rZ5yYpz3RY2 for ; Mon, 29 Dec 2025 18:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kk8kic7uiDl9EQ18hGZu7AMXDFuoy3x+0m8tQv8U0b8=; b=Ehs9KhlJj922T81GrKPL2ZOom0tVyicTXFspLlzO4CY9EIJ6mDblUdVRcXFGQF+gCeWOaZ Beb0Y6uuhD5JFOIocHtkqPjKK6jDMhb15+b5TFPtoi/EtfMRP0B2PYzQ5vKBdIzqw8PV0P KApI+tWJUf6GsYvVEpNvZht60dsA9QJNvGzJLN/z/IHMDHMDZjFyiC6HZB5gR9JsXX96m6 Jf47gbRYg12kg3nL65NTTz/oF0Ry+jWsX6zPWgar9eu2vNfGZWe6SE/sCzEUYk2R3KAR8b +0nezEfDAydzhrs+Kr9DWgJJncaTrBjXTfOy2ziOCRl3LquQKIhwl/u3YKxsYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kk8kic7uiDl9EQ18hGZu7AMXDFuoy3x+0m8tQv8U0b8=; b=VnKU0tkTmFZBvQd6gIh2Yalq4VUBk6feYW028dB5VogQ21A18E8myOtSK4b6UnHvVCTWW8 V/O4wTsLcqQnMFVGYBR4SIQNRbNUynKURWh0e/8/Y8NC2Gvn0X8Gtis3dbDRFG2d5+o+Jy t3L2xNda5dVEQrFe/ZnCNM6YIhkDap67A4gyqO6gOq+6/JrQd7kCf2j5IaW1n20/2oYE66 pBdZX33a3g3tGVy4K4Xp5K5AM+SPNoACoMXKDdLZQVBBHQlbf85rRjU++P8q+RLHG60Stj CB+zKz7P2hMdh3e68H6KfnaVIk90A+X3VbYaZgzwZAYb4F5cw6LtokFQAJC0DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033870; a=rsa-sha256; cv=none; b=ZgFiLCwaQpAtn710+3z0T7ovlniZFS0nL0s96YNvz8xW1591X6YyEahzo/gSB5xv82DN2L WnDMKX+ZsY4rmvSSJvdbfiGkUQmFq12sHlP1/lhKwlwVIVtCv1qgpKKqTZ/7PhK1qLxgEy Cpbd64jBKjXpjEabK2rIO3B8BAJxm66Jnq961Maz4nrJF4/N/RxcxyttAoDvvRABTmMee/ pFwvOLjLj1ctQenweWPSsYytZJ3IL8yEtEF8dxHLB37cHhUnnF6C8o0ByhmpoGYJnODj46 dyhPbnTwydDBQ3+GM+7uCc37gOd6Uuv8Gq3ISox8uz2mdQul9WbEQa5Iv7Xs9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4rZ5H1VzBZx for ; Mon, 29 Dec 2025 18:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3627e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 108f057e50ca - stable/14 - bhyve: Document that MAC address has to be unicast List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 108f057e50cafdbec62785a2c4a53fde6142b99f Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:44:30 +0000 Message-Id: <6952cc0e.3627e.36646102@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=108f057e50cafdbec62785a2c4a53fde6142b99f commit 108f057e50cafdbec62785a2c4a53fde6142b99f Author: Michael Osipov AuthorDate: 2025-12-26 13:40:37 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 18:41:10 +0000 bhyve: Document that MAC address has to be unicast bhyve accepts any MAC address even foreign as long it is a unicast one. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54372 (cherry picked from commit e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb) --- usr.sbin/bhyve/bhyve.8 | 3 ++- usr.sbin/bhyve/bhyve_config.5 | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 9f2934e27c6d..a6e1f772a81f 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 23, 2025 +.Dd December 26, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -429,6 +429,7 @@ If is not specified, the MAC address is derived from a fixed OUI and the remaining bytes from an MD5 hash of the slot and function numbers and the device name. +If specified, it must be a unicast MAC address. .Pp The MAC address is an ASCII string in .Xr ethers 5 diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index c2c13c845117..bf9920269d38 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -492,8 +492,10 @@ Intel e82545 network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .El .Ss Frame Buffer Settings .Bl -column "password" "[IP:]port" "127.0.0.1:5900" @@ -732,8 +734,10 @@ VirtIO network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .It Va mtu Ta integer Ta 1500 Ta The largest supported MTU advertised to the guest. .El From nobody Mon Dec 29 18:44:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4rZ2qkXz6M9v3 for ; Mon, 29 Dec 2025 18:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4rZ07JWz3RL5 for ; Mon, 29 Dec 2025 18:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SISbKmEgNmGs6xvUJ3TsXmgDfUecmimB7gyUHdSKseo=; b=koNFawxojt7RM7OR78mUkKqqOe9/WY9tb89K4K1tSiC/RfaEyHO2dQpxpMESn5wmIbtBc4 o6wvu3RnMS6JdYr8VVnB8BMYorK6LWvZhuS4VDxROXKIjW0rrU2BxVt6pdAWDKO0xpggCp mu+j0hzmAka22JQF1JeKvK7t/LHE7IKuwCe5W2gqw2k5SMNZF7IrfMAczqkyxRMrWNWqHv 68vfHeUBl3Xum9vS5lBpXDp8qCFYIW8YGm6xOYWm2bA5nQrnHFOsqx82g2m+hMoftFQuOF I6IGepQRS4HmYpEbpaY2PAgVE7eNjLrzZkvLrsgTxnl1icuXnWrThr33XqAZ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SISbKmEgNmGs6xvUJ3TsXmgDfUecmimB7gyUHdSKseo=; b=Ic7TOwUww0C3LEt0pqsLrpIYOcsdE+RKK+9nQDAH42FnYPIhXKrhDd4HHybVI9VYs9K2Ky k5waZO/z5II1WqA03ffXtlAKgxB3guWTpEeznJ5R/u3uP+tJQjVKio+HKWCOcMQ+Uh4spW 0m8JWzECIdaJbe9IWV24Fn9k/E58lWT51zGkvcv2gWJ1RubiYenpCurZPt8h6NAIaiDRbc a9zCBCAUimewYbHtD77ESPE171o5mQnXeTBMX4QbScQg9zvbmTU4fHhv+Bi8WtZpbg/k+Q DqiI8GFrLwqOR5RVshnAcKCI2+A5ICuKyO3F0HpmpSULQEPFp3ZvGPBkzOPkpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033870; a=rsa-sha256; cv=none; b=d9Qhc4yuhJ2wk+o4tHqroM7noV5u+HKUkJurc08pXpSXDkAIuA7DRTBC2cGn3i9t0Kwmp3 CG0IgNTP7Hj5EbtUqkUz42srxTCvRk0c0YDajaxzOQV9z9u8USJE31cs8dGct+nzw/5bHw I0ATXL5nQVWVBUuUfMWyBPaWSRYLw1phywAqLbfgtHHP6McB09o7xSijrjM2BvQYKh9fid wJDXESqAexczzghabbQl4mG322SI5PGIm9RpvIu2IjoIf2B+8UoEGC3lu7hMMtlHd+4YF7 9LUeBJIubcSVNBI4XF7+KQv1Sc1uxSgl60eurU62JJLne/y0DUPG+29R3SH3WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4rY5TgLzBNJ for ; Mon, 29 Dec 2025 18:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 382b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: c847ea5418e2 - stable/14 - bhyve_config.5: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c847ea5418e23d4f103882ad35c710af59061cfa Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:44:29 +0000 Message-Id: <6952cc0d.382b2.1587ffd1@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=c847ea5418e23d4f103882ad35c710af59061cfa commit c847ea5418e23d4f103882ad35c710af59061cfa Author: Michael Osipov AuthorDate: 2025-12-26 12:12:03 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 18:40:31 +0000 bhyve_config.5: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54370 (cherry picked from commit 66604463e737f4754ae6268171031ceefc226837) --- usr.sbin/bhyve/bhyve_config.5 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 38a52b635ec8..c2c13c845117 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 20, 2023 +.Dd December 26, 2025 .Dt BHYVE_CONFIG 5 .Os .Sh NAME @@ -124,10 +124,10 @@ Wire guest memory. Generate ACPI tables. .It Va acpi_tables_in_memory Ta bool Ta true Ta .Xr bhyve 8 -always exposes ACPI tables by FwCfg. +always exposes ACPI tables by fw_cfg. For backward compatibility bhyve copies them into the guest memory as well. This can cause problems if the guest uses the in-memory version, since certain -advanced features, such as TPM emulation, are exposed only via FwCfg. +advanced features, such as TPM emulation, are exposed only via fw_cfg. Therefore, it is recommended to set this flag to false when running Windows guests. .It Va destroy_on_poweroff Ta bool Ta false Ta Destroy the VM on guest-initiated power-off. @@ -265,7 +265,7 @@ Intel e82545 network interface. VGA framebuffer device attached to VNC server. .It Li lpc LPC PCI-ISA bridge with COM1-COM4 16550 serial ports, -a boot ROM, and, optionally, a TPM module, a fwcfg type, +a boot ROM, and, optionally, a TPM module, a fw_cfg type, and a debug/test device. This device must be configured on bus 0. .It Li hda @@ -469,7 +469,8 @@ or .Dq hd . .It Va nmrr Ta integer Ta 0 Ta Nominal Media Rotation Rate, also known as RPM. -A value 1 of indicates a device with no rate such as a Solid State Disk. +A value 1 of indicates that the device is a solid state drive, i.e, +non-rotational. .It Va ser Ta string Ta generated Ta Serial number of up to twenty characters. A default serial number is generated using a hash of the backing @@ -560,12 +561,12 @@ Settings for the COM3 serial port device. .It Va com4 Ta node Ta Ta Settings for the COM4 serial port device. .It Va fwcfg Ta string Ta bhyve Ta -The fwcfg type to be used. +The fw_cfg type to be used. Supported values are .Dq bhyve for fwctl and .Dq qemu -for fwcfg. +for fw_cfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. .It Va pcireg.* Ta integer Ta Ta @@ -642,7 +643,7 @@ IEEE Extended Unique Identifier. If an EUI is not provided, a default is generated using a checksum of the device's PCI address. .It Va dsm Ta string Ta auto Ta -Whether or not to advertise DataSet Management support. +Whether or not to advertise Dataset Management support. One of .Dq auto , .Dq enable , From nobody Mon Dec 29 18:49:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4yJ3ttCz6MBNH for ; Mon, 29 Dec 2025 18:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4yJ15NQz3SQC for ; Mon, 29 Dec 2025 18:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767034168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tPB5/K9sr4dwRE7XcVUbw+ssLBLdCgKtdBY8UHUEzgM=; b=siRVYcgrim57jinBjxpsbv04Fzcetj0h2JDV+tEjXKmD7eMENbISqhM/B8zyPCQNZLlLua KQMcBT8w7mBjYfo0ywzkuq5uQk6Db5NvHZv4Onw2RBqhv/+7fJZMLPne8XJFJSqdq7A8xU yq6cMIxoomqCTJEs+T5voV9BzqqUfmETYQSaI4QBIjdAIcEA2/Rsmvwj1wvAvC6uI1gqVx 4flXR6byLeRSvOdmtSWg7oXS3S8dL2IRXS6B57iPW5j72w1T4zoO6DQEzfFXtCVYMY+30k HnRo89B8CQVR3LrU3mWyXsxLagi5d0OxON32Ca1v9hN5sjwyetTbx8zKKFcXkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767034168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tPB5/K9sr4dwRE7XcVUbw+ssLBLdCgKtdBY8UHUEzgM=; b=CGh9wgtPZ7U8IAezlMZeW6GZEDaSmyf///vLv/TA63mqXhSYz1AUvcYCX3eK8yj9Io5W0X eUEgXFW5NLpdaOYlGD16Ia1sHEjrnKMDjRK4b4IKcE+DJiokyYWsGHhJYIoa235Q1tdpwD bS7N0NWPNerLDJnHEKpUAO84BHQMl3O/zBA/nH1VTPSsawctVIK2Ncbk2lFnz0JCLt/wZy 1fbLnSFC4ktX4vYnBM8LusuktPyQMXG6OMRaRD4xoIyVKcj8IaSwJrdXcPyUj+t3nP2mv8 QjwoSXHJB/RWy5k1fr6aAawFftJlmxvvuGKceiVw2nDfYFLW/+i/dqS8JdFdlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767034168; a=rsa-sha256; cv=none; b=yxRxVolrDlH4KP7NFMf+a7gWpgBZacjX2oRx+f7NFiEqbTFrKp5JPmJFR3+m/2vAhWPdL2 0LR1PDjT3opK5tuxBMZqQhHL9pud0aHYIiRFbugEZbgAVK9cXeuxZe5AR7mnK5IT1HnniX zVcthjpSm+oTQOf+owgi5mu1MKJgifeaL30xsj7tV06N5SC2xvYGB9l02zpYe4MG07IbWA Jhp5upWALGxjXTDFQJZ2v79kWPc500ZcV+2yxs7HX4zcfHiwYq/nZwwX6Zk0qgmFNHoUHD 4SWD2/hkRgFlOzNyYHE9+jK31xJbWp7hjrkmHxEkoBqSV7SxyuJUfGWNTxPxgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4yH5rpXzBcF for ; Mon, 29 Dec 2025 18:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38c94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:49:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 9cfd75a6f88f - stable/15 - bio: Fix KASAN invalid access report in biodone List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9cfd75a6f88f2076d7cd7e18acc9d89f6055e8fe Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:49:27 +0000 Message-Id: <6952cd37.38c94.200e44cd@gitrepo.freebsd.org> The branch stable/15 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=9cfd75a6f88f2076d7cd7e18acc9d89f6055e8fe commit 9cfd75a6f88f2076d7cd7e18acc9d89f6055e8fe Author: Ka Ho Ng AuthorDate: 2025-12-29 15:49:29 +0000 Commit: Ka Ho Ng CommitDate: 2025-12-29 18:47:56 +0000 bio: Fix KASAN invalid access report in biodone Do not touch the bio fields after calling the bio_done callback. The bio might have been freed after the callback returns. Fixes: 725f4b108d54 Reported by: kp, markj --- sys/kern/vfs_bio.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index dc90bd3add22..2368f863a248 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4523,8 +4523,6 @@ biodone(struct bio *bp) bp->bio_flags |= BIO_ERROR_COMPAT; } done(bp); - bp->bio_error_compat = 0; - bp->bio_flags &= ~BIO_ERROR_COMPAT; } } From nobody Mon Dec 29 18:52:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg51H5vSCz6MBpn for ; Mon, 29 Dec 2025 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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg51H30B4z3T95 for ; Mon, 29 Dec 2025 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=1767034323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFLDZ2oYt4LoS/hgNaiwAsEJSkQtMQ2bLqt4liHtKUM=; b=xaMyQ2xvSzsoUs/eXGIqQfptrXGdRbho1JNnUxYNQrKpqgRtS//ESXJIez7A5pyfiHVP2R oBn+YDdNKKj9/FcWrlPKsJGqcMYAcCU3+CO9lucW+jFdAf5Zil5LHqODE6P6hpFFakTRqn aMsL9JmH2GRAL1b1pfsbMR09r/MW7cA+ZBnrwBD++fUWcOxhQ8PsRKgFLpxaa2VLmD40HJ SS/gFwUSNYjU6xqcSu+7/4sB9124jMGXLsah5oUlzY2FxA9sOJJk+qMatjF/X27YxH+Pax 0gjiPTQRFCPV8GzifMB43dtj9wsrRnNRpveHhXNP8phhOiVUSMOxEWio/bdySg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767034323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFLDZ2oYt4LoS/hgNaiwAsEJSkQtMQ2bLqt4liHtKUM=; b=x7VYJeksTjxrVIs6Mi2JAkZTlftfHEJVzYdIuWYp+gMYgqpWx6zo9IhqxolvTUxnMGm8fl FRpk12ceWKg11l1IbZgEZpxHbtK4GaUjbkB3nKp+PbENODlKuzHdYxJdU0NXT3gReiC0Fq 9qb9zWLRz+B4qW0n6Wl3+F+2RizjWjJqZ0AFYQ0Nzp0puBqGXgXS5wfdhUFokDU9J6OcdP cMY2viQId3QSm7HzcWmRCCyMB3cKg0IJWzmZTwBAMVmHu0gYyeQICXNJiaRrZVL++m3H0J EHWtbiJGNCUhYOYSxN8p6X5+MJrbrYcH7xSPZqPKiNvtXWfbvSB/PtMFA7/HNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767034323; a=rsa-sha256; cv=none; b=k2+9b2kEQrN9IhiWmwjuDuRJeEr7gmc98c7E1+tVtajwq/ztPKLBC54J2YXMlhwm/QUzIO bRSe5F3A2M0zku9e0Ut7P5nm26Ls/2bJyo42APB9MWq/n9vqzpimxBLzT6RCpN1mpkjRs1 7DSoSfG2BeKYXckzfxDGhAubFFvlrnAEnX1JfBow0BHaYCa4SiWzdsQ06QvQvPYMq9ww9p NEaBSHQ33M6SbdRuF0K6G8wjZZ3E9qVRylA3iLW/RTWPlYx5ElW319GxYABwMhbtedObUy yo2E7uqNWG2gjJL8gER9pv0Rr3nQ5Nn5XpP3AwePaw+XrP5af6snqGzJSXkQ1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg51H2bQlzBM1 for ; Mon, 29 Dec 2025 18:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38272 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:52:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: b4f84b19b482 - stable/13 - bhyve: Document that MAC address has to be unicast List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4f84b19b4826e8af2b20af95c5f2b63a826f40d Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:52:03 +0000 Message-Id: <6952cdd3.38272.1b86a1b1@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=b4f84b19b4826e8af2b20af95c5f2b63a826f40d commit b4f84b19b4826e8af2b20af95c5f2b63a826f40d Author: Michael Osipov AuthorDate: 2025-12-26 13:40:37 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 18:51:50 +0000 bhyve: Document that MAC address has to be unicast bhyve accepts any MAC address even foreign as long it is a unicast one. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54372 (cherry picked from commit e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb) --- usr.sbin/bhyve/bhyve.8 | 3 ++- usr.sbin/bhyve/bhyve_config.5 | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index f3cec8e121a5..aba7b1767e48 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 23, 2025 +.Dd December 26, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -423,6 +423,7 @@ If is not specified, the MAC address is derived from a fixed OUI and the remaining bytes from an MD5 hash of the slot and function numbers and the device name. +If specified, it must be a unicast MAC address. .Pp The MAC address is an ASCII string in .Xr ethers 5 diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 26387da0d59e..5b77caa75726 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -465,8 +465,10 @@ Intel e82545 network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .El .Ss Frame Buffer Settings .Bl -column "password" "[IP:]port" "127.0.0.1:5900" @@ -674,8 +676,10 @@ VirtIO network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .It Va mtu Ta integer Ta 1500 Ta The largest supported MTU advertised to the guest. .El From nobody Mon Dec 29 19:19:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg5cf2r81z6MCyq for ; Mon, 29 Dec 2025 19:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg5cY24Bsz3W9y for ; Mon, 29 Dec 2025 19:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767035949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60bOg62U90+jPByCOYOruGfCjHcvtjb2GeR5OMo6i54=; b=Covrkb39MnB9cl0PK1yYDBFh5JfCWO879tbNV2L8LUjpcsfzpIvkI4S5PWzVuoben4I+LU JqxEWSCaDGstKPfGe0Ba84vB2ruvPa+USt13Bojp/9nV6wNGJtNvwyVodfsDR05TPALAvq aIA8lpmmNl+zT1Z4za3D7W0Lp27/Uifk4C3v2fwRClLGWbFwxdJzYwsnVAUyCHm0DQVagV OQxxsIEWjbShBIjLKgVg+4D/CHuhnkjNjggAH7/3TZekCeyT1XwyV8FjlIfPSu0CZT4933 tpy7U1TcPYivaPPDTdB87oExZvA+6k1e5bJ0TfiJi30E8W2oNYVsBGVuKROFVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767035949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60bOg62U90+jPByCOYOruGfCjHcvtjb2GeR5OMo6i54=; b=xvTersSBeROFndHNgulti5sBrE/ardthsSxjMvMpWa7xy9bsiW0jhn1QAnUPK5lIN21JwQ 5YbDvZdUQGcfp9tpf/hcllyXONR6hZ3x/tVJemd4/afcvP7z5RmRGxmn6VzUWXaRmlNknV yv21xSflXro4ZL6/n991OTGhGV9351MINnIvfmWJOWx+n403OquIddgvmlNdUIhy6vDVs8 hrx858IvANcO23dFZfZVwigGKykNv1LFloiUMvnNFNAth5wEXevmcNnx8BBG/H7BWWqZiv f8RumiRkSoO6dvY3rzxi6oDOKCKPXwNYIcmOeT8oIFrU+HK7juqw3bNOcevF0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767035949; a=rsa-sha256; cv=none; b=FAyMXmAVBmsA2gZZpFf0E2S7K9BC7Hp1Mkjg0b/wR8Vo18Uh2P55oXB4sQooSMSCWFOIxB 0aBMWwyHE5Nx9yC9HcCFxrhRGAO02U1nxzC7pdFJeGK6Y+2nryVlQwPtTzJMjXOqGGU7FZ v3DSMqm5Xh1/kkMO7mV3sPjM8eo8HFr3E2JzZfiuhqwvqFXDniNsY1fhJSMvi4/JTWn9uE cgMl9pYL69zBp+4recaCMujB91car8kIXyPFvUEp7TWgwYDMQ/ejf8NPPLUBorguBRnrMv kokEzyOPlqtxjE83mkk+Wti4BztxP3FJy6lMIUm3eia/cgqPMjlW1IM06gUv/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg5cY14PxzC58 for ; Mon, 29 Dec 2025 19:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b009 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 19:19:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 0487408a76c6 - stable/13 - bhyve_config.5: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0487408a76c66b8bf7edddf1ec8025f60c6d0474 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 19:19:09 +0000 Message-Id: <6952d42d.3b009.50ceed7e@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=0487408a76c66b8bf7edddf1ec8025f60c6d0474 commit 0487408a76c66b8bf7edddf1ec8025f60c6d0474 Author: Michael Osipov AuthorDate: 2025-12-26 12:12:03 +0000 Commit: Michael Osipov CommitDate: 2025-12-29 19:18:00 +0000 bhyve_config.5: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54370 (cherry picked from commit 66604463e737f4754ae6268171031ceefc226837) --- usr.sbin/bhyve/bhyve_config.5 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 5b77caa75726..c0e235e02276 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 8, 2022 +.Dd December 26, 2025 .Dt BHYVE_CONFIG 5 .Os .Sh NAME @@ -259,7 +259,7 @@ VGA framebuffer device attached to VNC server. .It Li lpc LPC PCI-ISA bridge with COM1-COM4 16550 serial ports, a boot ROM, -an optional fwcfg type, +an optional fw_cfg type, and an optional debug/test device. This device must be configured on bus 0. .It Li hda @@ -443,7 +443,8 @@ or .Dq hd . .It Va nmrr Ta integer Ta 0 Ta Nominal Media Rotation Rate, also known as RPM. -A value 1 of indicates a device with no rate such as a Solid State Disk. +A value 1 of indicates that the device is a solid state drive, i.e, +non-rotational. .It Va ser Ta string Ta generated Ta Serial number of up to twenty characters. A default serial number is generated using a hash of the backing @@ -536,12 +537,12 @@ Settings for the COM3 serial port device. .It Va com4 Ta node Ta Ta Settings for the COM4 serial port device. .It Va fwcfg Ta string Ta bhyve Ta -The fwcfg type to be used. +The fw_cfg type to be used. Supported values are .Dq bhyve for fwctl and .Dq qemu -for fwcfg. +for fw_cfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. .It Va pcireg.* Ta integer Ta Ta @@ -587,7 +588,7 @@ IEEE Extended Unique Identifier. If an EUI is not provided, a default is generated using a checksum of the device's PCI address. .It Va dsm Ta string Ta auto Ta -Whether or not to advertise DataSet Management support. +Whether or not to advertise Dataset Management support. One of .Dq auto , .Dq enable , From nobody Mon Dec 29 19:27:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg5pg4jhtz6MDv2 for ; Mon, 29 Dec 2025 19:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg5pg0RLBz3Y3R for ; Mon, 29 Dec 2025 19:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767036475; 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=2BEdJltC6ahLh9yMLLdrzisPRrW8kXrfJ89MaH5p/NA=; b=u3w+5TpfeR8Kbw55og9DN+Fx29B8WaiG3i/yJeeYsPQa/XXWndTrqxZ0VcoUfJdfVIrAXE rrMuNbpObOM1Ix/gwjX/3MRtUfumjlikZb4/i96fTDmnFGkYoiKGuwZFGDf4mMV082Q8c9 LE0MtH+7bx/YhlsjRBvrsA/qtC6ziWnFfDY1UNTyg6PAwKuBf63X8J0hO779N7ljcUloXp AMFsMXAsounxsCn90GlV5REBLNUw0PaVP/UaHIe4ogyAwgdpSL0aL0/xpJBbgvxBe/apCp 0CKUQMBbMYMi6D1rlhJ5cegLkdA1KLC55Yk5JI+3KW42vJNeebhoXHIgcRM71g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767036475; 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=2BEdJltC6ahLh9yMLLdrzisPRrW8kXrfJ89MaH5p/NA=; b=eS139GzwJZCUXg/QMassRK4tkci5I81CbFFZ0GkaYYBmoqGxMn8J3rIphe+madxXX1ChfH 1tdFjalCNds05Mn1y/RSX8cxtj6vuaF4tXfYuvdAICHVsVogkrseNJgDR9q260KIaSMsUe pcVFby+PJxVU5sOnAqtmh6gbqcdZABTUOXP1EuetiQbkmRLmVgz0GtWtouTpTLI8N8bBwP uSLQorDer4V0QvVs78dsrsWMZneVZX0/uodZzq4S+VraIB6i6kGBGWXSXvittRHXNkU/lA xjNZ1iZ0TJKFKmjsozZEyWMDi1ayCc9ReSMXOAyUVQ4o0OCVLsjlBe6qVUwf+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767036475; a=rsa-sha256; cv=none; b=SCyYAJagy2sehzjwDKvPUD78dOHLkO4Jw1YfI1GKe50P4kwp74BqduqsACNhWxABXT0qt0 dO0uavflxKrS+Z22IjWXuEyFaqpJRzOWXB7M/r+tHNQ6kBQIM9urY1a1lvfFhKuZJ29Iy0 zXyVqtXu6bZubpyjKDq+3N6p7QQb9YqmiAwN2mYb8fkTziFrTDQdvss+OLQuuxLvJ1cggR 6sumXT3YYQAZi39Byaz7RnxvEZUl6PnbU1KuwqFuDm7jCmbMuw6mVxXVPySFKFqWE8mqJ4 DuM/+GEGDCGE88mWVkulhYBlooQ9qz1iCerQpOH8nuap1+/M+iz2HHjCVVK/pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg5pg02xSzCbr for ; Mon, 29 Dec 2025 19:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 19:27:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: e2afbc45258f - main - ioctl.2: Mention EACCES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2afbc45258f2fa4bdcf126e959ac660e76fc802 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 19:27:49 +0000 Message-Id: <6952d635.3bd91.2abc42bf@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e2afbc45258f2fa4bdcf126e959ac660e76fc802 commit e2afbc45258f2fa4bdcf126e959ac660e76fc802 Author: Felix Johnson AuthorDate: 2025-12-29 19:21:26 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 19:25:23 +0000 ioctl.2: Mention EACCES ioctls can fail with EACCES, see sys/kern/tty.c PR: 239504 MFC after: 3 days Reviewed by: ziaee Reported by: Brennan Vincent Differential Revision: https://reviews.freebsd.org/D49072 --- lib/libsys/ioctl.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libsys/ioctl.2 b/lib/libsys/ioctl.2 index e96c5c48d097..5784f43ef98b 100644 --- a/lib/libsys/ioctl.2 +++ b/lib/libsys/ioctl.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 11, 2013 +.Dd December 29, 2025 .Dt IOCTL 2 .Os .Sh NAME @@ -110,6 +110,9 @@ The system call will fail if: .Bl -tag -width Er +.It Bq Er EACCES +The process does not have permission to call this +.Nm . .It Bq Er EBADF The .Fa fd From nobody Mon Dec 29 20:18:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg6wn5v61z6MJ23 for ; Mon, 29 Dec 2025 20:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg6wm4z7nz3fQq for ; Mon, 29 Dec 2025 20:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767039497; 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=52PqiSiJeGLrNkRqkEmY2kq+XbcECoYz4nmmLj1mgmg=; b=JrhOouXKJWHnTNFLLs2cDx3oXA8mAuib4HGDAFTss7bsfnC38bLtL+qI4pfC9tBuy71PZs 7w8rrNuW2YTfxD6GoYzrDcYznq8KtvlLcPHvlQ6BKx+33jsPjeHFJkuWgwLZ0h+CMEedTh ezd4L5Q+3Mts5JWCa21LVY3oeQuB5NGxLznGnObJFpF3x7/3Hr/6zmMzQ7PyQJpgJ9GFD6 LqpwFQA+94Wj5D/mVJ2A3rb79FxO2bk99eP/1n4CptjaF/4YzsU0lZ2Ak6UznMrzn7YsUQ 9BBX2G37WOaq+UIK7hqlhsVJHt8PMqsA/LvqUGWKVzNs7qRkFayN6ljTws1JtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767039497; 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=52PqiSiJeGLrNkRqkEmY2kq+XbcECoYz4nmmLj1mgmg=; b=tjIiTT/s+TLNhSXcRciYEel6Hl0XvTPGSWs/hicL599i++LnJn6H4CrVp//xZivqedihiV V9bQnHN+3RgnTJ/hcDWzD1dIjOHnfUN5gZhSL1BGpvoysy7PX0QJyJEYmMWDSt2Q/PywwB qLeOOr4WAbfYnIcJyKDZr8uewOBx95zoSIkzGC8qf6N05Q2OYoOHesU19ehfgyk3MgGlN+ 3wjEXyzhUcAAptPZbSPJ8qx7XpqqRvwGwXkCWVWjsPZGhVBblXiO12GWhfa33Bb8zTRsYG BLUvH7GKkS3OLlpdGWUc+J9kDbARZJthw14Y/pFn8uFG5Zn5jiQeZWqANgiDog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767039497; a=rsa-sha256; cv=none; b=QD1cYzG/LLd2QZf1hLUeSPbq+X+QAtb7HhgEBcj6yIGCeT0/hu4/InXyRgunuAW2eVaPGk fXLH9nqC/ZSkEo0WWmX7POoyEw+xx++Fux/OuYAY0++ksgAjcE2V/+4viYj02xahun5QUO Mj6vuANAmmRvi3lwf+o7vEizisVw4s3jsMvS9sKieIUL1to/Yf+NFo8pAbjSLtN/Xq2clc 8mgJw9pyIEmn8XExn4VvE65D8IXkht/5lgzHkObjHulKff6UbelShK3sGlApv41YAw02VG QuYVqByIF6KcnqXibGvBioNjKFKfmGpoEF0tXHy6gZPsb/1+gzlkMbhY3VD04w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg6wm4LGnzTmL for ; Mon, 29 Dec 2025 20:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40aa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 20:18:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Yan-Hao Wang From: Alexander Ziaee Subject: git: bbaa7d628175 - main - kyua manuals: Correct --results-file short form List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbaa7d628175ee484e31a054fb3cf7b7866cad13 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 20:18:16 +0000 Message-Id: <6952e208.40aa2.54e5d9b3@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bbaa7d628175ee484e31a054fb3cf7b7866cad13 commit bbaa7d628175ee484e31a054fb3cf7b7866cad13 Author: Yan-Hao Wang AuthorDate: 2025-12-29 20:13:16 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 20:16:04 +0000 kyua manuals: Correct --results-file short form PR: 290647 Ref: kyua/cli/common.cpp#104 MFC after: 3 days Reviewed by: ziaee Closes: https://github.com/freebsd/kyua/issues/267 --- contrib/kyua/doc/kyua-db-exec.1.in | 2 +- contrib/kyua/doc/kyua-db-migrate.1.in | 2 +- contrib/kyua/doc/kyua-report-html.1.in | 2 +- contrib/kyua/doc/kyua-report-junit.1.in | 2 +- contrib/kyua/doc/kyua-report.1.in | 2 +- contrib/kyua/doc/kyua-test.1.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/kyua/doc/kyua-db-exec.1.in b/contrib/kyua/doc/kyua-db-exec.1.in index 04f34c7b54e7..2e3bada4f849 100644 --- a/contrib/kyua/doc/kyua-db-exec.1.in +++ b/contrib/kyua/doc/kyua-db-exec.1.in @@ -62,7 +62,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -no-headers Avoids printing the headers of the table in the output of the command. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-db-migrate.1.in b/contrib/kyua/doc/kyua-db-migrate.1.in index 67e46de46fec..4a1852aafd36 100644 --- a/contrib/kyua/doc/kyua-db-migrate.1.in +++ b/contrib/kyua/doc/kyua-db-migrate.1.in @@ -47,7 +47,7 @@ database lives. .Pp The following subcommand options are recognized: .Bl -tag -width XX -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-report-html.1.in b/contrib/kyua/doc/kyua-report-html.1.in index 1f9f55b69a3f..3ff044ca8d30 100644 --- a/contrib/kyua/doc/kyua-report-html.1.in +++ b/contrib/kyua/doc/kyua-report-html.1.in @@ -64,7 +64,7 @@ The directory must not exist unless the option is provided. The default is .Pa ./html . -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-report-junit.1.in b/contrib/kyua/doc/kyua-report-junit.1.in index f1ad3a2e7f29..508ea30a3f6e 100644 --- a/contrib/kyua/doc/kyua-report-junit.1.in +++ b/contrib/kyua/doc/kyua-report-junit.1.in @@ -50,7 +50,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -output Ar directory Specifies the file into which to store the JUnit report. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Caveats diff --git a/contrib/kyua/doc/kyua-report.1.in b/contrib/kyua/doc/kyua-report.1.in index 8e2485f9c4ac..a3e4d75456cf 100644 --- a/contrib/kyua/doc/kyua-report.1.in +++ b/contrib/kyua/doc/kyua-report.1.in @@ -70,7 +70,7 @@ and .Pa /dev/stderr can be used to specify the standard output and the standard error, respectively. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-test.1.in b/contrib/kyua/doc/kyua-test.1.in index 8cd5f34ae6af..07db6cf461c2 100644 --- a/contrib/kyua/doc/kyua-test.1.in +++ b/contrib/kyua/doc/kyua-test.1.in @@ -69,7 +69,7 @@ Specifies the Kyuafile to process. Defaults to a .Pa Kyuafile file in the current directory. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-write.mdoc .El .Pp From nobody Mon Dec 29 20:58:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg7qG6X1pz6MLZF; Mon, 29 Dec 2025 20:58:34 +0000 (UTC) (envelope-from markj@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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg7qG2tsLz3nVN; Mon, 29 Dec 2025 20:58:34 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767041914; 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=sIFiGcbyyNO0Nsv63hp+ky9RFIsZJqVe+P0vdJJ5Bhc=; b=up8aV/mwnXyEba8T84d3+0A80Lh6c+KVna5jHrO5Va83nEpuAGfrY+AfaYUTkj9T91VxN0 /HnIqMIXoeLl0P2QMKY7txGP8FGbXB5zxA5KCQ25MqHu8y+AzjSoM1wN5+lvErDX68aIdW u8U56bPEe7gaj2SsPtpR3qptrI5ISqSlJnq6sfKDz4cGmRS9IpUxlfivjX0AokN3Hktt/t oFGS/I1TOsbjB70bS1s3GB8laTClyPciW5y0HhG3MFsOU2Ef1Dsy1sc9mDOQHJ/gk/y8uh HLPjbP66tN57Y8YChevJRFaYyD0HtNGWJrDygR1Dot6lwcKvU51cuqcq5/SCSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767041914; 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=sIFiGcbyyNO0Nsv63hp+ky9RFIsZJqVe+P0vdJJ5Bhc=; b=SV8yZm+oKP/5iL6jI4KdihMYnnSxTg9VQNYGKZbgBhojV4ktZBAuFfvTDtHglNxCX8Xyye Otjf7iKxJsrIz+nn6JD2drdMQpci90iT0kZElGAsYHj1DzyfAhczInakh5V0ZFwFeXbQX6 zYgc9hCOQxUHDyvGaMlo2ZEToh+HQl5BzsmMi4Vz5MZvK2wbahqQOthZeJ/DGIqHq0sNt4 U0JkLa5bIbvAGuW7rsA7FM6vxgUf7dGpNPabYuINENUyqtmQRmMZJJ7E9WaXktGlpwOghX oeufjnvp2B21zvB4prUV+xAyjEhXbFNZ3K6q194DxTfiR+BNmCf9V5dHUvkNKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767041914; a=rsa-sha256; cv=none; b=o1Ao74fajaGET/KcDrdQjPuvKG7kBHdTcWzTY4CIj7IzbuXdM4I9AXREpgrDzFQy7JgOX6 3Za3x6LbpA/rJiJ5e9+zBSzw/8wgmKtsLTOMJRfDvpVjo+R2RbFtfLIhG7okCc23glPbXz gvulf58UllY5L67mVt0TFH7/9Lr7ExkiiRnx2UP5UNE1u3XNdoBk32Gh/Lr7vStGB8EfgH tQ5y5bJuAQJqFPv2tpSQQFt+efJcPxNA9ARn7UxHrI8PCgZJPxVHgslt2vB9IB43fW1gte AOAl6rv2ziFPhJ9EqdKlfua2gI2jBwjYEzlyiNSu+S4C5dguORYApbdH3tdQFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4dg7qG0qY0zmq9; Mon, 29 Dec 2025 20:58:34 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Mon, 29 Dec 2025 15:58:32 -0500 From: Mark Johnston To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it Message-ID: References: <69527170.31d92.5af51114@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 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69527170.31d92.5af51114@gitrepo.freebsd.org> On Mon, Dec 29, 2025 at 12:17:52PM +0000, Dimitry Andric wrote: > The branch stable/14 has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ade7285253fc5dfe0adfc51f7bd342b9293f253 > > commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 > Author: Dimitry Andric > AuthorDate: 2025-12-26 15:26:13 +0000 > Commit: Dimitry Andric > CommitDate: 2025-12-29 12:16:00 +0000 > > tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it > > This is needed to let the legacy stage compile against newer versions of > sys/font.h, which transitively includes sys/cdefs.h, and requires the > new __nonstring macro from it. > > Fixes: e2c93ed09f25 > MFC after: 3 days > > (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) Hi Dimitry, After this commit, I can't build stable/14 on main (commit 88b04633c29e to be exact) anymore. Here's the output from a buildworld, it fails pretty much immediately: https://reviews.freebsd.org/P683 The same seems to be true on stable/13, but not on stable/15. From nobody Mon Dec 29 21:03:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg7wV3hwmz6MLm5 for ; Mon, 29 Dec 2025 21:03: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg7wV1jF8z3pSq for ; Mon, 29 Dec 2025 21:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767042186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oIQJD5G3xtDtTpif3Ll2XYBRc0SzYNnfog4xEKSnY38=; b=aa+ywcXGCaaZsLedyZWrafS8r9l1uv952ZOqohQ8LBgWChFDfjTjOg3yRnEQ3znNwyUnbS mc7xcKfMT/luF2RlxSmcvTUCdDilz23LEJmcPpgbZyxS5LxxYKvkgVC35c2hsrHg2aBahf uLvl6zQlldZvAoWtmPcswuefmBD3sThzYq+hBk2j0WZLFE8KzX6x6vDcU3z4K5KubmJGSp 7tQCJ5Id2WQxRGWThaHVRLnMLHU61C3IGHBWJiqa+S9ywNdrfPW4ucjeQ+cWu1TTwlF4C+ SVa2Zaxv6tBQFVtw7cbWyoKcvNv4owYXEB1y9EAqF4dz19DZnh3Eb9YLdUoO2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767042186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oIQJD5G3xtDtTpif3Ll2XYBRc0SzYNnfog4xEKSnY38=; b=anAxaFnk6hRA2Gv0dk7eGrE8boM4O7fx0PWAcbIC7wYtpRAaN7lwZWX/139fOi2JSmbbOp 9S3IRKoaGORZt3L6MUWWRU5/dwylN8N+bvopOWK09R8OafHxZHA8l3PgWbGNHh7ZxXRjpG d4J1tKgcxWRqPq7n2lF1lGu8d+Wi/NWIKdmo8JLQin2YsKFaApJ1Tm0TNo46IueUinAMv5 3CW2wi49r3S2xlZkWpP3V+RAsLHh62qQTwAnaaimT/1qdk/GmGGOewv4pTZA93MYU86T4h G+UWOcJnVuStPtRVYjPTdBKRC2+Deb/0al/NZaKCUGVsCATtUwwgqObNFspWjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767042186; a=rsa-sha256; cv=none; b=nIEGKCkc5sZubEXo3p4AOuhnNJJyQvXmOjDSoaZ97qf/QefBg+vvN2wZFxIgvFC6bg0dhf LOjgr/USg2etIqiDsNsrgog3yC2TJw9BIMekF7DVgXphBdj2hor8waPs7+31MIldgLT7PL /BwUWmuVB2H9CVvdNJOeQp8NO9cf315eS5KJualsIZVfvjLo5frcqSlEKDpFIVQ7TRA9Sr Epdr7qzB1uCbjX5yAEt5Lh786cOULTgNqMNpgOj9zShJWufDGzmWtJZq+aVvpiG5qj7eID wxcDBhlQBjhJTepvcv7W7WBvUeJfAWCL+3BMRTIV4SPLp0QjLPA6BfHZBpalzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg7wV163QzX74 for ; Mon, 29 Dec 2025 21:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45f48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 21:03:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 660416fd1943 - main - Move MK_REPRODUCIBLE_PATHS to bsd.opts.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 660416fd1943bf9e69895f910902e305e195b860 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 21:03:06 +0000 Message-Id: <6952ec8a.45f48.41f9bbe7@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=660416fd1943bf9e69895f910902e305e195b860 commit 660416fd1943bf9e69895f910902e305e195b860 Author: Dimitry Andric AuthorDate: 2025-12-29 15:13:10 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:02:59 +0000 Move MK_REPRODUCIBLE_PATHS to bsd.opts.mk In commit faeaa25f5624 MK_REPRODUCIBLE_PATHS was introduced, but some ports that include bsd.debug.mk then started to fail with: make: /usr/share/mk/bsd.debug.mk:19: Variable "MK_REPRODUCIBLE_PATHS" is undefined in /usr/share/mk/bsd.lib.mk:525 in /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3/Makefile:16 make: Fatal errors encountered -- cannot continue This is because bsd.debug.mk includes bsd.opts.mk, not src.opts.mk. Move the MK_REPRODUCIBLE_PATHS option to bsd.opts.mk to fix this. Reviewed by: imp, emaste Fixes: faeaa25f5624 --- share/mk/bsd.opts.mk | 1 + share/mk/src.opts.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 66eb427c3505..4902e6a6bf4c 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -79,6 +79,7 @@ __DEFAULT_NO_OPTIONS = \ INSTALL_AS_USER \ MANSPLITPKG \ REPRODUCIBLE_BUILD \ + REPRODUCIBLE_PATHS \ RETPOLINE \ RUN_TESTS \ STALE_STAGED \ diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0805c88976da..0d806702417f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -217,7 +217,6 @@ __DEFAULT_NO_OPTIONS = \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ - REPRODUCIBLE_PATHS \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ From nobody Mon Dec 29 21:21:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg8Kq6pN1z6MMWC; Mon, 29 Dec 2025 21:21:35 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg8Kq5zrPz3rdW; Mon, 29 Dec 2025 21:21:35 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767043295; 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=EEWMJl75m8269Xs371tNmH8aHhLOdm8PexcpV1b+xy8=; b=xISDyhn4vQlV3c1/2xOpQINXx4z+D6P/rv6rzEXJkjF8VuWqwMCLNgVMdrxryGJxmKaoAZ R/Dhj1WyYVLmd9Xenuo1tt6SZ3WJDrI9eD2GjW/Jy549uH6l7Wzd7Qqi/yC+5KhAZJY93D 7DcKN3r0BLuCWUHGRw6itp+0jwQ42sOrbPkdCVWjOB45zKzn4M9w7AyxrJGXDVnTlCiIiu rfTTQwywqhiY0nJhFxNNDkSWwZmhCuzvh3cEtHxMRX4u6iWCna9aOo8gVS+yK6LFcbwGnJ 3Z7sbDpjLC7LTOXZre/QFF/OVrmGX+CPjuAUCEUffnQxBCWzKJXMnWR2IyeOsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767043295; 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=EEWMJl75m8269Xs371tNmH8aHhLOdm8PexcpV1b+xy8=; b=m7pD032Qfa+RYyGxlGym0aDlRlkSTv81CaJblobdU2omM4xBFh6U/wpwJMa2ijbocikCuY qv3o5PAGQ+IwUoPlQ1iJa2rzFlA4AiypsiFxjjE9sL5IzvGuQZfw+QPQZ3RTQyT48xscVg AqV5Ee8sghBVVCwauuffCpLYq4Rk/TaJt9n9xVIL3IOpliZuuTnIJnhzrYR3DI0xIQSJMH rUJ3ACP7UtrYeKaVFg/TBZA4tHUfBV2zewN5GE5TXwCveRNhErPwWyciMpvagTH4EJ1JiA sAG3r9cIlOKr2kb+zYsiC8imOiFoiJd4oCtiJFj5riMvy6yupygB1Iblaxio8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767043295; a=rsa-sha256; cv=none; b=wM/ZADUGa0+PtBD6SlqIPW2Vu4J8JWdxe33xI58Ra79hYKxxz33z6aeIB44eSzo9I9bJOx LXqt25mY1Yp9F79LkyNk5LtAWlhMruXhPYzQjv1yk3FCxjtikaQltrKgWeD3m596bPk2Mo twSJ6vuRPIUOOUPQW1vBo5pPR8OXEF/c3lj2ENKEB5eHit5G9Nd3xhXR7hE5aPQw38kdFj wrq2p6bUC0XVdZWKapeoVEH/xAJSJxj+95QJ3UwtvtHSXeeloKi1h10sXZpT52CyOncs0Y LBgThX8KXiH6ttbgMq5hdVbTT+5hanM0+QSItS6Xq+siWT0Np3u7zXs94Lxhcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dg8Kq4bbbzn4X; Mon, 29 Dec 2025 21:21:35 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 5E09E5B1D6; Mon, 29 Dec 2025 22:21:34 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it From: Dimitry Andric In-Reply-To: Date: Mon, 29 Dec 2025 22:21:34 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <69527170.31d92.5af51114@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3826.700.81.1.4) On 29 Dec 2025, at 21:58, Mark Johnston wrote: >=20 > On Mon, Dec 29, 2025 at 12:17:52PM +0000, Dimitry Andric wrote: >> The branch stable/14 has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ade7285253fc5dfe0adfc51f7bd342b= 9293f253 >>=20 >> commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 >> Author: Dimitry Andric >> AuthorDate: 2025-12-26 15:26:13 +0000 >> Commit: Dimitry Andric >> CommitDate: 2025-12-29 12:16:00 +0000 >>=20 >> tools.build: add sys/cdefs.h to SYSINCS, since lots of other = headers use it >>=20 >> This is needed to let the legacy stage compile against newer = versions of >> sys/font.h, which transitively includes sys/cdefs.h, and requires = the >> new __nonstring macro from it. >>=20 >> Fixes: e2c93ed09f25 >> MFC after: 3 days >>=20 >> (cherry picked from commit = 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) >=20 > Hi Dimitry, >=20 > After this commit, I can't build stable/14 on main (commit = 88b04633c29e > to be exact) anymore. Here's the output from a buildworld, it fails > pretty much immediately: > https://reviews.freebsd.org/P683 >=20 > The same seems to be true on stable/13, but not on stable/15. Hmm, this turns out to be a bit deeper rabbit hole than I anticipated. = The cdefs.h header on stable/14 and stable/13 are quite behind the one = on main and stable/15. This causes issues like the above, when = __noexcept, __deprecated1 and others are not defined during the legacy = stage, and it picks up _some_ headers from the host system, and others = from the location installed by tools/build/Makefile. I think I will rollback the MFCs for now, until I can figure out a = solution. Ideally we would not have to copy cdefs.h for this bootstrap = part, but that leads to other issues. -Dimitry From nobody Mon Dec 29 21:34:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg8cw4GqGz6MN5X for ; Mon, 29 Dec 2025 21:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg8cw2cCbz3spT for ; Mon, 29 Dec 2025 21: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=1767044080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=76czSjKAUTmu+F59fYySghvRS3ubpYWaHM+2J/nBcZ4=; b=Ar2AZgUlJ+Uy3/dpNNsCU+X7J0Xim15BqpdtmcMFi4sasPhUkJe1Nrf7hnm5djx6Yr08bR 8lNc8fgRuwWW/8jnAf1uBIdKmvhYSas/nfiC0Z/2e37ByaHINKyR0sFQAtRZC2ba3DXAPY vVFIPkENoiEJhap7BiTPoNy5nTJSVBFrl6dh2h8xyOffJHwQFgxF6NNPbcdhZvjmqzPfyM QpqHVvivMxyfUTTiOHFUkytwHZGdYl3x15HJJTKMAKsgKvuiWc4WTIlNxW1Qe9bSJDUe8N MbSq/YtJybGISs9/Pb4BrSW83/d2OvfLGN0GsgbpWZ93blGaIXIrjcauvAhitQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767044080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=76czSjKAUTmu+F59fYySghvRS3ubpYWaHM+2J/nBcZ4=; b=S5bGuOe/Y22DXkuT7930yY2YKyrfY/83/j61r7cm4rN7Z4eIMh8LszpB/v3t98sqdsn8zV Fkv2/niza0EI3OGZG6adSXb+1YQkrWSOWnFLK8VDbmflzHKUFHCrBg08Kk5TR2lRGzXbff nvTwx/zTM37ROkkLGngp+9aT4hRVBAOsr3s3qcLu5stgFTuVjH+IfS1JoU1M4KZOJjOM1J aqytqS/QZvM7n4GewPtQT8v5rYeempJnFtkUTuU3v4b2nSqnCKhv/X9WKNvocqneD66vln ynKdvufgOYqJJ6bn03i2avx+J78m46UTbi5VdhYHLIl+YpPdBCm30Vz/71VQDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767044080; a=rsa-sha256; cv=none; b=Unn2Pb+XfQhNw+S55IbpDWaAKUYMZhChtEvcB6v/OAXl+0qisS+o+QJklKWQ7vI6WNkWLo ln9cybVy069PN/oNXufBGkAyuR0t7cUmFcxgK8/rhA0ZKhY9HpH7W1IK1wRcav+8eTFZmA fuyLeyNSSYET5t3prVS+4eRaxo2zh8yvVfyD6Y7WumyVfIswzeNRSABJn7r77fqa+n8EZd T+vg313jOOsYX38+uUACJDLiqRy1WqoWb3r23+5PdNTZ3+TYfV9hBBjSTXNSGC3NuWVVKq KmFSuTrqXoohESh/WxtYKS6lepk+75vyIHnEjMwZFJxVMmRGaVAW22HEHud0bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg8cw1RGGzY55 for ; Mon, 29 Dec 2025 21:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4685c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 21:34:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8e9515839369 - main - Fix typo in tools/build/options/WITH_REPRODUCIBLE_PATHS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e951583936980909d34a6104ace781541fb62b1 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 21:34:40 +0000 Message-Id: <6952f3f0.4685c.2da16e6b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8e951583936980909d34a6104ace781541fb62b1 commit 8e951583936980909d34a6104ace781541fb62b1 Author: Dimitry Andric AuthorDate: 2025-12-29 21:34:22 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:34:22 +0000 Fix typo in tools/build/options/WITH_REPRODUCIBLE_PATHS Fixes: faeaa25f5624 --- share/man/man5/src.conf.5 | 8 ++++---- tools/build/options/WITH_REPRODUCIBLE_PATHS | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a047dfb528fd..f028a3d1aac4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd December 28, 2025 +.Dd December 29, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1593,9 +1593,9 @@ bit-for-bit identical output. .It Va WITH_REPRODUCIBLE_PATHS Modify the paths encoded in binary artifacts to be standard path -Normaly, the actual path is encoded in the binary. However, this makes the build -differ depending on the path it was built from. With this option enabled, the -paths recorded are /usr/src, regardless of the actual path. With this option +Normally, the actual path is encoded in the binary. However, this makes the +build differ depending on the path it was built from. With this option enabled, +the paths recorded are /usr/src, regardless of the actual path. With this option disabled, the actual paths are recorded. .It Va WITHOUT_RESCUE Do not build diff --git a/tools/build/options/WITH_REPRODUCIBLE_PATHS b/tools/build/options/WITH_REPRODUCIBLE_PATHS index e71ebff204d7..88d4a0870976 100644 --- a/tools/build/options/WITH_REPRODUCIBLE_PATHS +++ b/tools/build/options/WITH_REPRODUCIBLE_PATHS @@ -1,6 +1,6 @@ Modify the paths encoded in binary artifacts to be standard path -Normaly, the actual path is encoded in the binary. However, this makes the build -differ depending on the path it was built from. With this option enabled, the -paths recorded are /usr/src, regardless of the actual path. With this option +Normally, the actual path is encoded in the binary. However, this makes the +build differ depending on the path it was built from. With this option enabled, +the paths recorded are /usr/src, regardless of the actual path. With this option disabled, the actual paths are recorded. From nobody Mon Dec 29 22:10:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg9RR4qDvz6MPvP; Mon, 29 Dec 2025 22:11:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.3 with cipher TLS_AES_256_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 4dg9RR2V3dz3x6n; Mon, 29 Dec 2025 22:11:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [85.220.129.53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 3A8B9240C49; Mon, 29 Dec 2025 23:11:29 +0100 (CET) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id 646FD240027; Mon, 29 Dec 2025 23:11:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1767046287; 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=nCave6ImA+YG6olzMb3JPPpfpsIcCfCnkSie4MP24U4=; b=bLyozxHwXXrszToUBDYA7VHc2Uj8luqT/XlUJH2nBRIvBBKb2z7/LZms7ZfY38rm7GQW+9 AH2yrW4xso3bXp7g+ymmcyf53ksjriL3dh899H5lFluWEU4zwJiEVVPpbz0FXnzWx26V5L GnO+OlNWwTcypfG9WMX9tTQzHyq7zLG2ezo+dhpEODy9jgk/u5VJVncLKEUZGLk5IpT+he xTLZh3gPi+pUxivJPrNVEgq0lgA+fuyjY/c0VVigWTfRc3iMxWa3owoaVeVV40l68sLgoQ 0g/9fePOhAwcVXTDvokmGEiLmt6G4zxHETXpnr1fO21xQOqa6TAaID9846xc5g== Received: from thor.sb211.local (dynamic-2a02-3100-22bf-3c02-021b-21ff-fe4e-8f4d.310.pool.telefonica.de [IPv6:2a02:3100:22bf:3c02:21b:21ff:fe4e:8f4d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 0DE9A240024; Mon, 29 Dec 2025 23:11:27 +0100 (CET) Date: Mon, 29 Dec 2025 23:10:53 +0100 From: A FreeBSD User To: Dimitry Andric Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: faeaa25f5624 - main - kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src Message-ID: <20251229231120.5019f897@thor.sb211.local> In-Reply-To: <86EF92B6-B19D-477E-8BBF-2B25190C781C@FreeBSD.org> References: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> <86EF92B6-B19D-477E-8BBF-2B25190C781C@FreeBSD.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.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 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/1pR50pAJhkCK_3w/Jdk0fYr"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: 8a964d X-Rspamd-UID: 1ad3dc X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dg9RR2V3dz3x6n --Sig_/1pR50pAJhkCK_3w/Jdk0fYr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Mon, 29 Dec 2025 16:09:24 +0100 Dimitry Andric schrieb: > On 28 Dec 2025, at 09:17, Warner Losh wrote: > >=20 > > The branch main has been updated by imp: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dfaeaa25f562493370a5da84b= 429ab0a117c3213a > >=20 > > commit faeaa25f562493370a5da84b429ab0a117c3213a > > Author: Warner Losh > > AuthorDate: 2025-12-28 07:31:05 +0000 > > Commit: Warner Losh > > CommitDate: 2025-12-28 08:16:39 +0000 > >=20 > > kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src > >=20 > > There are many environments that you do not want the paths to be > > canonicalized. For example, if I always build a product from a speci= fic > > path in a jail that's dependent on the product version, I don't want > > that to be sanitized to /usr/src because when I have profiling tools= run > > against multiple kernels, I can't do A/B testing and results process= ing > > if everything points to /usr/src (sadly, the profiling tools cannot > > remap back to the original like gdb can). Since we need both active = at > > the same time, symbloic link fallbacks don't work. > >=20 > > We do want the rest of the build to be reproducible, however. We'll = get > > the same binaries if we rebuild later since we always rebuild with t= he > > same path. > >=20 > > Turn them both on for maximum reproduction for environments where th= at > > cannot be guaranteed. > >=20 > > Sponsored by: Netflix > > Input from: emaste, ivy > > Differential Revision: https://reviews.freebsd.org/D52959 =20 >=20 > This breaks at least the devel/libsysinfo port, which error out with: >=20 > =3D=3D=3D> Building for libsysinfo-0.0.3_3 =20 > make: /usr/share/mk/bsd.debug.mk:19: Variable "MK_REPRODUCIBLE_PATHS" is = undefined > in /usr/share/mk/bsd.lib.mk:525 > in /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3/Makefile:16 > make: Fatal errors encountered -- cannot continue > make: stopped making "all" in /wrkdirs/usr/ports/devel/libsysinfo/work/li= bsysinfo-0.0.3 > *** Error code 1 >=20 > I think bsd.debug.mk should now include src.opts.mk, not only bsd.opts.mk? >=20 > Either that, or MK_REPRODUCIBLE_PATHS should be moved to bsd.opts.mk. >=20 > -Dimitry >=20 >=20 ... same with x11/nvidia-driver, see PR 292005 (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D292005) --=20 A FreeBSD user --Sig_/1pR50pAJhkCK_3w/Jdk0fYr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCaVL8iAAKCRCxzvs8Oqok r22rAP96+jjYaOKGZnTwt4l1xTc8kZg4dtVx3P0z8Q/oHgOdTQD+MZijui9xYq4r DSPZ5bA2Cv63SwnYdFMtpndDYBmEEA8= =Eepy -----END PGP SIGNATURE----- --Sig_/1pR50pAJhkCK_3w/Jdk0fYr-- From nobody Mon Dec 29 23:29:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgC9x4llDz6MVG9 for ; Mon, 29 Dec 2025 23:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgC9x4Bz0z43p4 for ; Mon, 29 Dec 2025 23:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767050997; 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=XeMUX04ns1u0QIxs/vyO61tI6DyyOhNjmNTcus/9b4c=; b=g5ldUDf0hqAb4hm/L3yz/s1stsQvO0qDavP3Xx51Wf7ID3c7PL6vq4NCTc0ZOVsz7wp1L1 +p5yAmUqY1Gf6jkNtBTh2qgw85QeduLjMHnMBkjfKDdz07bNLUwzxYZCaHiyg2rY3zFWGt D6HVwZ5IkQiXRNidPo5auhVhKrXMRfwBTqrb0py5qTPNYg5WlM3bR0ur35yAXcC/bcqKYU ChK9HoicUTcNG+/V82ncUZ97aOQyOsuZy3o2znZ9KyFKOiFigjzgOHmo3FlUxjl4ZMzI9U gC1iZ035jY6iR8HmVebPY93HDmurmf9FeG+cp4MLZZjWBdLZYybWYu3FKCL6WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767050997; 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=XeMUX04ns1u0QIxs/vyO61tI6DyyOhNjmNTcus/9b4c=; b=Ko7darpKWXcXXHOhV49o7lmqN1Kg1HbXs2upEV1o6mNWALyUS9uI4FpvsL2Kk9VsoWFTNZ c+wF84dlXrgOlY+iCJAw2Ea56kAhoGIDQhH4aFFhniX6WSSQz3vJQY79MbSmigzsu0pnW+ /tUl+D2nbNgpS3sfAJSj0Nyxec4GUBa3nl9KdIOn9Fx2Qhn4XGIVid8oKm2RHUP+Hrp2/A SsusaRIOk/aSynxa8ARP4IU/fNG6ecOevGadqVOR8zaV+H+ieQ4p9m8SjTykiICilyRUVZ 7lZ8P8M81Vhq7gtf0BukYhey+6ZdAhV9nrnFZqwwB9yIpAtR7O6/U25Xo+Br6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767050997; a=rsa-sha256; cv=none; b=cFaFFICN83fprRMMp86MvizvvXzqxar5CapReh1tlD5JNtUihxbVghU+hqChxrnFbRZdee RISiEp5VWnZLxuqk5P6jWr9fB3CKDpeUPGkXYZimK+cwTHqd5fbIaOp7LUFPiBeaH96kC5 gSmRa4lRnmOSYuLJ60jXBu/xpjC68bpAj0EzSGGA3ZPQcX23gaVB3wZqDMo69SIvtaHahL KX/UhI1saXyYng9DsxlG98wrt+huaz+3MzPL4r3pK/niMSeeynn0WsZ+DZOqDh2qFUn0R2 to/hGBYCSvoJGVBZQRWGKByMT88Vrgzpg79az+7k7rlgOa4HooIGzctDcoQxZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgC9x3K8zzc6r for ; Mon, 29 Dec 2025 23:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24687 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:29:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Dimitry Andric Subject: git: 4ff445d3723a - stable/14 - cdefs: Add __deprecated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ff445d3723a58ef8a5d34e4e33c4f40d217e1ab Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:29:57 +0000 Message-Id: <69530ef5.24687.1b039e31@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4ff445d3723a58ef8a5d34e4e33c4f40d217e1ab commit 4ff445d3723a58ef8a5d34e4e33c4f40d217e1ab Author: Warner Losh AuthorDate: 2024-10-15 19:49:53 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:48:19 +0000 cdefs: Add __deprecated Add __deprecated decorator. This is for a deprecated interface. copystr is tagged with this today in copy(9), but don't actually provide it or use it. copystr is a #define so adding it will have to wait. LinuxKPI was defining this away completely in compiler.h. Since this is shared between Linux KPI consumers and OpenZFS, if it's already defined, use the FreeBSD sys/cdefs.h version, otherwise define it away. For OpenZFS this will retain it, while for Linux KPI it will tend to drop it (I think always, but I didn't look at everything). Sponsored by: Netflix Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D46137 (cherry picked from commit 16672453f12586703f1c51d909bd1900691bf884) --- sys/compat/linuxkpi/common/include/linux/compiler.h | 2 ++ sys/sys/cdefs.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index c82b9acd53fb..fb5ad3bf4fe4 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -48,7 +48,9 @@ #define __cond_lock(x,c) (c) #define __bitwise #define __devinitdata +#ifndef __deprecated #define __deprecated +#endif #define __init #define __initconst #define __devinit diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index ed759029a53f..fc0a6c2f294c 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -214,6 +214,7 @@ #define __pure2 __attribute__((__const__)) #define __unused __attribute__((__unused__)) #define __used __attribute__((__used__)) +#define __deprecated __attribute__((__deprecated__)) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) From nobody Mon Dec 29 23:29:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgC9z2C7Gz6MVM8 for ; Mon, 29 Dec 2025 23:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgC9y6GCdz43rd for ; Mon, 29 Dec 2025 23:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767050998; 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=cMeRJ9B+tGXEPHvUcAv8Pr1tA59RcRi7S2ahCi97Og8=; b=SsxS3XZq1403+G7Vmy4DtsAMonl4L9NoSfzfTiOJhXsIoBgJScOfUkqRW0brgeup5jge/v hF+tY9ECy9OjN8fokCYWNq8eHJ1I5tY1+AgQ6eVRloN6GR5uA1iByl6TloHNss3WnAIB6P focMKKyYw/dlFmKOlkOaRT0BrkwxMigCiu/rKx98c/GpHso08+0e2P4mlfsF2YBh5rl7s4 bY/4q6ZKflapsFST/lUKBwbU7h76ysYCHSQEjalbkGFBIu7UXVfPjHm6676SQwypqTB64b eUxnZWRakkqiLB5N5/QL2Rsrl0TnUGyYJyOCQ1HjzQbdf0M/+3wcmlh1SBblEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767050998; 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=cMeRJ9B+tGXEPHvUcAv8Pr1tA59RcRi7S2ahCi97Og8=; b=IGTstP9E3ohY4AzZTlTCh8DFDIl11rRz17sWhMY1Wj1GOdXNgX2c9DOKOgqU5wHfKbMs1n SsV27ZKexiCLRoc1s7Vam3PfngKfbpiJsLYyRE1+pwtwonEsR00/wUfrhh/IFzZoowEtVk Oi5hXSgbQUOZTJ9vZdvc60mG68VqeuVyHHVYe0S/mp+q8eqEofiHrxXhEA+lYleln9l7H7 xwD/DZfta+ORFH/oAooJvGjmZD0rIB3z/FGWQllwEz1Qv8bIJt2zbMsNh0opU/Oj28EmuS bBf61nOpuVyJeJMbr3nr0S9RLAjhY96ppiP9IntNsh/FmwQr4ZifcTI2FSzuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767050998; a=rsa-sha256; cv=none; b=Ei4cWV2kpcRDgV+BIVTrBVhFul9eOMiqYYOAaXCe5lCoV91s8ZRId8owvPzcgq2Gdsx6qP oV86IH6eDHbb4gDcFZW6vsWPNas5pq3ooOdEGdP6s6TMPbBWCWIJkmdpXQPuD/TIgmQ66x Qbty3rKCFbpWK0lBwAU+I/zgZ/PCtvEiMwlUe0N53e/Lvkyw931H+ApG0Vj5RrvXEyPitH YKoH79vN8Gx186N0mH0d736jlpZHMv5goO0EG4wssSm7JvXkWOus7TDCKqV7RA5X6xd1f5 ck3ZOL74YpfHcR5X70mnTpMyp7KSyX5a00at8kLxskb8Oh59sJg9HPxAPoXVdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgC9y3kWszcMq for ; Mon, 29 Dec 2025 23:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23712 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:29:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Dimitry Andric Subject: git: 85e0cdeeb75a - stable/14 - cdefs: Add __deprecated1 which accepts a message as an argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85e0cdeeb75a8fffc7910032d409417124dfee26 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:29:58 +0000 Message-Id: <69530ef6.23712.6eec208c@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=85e0cdeeb75a8fffc7910032d409417124dfee26 commit 85e0cdeeb75a8fffc7910032d409417124dfee26 Author: John Baldwin AuthorDate: 2024-12-06 22:26:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:48:36 +0000 cdefs: Add __deprecated1 which accepts a message as an argument This message will be included in any warning issued by the compiler for use of the deprecated function. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47701 (cherry picked from commit 6da04bcff9efedeae7d4046553002b9e3b2bc24f) --- sys/sys/cdefs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index fc0a6c2f294c..1a91b8de567b 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -215,6 +215,7 @@ #define __unused __attribute__((__unused__)) #define __used __attribute__((__used__)) #define __deprecated __attribute__((__deprecated__)) +#define __deprecated1(msg) __attribute__((__deprecated__(msg))) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) From nobody Mon Dec 29 23:29:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgCB16Kzfz6MTxN for ; Mon, 29 Dec 2025 23:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgCB12wT2z43mC for ; Mon, 29 Dec 2025 23:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767051001; 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=uDFRrK602R8RTZ713fMi/CXzA8qBRZvD+RqAdSwvns8=; b=VgVdczo0ydzoFFWwDm4FL0/Je4OsdZx/KXz0BmlFcSp5Bt10tJOK6OsITrhUvJPQcSaOAM A32Jx2pD3IOO4KFnJqt/B5GCIQU8+ca0Ke3XJrt0vdZYHWP9MK32DIppjttQeYQ0TpJDLb nq+LrkUpkw+GbmkEFKkyyDfEBX63gY+DTvCOj3VKSbVVlvxNC+p6M8tDFQwZfnEjeSOuca vgiwBOegjgTA48zh7uRG+PcfKaMeTKOxtyTlIclpbJrxXAo0uRtedpA0v3pPBmYty7qemh LM354BoEUEja+ddxD9aA6xuZM28coIEXAPzVD1/u7Do8vZg3UtEPn4yLNHLN+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767051001; 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=uDFRrK602R8RTZ713fMi/CXzA8qBRZvD+RqAdSwvns8=; b=wx048exA08v39R52cggPaXdf8xqdM53u413lKa29v8liAcXGbKyaUAogJ/2VehZE80vbQQ fBmuL6s0V+x/sIdl7ASbINuPTOhHvP5o/y9p+L4+bA8ltfmOHgC/NOYeZhq4dryV0MQQ4K JQCmk8N7k0CwrHCV5qPwAfvk2FEFjOmbgUTw6Bb0nTY325Up/PvpC7zWsl/a0bT3piEUvF gsQBBw9WqK4Y4E88ODOM7DC6Srplf5kovf/5cpPdYJ7JJto9cfayKDqBOKZrlfVihgnDpf X6J3jlCkqxmcaB2em85vuXCylEFuWZporBk01yJT8SVFwalrURgV+QXaQ/pDEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767051001; a=rsa-sha256; cv=none; b=AOSsfFmwo8zC7cC7AiCUDVI6BdDjsjma90hFb+a+PDIxPJyOZc15L1A5hz79L+3AtWibV3 W2y3NeCxLtd4YVNebMXOiRvazYOdTeg8N+PiiMg7GXgSQ+i262p1qO7grg73IL0ZmOuqTK GJ3C8L9Ooi4iLe16FlFWWX+I8xeCKrskC/h4DOHiyidIruhdbj558+evm/a5k780jKCv1s TUCO+VnNMtx6uIIA+6Nkzm71qeY2O1rJ3nlwslKYuxlfLWZLKxCcvMS7XrYF3LFxqiAuGD IkakcAC/4RsvLzzKaffELJpY0attOoZzhHwmwz96PMCgS3Q9m4KcH2otCU4fWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgCB12Ww4zc7r for ; Mon, 29 Dec 2025 23:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:29:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lexi Winter From: Dimitry Andric Subject: git: c4290c35857d - stable/14 - sys/cdefs.h: add __noexcept and __noexcept_if List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4290c35857d46a880ae3873fef58aa98a20c087 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:29:56 +0000 Message-Id: <69530ef4.23a87.f893d3b@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c4290c35857d46a880ae3873fef58aa98a20c087 commit c4290c35857d46a880ae3873fef58aa98a20c087 Author: Lexi Winter AuthorDate: 2024-02-02 16:41:40 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:47:53 +0000 sys/cdefs.h: add __noexcept and __noexcept_if These macros provide the C++11 noexcept and noexcept(...) keywords if we're compiling in a C++11 environment. Otherwise, they expand to an empty string. This will be used to add the required noexcept specifier to several libc functions as required in C++11. MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 (cherry picked from commit 02b0d4b688cc4deb14cb6e7534a2a4958e48b753) --- sys/sys/cdefs.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 029eff437c8e..ed759029a53f 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -393,6 +393,17 @@ #endif #endif +/* + * noexcept keyword added in C++11. + */ +#if defined(__cplusplus) && __cplusplus >= 201103L +#define __noexcept noexcept +#define __noexcept_if(__c) noexcept(__c) +#else +#define __noexcept +#define __noexcept_if(__c) +#endif + /* * nodiscard attribute added in C++17 and C23, but supported by both LLVM and * GCC in earlier language versions, so we use __has_c{,pp}_attribute to test From nobody Mon Dec 29 23:48:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbt1p0Pz6MWNZ for ; Mon, 29 Dec 2025 23:48: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgCbs56Qlz459g for ; Mon, 29 Dec 2025 23:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052137; 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=Jt+eJS98wn0xPiCeyBlyG0NPdXbnzYAFpWrR6rH6m0A=; b=K6BYqIYk/d/Hq1JFY5h8c00MXpdbhrfpqRuJOobu0bTOZv70W7bY+3OVqd5qvuU6W6Kx4B u5JXooZmx+JFwuJJz2lL0885bgBqLr80+3O0X9c8yru+ZuqeGlsluhfCy/pOKzvUWh94MM p64cqjB4BrfrHRiFVXltKLOothT2AiscWNEgj2HJy4OOShc4FU8+TwJSe+ZdgK51jmSR9/ 20cnfP2imxAxYe8haQeZQkXrt8Dl1f0ixG61PGnpB0c6FWjQ2nsS7bG24F+Rn13cf9/Y8n jYCwu0qWRU9GRDU2V/mtYLZq46n9nxaRN0iyDTFv4ycKCBly9wuUsgc4Gemu7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052137; 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=Jt+eJS98wn0xPiCeyBlyG0NPdXbnzYAFpWrR6rH6m0A=; b=XkUZn1OYk6h3DDkIzkJQlXKJ8EeBIY7tJ7FANaxjXv41yh2K/OpipIyg2g5vy1c+tgMkkM qt+5ByfpmKwFxoLP3hXkcIXXh+9iQ9iYJ2rEQ+z/ddjI9GlbZwPd+lrK8PcHx4W0pWGNFf GszqB8Jw3ZrmAZjSOe7PQbphpufpPA6Tgk6H9Ccab6LXFWDmRUgYY1NgUtnNBIRQV9mYQt Jz+HWTiSxK6CvxqyqNKUZ0t6l9PhRmyqRGeZJ7QwGaFw/TxZweX7YW3KBug7O9bRRCaOEA p8yAw74IF7puJnGW5FTJRxwkNHP4o+1kL/a3BFIF3pISZVs3M56EI9JqOHF75A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767052137; a=rsa-sha256; cv=none; b=YEwRu7esTeBWNqWTObx2eWESg+FrS55FiX6+91mnp1aUz+jWBQmaQQIVrt6i6HObTPLSzr UEdcXGwIbuqNzM+wYI2tsVQh4MUha3BFTy1eEx9Vu79ndGLq4SGysMW7ohdaK1eF/0wm7J jqe/s17Jdgx/LDJdZKAiHvQz4xUbAuNvldB9BwLCprhtyiKTPJa4IwnhfcFQu3VZ6Ov2pP eiBt2V3hxf3/y5W63W6PfRP8fP+zjCd4r16Rxwu682IL/VjXSLJVQrufi3FE7dr7bwAa7D ANnkTXBbXFLIUWk6yHaBD/Z6gg4nOxsTIrwoq/NyaZz8BN3oZ6Mc9KTIi2hKGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbs3y8gzc9J for ; Mon, 29 Dec 2025 23:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 255c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lexi Winter From: Dimitry Andric Subject: git: cd2a65a60701 - stable/13 - sys/cdefs.h: add __noexcept and __noexcept_if List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd2a65a60701d806e8ebbf97b6c77c880e0c9746 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:48:57 +0000 Message-Id: <69531369.255c8.54a75166@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2a65a60701d806e8ebbf97b6c77c880e0c9746 commit cd2a65a60701d806e8ebbf97b6c77c880e0c9746 Author: Lexi Winter AuthorDate: 2024-02-02 16:41:40 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 23:46:45 +0000 sys/cdefs.h: add __noexcept and __noexcept_if These macros provide the C++11 noexcept and noexcept(...) keywords if we're compiling in a C++11 environment. Otherwise, they expand to an empty string. This will be used to add the required noexcept specifier to several libc functions as required in C++11. MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 (cherry picked from commit 02b0d4b688cc4deb14cb6e7534a2a4958e48b753) --- sys/sys/cdefs.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 8fd07ce85a05..96a3742c4a1d 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -394,6 +394,17 @@ #endif #endif +/* + * noexcept keyword added in C++11. + */ +#if defined(__cplusplus) && __cplusplus >= 201103L +#define __noexcept noexcept +#define __noexcept_if(__c) noexcept(__c) +#else +#define __noexcept +#define __noexcept_if(__c) +#endif + /* * nodiscard attribute added in C++17 and C23, but supported by both LLVM and * GCC in earlier language versions, so we use __has_c{,pp}_attribute to test From nobody Mon Dec 29 23:48:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbt5h6Wz6MW3v for ; Mon, 29 Dec 2025 23:48: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgCbt4VQ8z45Zd for ; Mon, 29 Dec 2025 23:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052138; 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=pr0MGgRlNcFW+KEPXOGGy0teNeBA5Mmb9mBla6JY8yI=; b=nW+ex1m3NL/jn7s8VHAB2llNyzULF79cDyPmeBCoRs5vpQc26oLBPp5gAJPt9FvfvinvZP 2Ga5AGzot2AyKI9GHaFTL5lyjAuppwd9tr/v0jf5SuOPgcouHyFwnLw7q3/kCqy+4ix/yM 2zNr8VZYaPIG6Vai+0kK6E7eGjuZiDtRKnspMP+d4rkUX9TkDQW2YPygRaRW2f1vjvgH+P Pxp7ZRVf+IN3suENT5gVRn1idX0Rb/Wj3vfTR/WS+Ks+91jsPKc0At+7iGWryOgRRDzDur 6RgoIjAFoltq6nseOve2oMjurCpPp+iRGV6iw7qUs70+ZqwYFAFLKzKWq++Q8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052138; 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=pr0MGgRlNcFW+KEPXOGGy0teNeBA5Mmb9mBla6JY8yI=; b=o6+FNfI/JbTpXxpnAc5i4Z1aeQrsTAQHVCjRb9M8eRV0q8RE8RtWdD9e00WmPPGh0KJBNi kFcy8Vxb7NN0GupsqFPAIbxg0VefJ7Yuf5WhcVL05URWTHEmbyIJYl7fjqyckDXYrETl+F AigVCTyXecYJ6ac2tpvfFtk+ADRd+8HFAZyApsUALn1MWm89T4phP/wg0YxKkEyhPbTaVb /9R0DBm/GC3WcEc9nR41lOzTAHej1tpROJBNMilGf7DQnsfxUUWPzkg4QBX7h3k1IG/gfD dwWM9AuIM7hLg5MnLetCZaxZ0a8UtRFii4pt6SMoSD+7hM29949CLu//aHaazQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767052138; a=rsa-sha256; cv=none; b=vFKP8h7wsFg9doNPqtv8iCEIAey3DgiKTjmSPjDnAkmchqAor/a2OzFWcOwx6dG1+KJfey D8ByJJXegFaS6dAw1XUnob/8E/9vhM65iWCwwfYUVFOzBJSGOjB5rHp4LFMt9o/3aCgWPm zsr54T5o0NPBxJxhz9EBnn/8CHI9UOPWRv4Y205P35DW1jqB0AO6d/Jka1EZwvNOxKfrdY HcvQ55hpbSK23IfTtfBE1iCfTHo3+NhHG6fL994nEnnMHMpFECu61XixJIEsVc31VPQ/do iE5Q43gp2gNsh+VQOQHEgVzP0AkMRzSmvNFc9lZ47LOU+JKDSZz9Gu5s1p1Gpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbt42X4zc9K for ; Mon, 29 Dec 2025 23:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 265ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:48:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Dimitry Andric Subject: git: 9622eff37fbd - stable/13 - cdefs: Add __deprecated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9622eff37fbd62b2c5227c959973c565dbf774e6 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:48:58 +0000 Message-Id: <6953136a.265ae.57da709a@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9622eff37fbd62b2c5227c959973c565dbf774e6 commit 9622eff37fbd62b2c5227c959973c565dbf774e6 Author: Warner Losh AuthorDate: 2024-10-15 19:49:53 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 23:46:49 +0000 cdefs: Add __deprecated Add __deprecated decorator. This is for a deprecated interface. copystr is tagged with this today in copy(9), but don't actually provide it or use it. copystr is a #define so adding it will have to wait. LinuxKPI was defining this away completely in compiler.h. Since this is shared between Linux KPI consumers and OpenZFS, if it's already defined, use the FreeBSD sys/cdefs.h version, otherwise define it away. For OpenZFS this will retain it, while for Linux KPI it will tend to drop it (I think always, but I didn't look at everything). Sponsored by: Netflix Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D46137 (cherry picked from commit 16672453f12586703f1c51d909bd1900691bf884) --- sys/compat/linuxkpi/common/include/linux/compiler.h | 2 ++ sys/sys/cdefs.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 94595b2e8c50..c5a88dc2efa4 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -48,7 +48,9 @@ #define __cond_lock(x,c) (c) #define __bitwise #define __devinitdata +#ifndef __deprecated #define __deprecated +#endif #define __init #define __initconst #define __devinit diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 96a3742c4a1d..9ba91054e923 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -215,6 +215,7 @@ #define __pure2 __attribute__((__const__)) #define __unused __attribute__((__unused__)) #define __used __attribute__((__used__)) +#define __deprecated __attribute__((__deprecated__)) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) From nobody Mon Dec 29 23:48:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbw1x41z6MVss for ; Mon, 29 Dec 2025 23:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgCbw0VR6z459s for ; Mon, 29 Dec 2025 23:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052140; 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=07WnUzHDwtocVb4/KKdCkRHi4aAqOUfC5FFtM594cc8=; b=RckGgfOo9y8G3GbWtijNEaEm2Szs8o2HWCG38Ab9/mr9cCbCKEp9yojJMkkNinAndv8mbA D1WdrF99P+I5MA1dMOYp86dekd6ekU2Jc9UgqWagv1Po8rWtYNmpIXesE/LhoZoEqkfY6M fW4sb5ZHk2eMBSn5iGtuoskmWCFKEbR93I/zpcYQKWrzUzyv4+5h7kLQysyxXc/QwGVrNh Jk51Iv5YCI6M5OZkfY9axpOkkdLpxwzdC9HlNG77gJ/bVb65X+eR39O9zbHYfniIJg4D8V /YcYWQfyDBBBLznZuowblvnfTz4Lr0gD3nMIBrbwUhc1rjcYcuUUvsLvXtK73A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052140; 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=07WnUzHDwtocVb4/KKdCkRHi4aAqOUfC5FFtM594cc8=; b=Lf9d1h2vpic3xXm9jjimv+UAhgvPheglgs3ybIpmnW7wub7gihM2qzMAd4e8aUyV7b/4wi jHMVIAYv5xjGdOR8RV35/KUHuIQIarmPzbQJulxmSuRyz+8KwTzpM/ZE/pL4yy4IFaf4Dp qydpil7Q+9+S+7TCiI8qEbkhgG5JYyelos2EsgQ4zPW0PN1ChXR3ha+mHGDZf9NKYAH8Uk SoRYpl0lIALk9ahYJfAhz//aZ9Oe8PP3uQ3TR8TyfpdEQHqI3cG2e90Rb/daobm5s6N8yE ygcNoQ9MzcfzNHAFdMqoKrpqour2RZIUEKd52R95sUbcWd0WVXraiuwsuE8Eow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767052140; a=rsa-sha256; cv=none; b=VDwL8h8QOi55yNQAgL7rsC6JmCAr2mXl+JRYYPrlYAeUyLlRpcraaattEByRA2I1FNoLWZ GVrZFIuuyfxcS8Vphx6g/3Ou2K7jBuUKDUXZVznEvNqglduCE/SifJkTFG11g6pZ3H1sbI 48zIcFsKBtaK7hlWebYnkk2m8LEu2+UDeQDgS4fBo7gnKhZTwl1J+Dd33AaqpFA4DKIcWp 4BDVtwrApFRGrAwMvkh+7wp3AIKwrdngNUtRZ+fb7Y8Mv+AkTLwFNGWS3sygEIYw46Ajvf WW5xamEf10nVpK9cg69WyWDV/6hi5aGzB5UajChqL3gYpgTtVLJ6yKU73ZZmIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbv4pzVzc9L for ; Mon, 29 Dec 2025 23:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25797 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:48:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Dimitry Andric Subject: git: c7826c81fe43 - stable/13 - cdefs: Add __deprecated1 which accepts a message as an argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7826c81fe43995910b58e01f948faaa41d82fa6 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:48:59 +0000 Message-Id: <6953136b.25797.4d805d6e@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c7826c81fe43995910b58e01f948faaa41d82fa6 commit c7826c81fe43995910b58e01f948faaa41d82fa6 Author: John Baldwin AuthorDate: 2024-12-06 22:26:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 23:46:49 +0000 cdefs: Add __deprecated1 which accepts a message as an argument This message will be included in any warning issued by the compiler for use of the deprecated function. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47701 (cherry picked from commit 6da04bcff9efedeae7d4046553002b9e3b2bc24f) --- sys/sys/cdefs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 9ba91054e923..d3b196869ed2 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -216,6 +216,7 @@ #define __unused __attribute__((__unused__)) #define __used __attribute__((__used__)) #define __deprecated __attribute__((__deprecated__)) +#define __deprecated1(msg) __attribute__((__deprecated__(msg))) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) From nobody Mon Dec 29 23:49:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbx1nTjz6MVqM for ; Mon, 29 Dec 2025 23:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgCbw6b90z45Gp for ; Mon, 29 Dec 2025 23:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQOQw5AXhlVOLbyUjQIEZMJ/RY1qDnqZwIiledEP5LU=; b=bzgV48GWwiH9yHl4XFGrGSff+5qLIm2350jo0B9UejF27IJV+vI4dkMrRZTyFi2Ddlf6YG twaT1uEahHZBpBxMGGedeXWMfWzZPQu/vxF/BucVQFhRfOwPozZNOwCIjyt7p30LcZSI3E apC84zboMq9UJpKMRZa9NL0XG3nTSYiWUB4bGI2UeMZt0VnSTMjqnePDIaLXdKhUaNCzwj Ev2ICpLQ/MzPshrTB8hSuBxH8+M3mr07a3KhAYlYKEi/GQ2Y0qkaeKRiWMPJ8Cz/TvI3CQ Xa6BWPnTXIEgnhdYNkN+QX8GfoWm5C52zjS7oMWwhew9wsZyWDzMPpfPpuj7yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767052140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQOQw5AXhlVOLbyUjQIEZMJ/RY1qDnqZwIiledEP5LU=; b=qvDa9QITmFka/136Teur9bqins2ZumLZh9m06HaiMjRAVjDN/iVn8+pqls73bnrDH+1+fq dOdJdpaEL18lwk0a+byUmLH8WwY6vNf60lrOmqXP4VT3H9lZeIYWFg/CIkQr6wDm0dZnkZ jLXhJuilYFxYOX5xjDesK2r0Gd8r/IFlqraAci7HZAnc3OhWP24QLE0FT0Tg6GpNeVH3Ar WQ96Pi5XK8u0Rw/hWwnYw7zs0qW5nj9khuug7Py6eALVpslDpaNQuw0LCEhbvPbC1tDL8O OsUKL1XWZT/oyprq+dbbb2B2xhQ0UNkcedecMoTBmR0LJg3LCN2u2p0DAGtQaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767052140; a=rsa-sha256; cv=none; b=GuNsHvdMXmIkeL3yB7Tsv8j9v25xvJW8IoC5WaHv54HQLFTCvSjvBLT64FaFCfjX2rn9Sc 2X+rHnSI0IKAN9mIe2liFEgSV65mYtlHvJbqSxLp1aTkjIh0vfJCGxrW8Xshr4ZayNTLGz 57aJyUU/Z9gLAzsPK/W+GumO/NIk+KG0lanVBcGoDevxaQvVV1Gs4sFAvroOdNV8SLIj3i Q9ISHVRhopBtBKO+G9eu6lCfnQx6YLV95i6d9w1dmJ77Rp9W/xeAuhIs+X/S26Yaud+UM9 Ned1JQgw9GT2Pn5TClg+haujfj6Phf7wcSFGz0sweuXb/dNkNGco6E09NZPTXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgCbw5bH8zcTZ for ; Mon, 29 Dec 2025 23:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ab2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 23:49:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 68c94c3bc0de - stable/13 - Remove __deprecated definition from OpenZFS compiler.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68c94c3bc0decf90f7173587e370cffa473c58a3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 23:49:00 +0000 Message-Id: <6953136c.25ab2.50de701d@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=68c94c3bc0decf90f7173587e370cffa473c58a3 commit 68c94c3bc0decf90f7173587e370cffa473c58a3 Author: Dimitry Andric AuthorDate: 2025-12-29 23:48:21 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 23:48:21 +0000 Remove __deprecated definition from OpenZFS compiler.h Since it is now provided by . Direct commit to stable/13, since OpenZFS compiler.h has been substantially changed in newer branches. --- sys/contrib/openzfs/include/os/freebsd/linux/compiler.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/linux/compiler.h b/sys/contrib/openzfs/include/os/freebsd/linux/compiler.h index 79f9b2d8a96a..b60c8d419d58 100644 --- a/sys/contrib/openzfs/include/os/freebsd/linux/compiler.h +++ b/sys/contrib/openzfs/include/os/freebsd/linux/compiler.h @@ -50,7 +50,6 @@ #define __cond_lock(x, c) (c) #define __bitwise #define __devinitdata -#define __deprecated #define __init #define __initconst #define __devinit From nobody Tue Dec 30 01:06:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgFKL12Pkz6Mbs9; Tue, 30 Dec 2025 01:06:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgFKL0M64z3Dx0; Tue, 30 Dec 2025 01:06:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767056790; 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=GconGVcI4NGhBcp52vbLd2vnuN/lBh9HcTriwKQD+qM=; b=B0AQSSVW7TjOTW2vdyFjrc7tYd/XcEtcNzd1uBIT3gFn8yHXvAZ9ouuPoXsM7GVAmDdKX3 2bve/wKT/BducwECeRDTy3CWctQjzUGgnM6ilmWEL9Ksm+/Ju0KkV7Y3hf8yntcALdl3sQ A8avXwlMjTPcMueGyopoqyb8vt0Wu8S14UOpKFytUYU85O3xS0CLIdZJlZCRTluadSegJ4 uRwtfqYlpnhPn7gbpGuD2Nsq8SDsH984kqmC1Ge7pUvZk83O8o5sxKEbvIF8TvbcrSeJ3x k7+ZcgXiFgzzzcEx1VI6YddtCTZcoea/E4xPvfz220sGsn7WFeBWYFEd1ERVNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767056790; 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=GconGVcI4NGhBcp52vbLd2vnuN/lBh9HcTriwKQD+qM=; b=j6F8NFYUdt3N6sT79Q1pPuR0Cdz9rXbQ+r3ompqMIs6g210/cM8dY6wcE8/6LvpyHOlpg6 BsKWdusne+ACtnQ4/19mjdUvW3UGWvjTIFLCn86j2nDbQugEbUDZ4IIH8/m2TE0pZYbMw3 Y3XsyZMpeG5qE0MfKM96tiUtwbNwFqnqvy3E9CaFSsUH9QWj2VnvLBAdmer6dnkvaNlCV4 hJBvkS/6zBKfsCzI3XUjHkZNGD5txOif5WuwsBBDVkLYW85GCUWIH1d/FX6S+wG0t8qHfP 3nRSl/1hfeMRsyc+mj38uGOrl7CtDOSPM98lP/2AOQnfXiHyAMxZy0k4vohb+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767056790; a=rsa-sha256; cv=none; b=SsDs/3PQFrQsRaSIgVsQZgr61T0plMJca82zXQhaDetMNE12ysbTcCNbL9IV2N0vVkZ7gI BRX2SRl3x43vhHTZ3sYa3GMsEkNoseGicTg0iSl14m2AFRpagwMcwgFyxl0eLpD3zm/r1Y UTKHCTVq+eP7VfAASlQ+QiBpwt0w9hMit+mhWfxTeILNnP+8NaO7T35f9t3jeDi2LeL11x 72i+u5n47soMp4KLympst5+Uf3W2dKoVbh1L/VytxTsliSIldFRZjHcfmfPUKds4m0CvYn ajCkBitUeQ3FDr8foHeyfHt+VoIyRIN2Zr3lXEEzlqpBzn0cOd+ihaceyQGSOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dgFKK5y5czs3s; Tue, 30 Dec 2025 01:06:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id A25EC5B781; Tue, 30 Dec 2025 02:06:27 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it From: Dimitry Andric In-Reply-To: Date: Tue, 30 Dec 2025 02:06:27 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <69527170.31d92.5af51114@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3826.700.81.1.4) On 29 Dec 2025, at 22:21, Dimitry Andric wrote: >=20 > On 29 Dec 2025, at 21:58, Mark Johnston wrote: >>=20 >> On Mon, Dec 29, 2025 at 12:17:52PM +0000, Dimitry Andric wrote: >>> The branch stable/14 has been updated by dim: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ade7285253fc5dfe0adfc51f7bd342b= 9293f253 >>>=20 >>> commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 >>> Author: Dimitry Andric >>> AuthorDate: 2025-12-26 15:26:13 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2025-12-29 12:16:00 +0000 >>>=20 >>> tools.build: add sys/cdefs.h to SYSINCS, since lots of other = headers use it >>>=20 >>> This is needed to let the legacy stage compile against newer = versions of >>> sys/font.h, which transitively includes sys/cdefs.h, and requires = the >>> new __nonstring macro from it. >>>=20 >>> Fixes: e2c93ed09f25 >>> MFC after: 3 days >>>=20 >>> (cherry picked from commit = 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) >>=20 >> Hi Dimitry, >>=20 >> After this commit, I can't build stable/14 on main (commit = 88b04633c29e >> to be exact) anymore. Here's the output from a buildworld, it fails >> pretty much immediately: >> https://reviews.freebsd.org/P683 >>=20 >> The same seems to be true on stable/13, but not on stable/15. >=20 > Hmm, this turns out to be a bit deeper rabbit hole than I anticipated. = The cdefs.h header on stable/14 and stable/13 are quite behind the one = on main and stable/15. This causes issues like the above, when = __noexcept, __deprecated1 and others are not defined during the legacy = stage, and it picks up _some_ headers from the host system, and others = from the location installed by tools/build/Makefile. >=20 > I think I will rollback the MFCs for now, until I can figure out a = solution. Ideally we would not have to copy cdefs.h for this bootstrap = part, but that leads to other issues. As an alternative solution, I have MFC'd support for __noexcept, = __deprecated, and __deprecated1 to stable/14 and stable/13, with a small = additional patch to stable/13. I believe both branches should now build = fine on main. -Dimitry From nobody Tue Dec 30 01:36:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgFzc6ZFyz6MdNY; Tue, 30 Dec 2025 01:36:12 +0000 (UTC) (envelope-from markj@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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgFzc5wFSz3Jmr; Tue, 30 Dec 2025 01:36:12 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767058572; 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=tHngZTcYScJyktyL0Om+OU1jx58ibU9XQEUyVpNJkr0=; b=RYL/jkvBxV9pTOaI7X9hXzlweU2iY0w165BNgFUzg7BbfgJxvMZw3PqcGh57XU4GDrRg7f 6hJcVrP6yNZUz28cTiuK8MUSfCj45seTlkjBH5THIYVL8FR9+jMMduX+oCNA1RZ8MIzcRI xqlku/XdveVto5QsauhVhN6WZ92uk54il1VenlgduZG0UPEAGpD2D9Q4Q+ipbZf+zK8rxk nTLw8qfJpR7HCVaxN6y+pql+C6OkEHB4I5SkkSl20aA2DSPFPdaQxWFFWYkL9lvWCn8763 7qOaTs0YekRomu2xNNCaf7y/RKVxRO+269XbuCWAdVoctMRGYZDtwC12bIrZCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767058572; 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=tHngZTcYScJyktyL0Om+OU1jx58ibU9XQEUyVpNJkr0=; b=mPW2jBnutNYPz6vMqkQR0rEKDVxHfMtNFDfUikRvAjiyZ9AwMlX6MWxekKXgNR+ZGqROER m7ty6W/T+Cqg887hmJJ1hgdyA6fEbyl5kTHa4cq80STjhp86savWpSi2DCATm1ww6Gczsf diivyDFb/ia3n0UKQN11JF9HR1dniFkGFd0X4uksQK1mgUKPIM4ZX6NBbYu9HFrdk1XIGw INlYintBNOp8wM8Y7i1TWQNAFEHvLQqVv9bjJUvFV4ZaKLI1alIWyWyQeNsLlXWqGQ+GgE 4tApVUe8UpTLvgnt3fxIaNtho/B7I3CbgyF8mVO/GjkrzH2d711j6HzI/HB3XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767058572; a=rsa-sha256; cv=none; b=eMI/P7ASANf7HiF7yUi1QqXqU57cCVv1WP0pbypQU7gsh7gkLwp5y8Finlfh1NrbBAy8zY fIGPRnsBetukMbG8J31Mc8NVxn1C88PS2ngYckYt8ZEOJ1S8E9L7mT5X1GgZnvvAY5PaN4 UZULATCBPgzw+l4y43e7W47GdNut6hPsJobR+R8gyoHvAvXXVzibTyu1dNYXGle4t9a4RF RCen7Cre+bmKWxdslal0uhwr1XZhYJAdBLx6kz1R9ST2i0P1rQBOV0fRdgRzYvajdGP/rt PVrzxfihgPjwCCUkGTzr3KkJ95MH9Mhi9r95QoP4Jc0CeUWNsa3QfzCkM5ZskA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4dgFzc3ZsGzskR; Tue, 30 Dec 2025 01:36:12 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Mon, 29 Dec 2025 20:36:10 -0500 From: Mark Johnston To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it Message-ID: References: <69527170.31d92.5af51114@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 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Dec 30, 2025 at 02:06:27AM +0100, Dimitry Andric wrote: > On 29 Dec 2025, at 22:21, Dimitry Andric wrote: > > > > On 29 Dec 2025, at 21:58, Mark Johnston wrote: > >> > >> On Mon, Dec 29, 2025 at 12:17:52PM +0000, Dimitry Andric wrote: > >>> The branch stable/14 has been updated by dim: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=2ade7285253fc5dfe0adfc51f7bd342b9293f253 > >>> > >>> commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 > >>> Author: Dimitry Andric > >>> AuthorDate: 2025-12-26 15:26:13 +0000 > >>> Commit: Dimitry Andric > >>> CommitDate: 2025-12-29 12:16:00 +0000 > >>> > >>> tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it > >>> > >>> This is needed to let the legacy stage compile against newer versions of > >>> sys/font.h, which transitively includes sys/cdefs.h, and requires the > >>> new __nonstring macro from it. > >>> > >>> Fixes: e2c93ed09f25 > >>> MFC after: 3 days > >>> > >>> (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) > >> > >> Hi Dimitry, > >> > >> After this commit, I can't build stable/14 on main (commit 88b04633c29e > >> to be exact) anymore. Here's the output from a buildworld, it fails > >> pretty much immediately: > >> https://reviews.freebsd.org/P683 > >> > >> The same seems to be true on stable/13, but not on stable/15. > > > > Hmm, this turns out to be a bit deeper rabbit hole than I anticipated. The cdefs.h header on stable/14 and stable/13 are quite behind the one on main and stable/15. This causes issues like the above, when __noexcept, __deprecated1 and others are not defined during the legacy stage, and it picks up _some_ headers from the host system, and others from the location installed by tools/build/Makefile. > > > > I think I will rollback the MFCs for now, until I can figure out a solution. Ideally we would not have to copy cdefs.h for this bootstrap part, but that leads to other issues. > > As an alternative solution, I have MFC'd support for __noexcept, __deprecated, and __deprecated1 to stable/14 and stable/13, with a small additional patch to stable/13. I believe both branches should now build fine on main. This seems to work, thank you! From nobody Tue Dec 30 02:19:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgGy74pl8z6MgrR for ; Tue, 30 Dec 2025 02:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgGy74Yl6z3N2N for ; Tue, 30 Dec 2025 02:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767061199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WosGBOq+MkGV3CWraFXWMi7AG6jLUDZeV8Tn8mF478=; b=j13swGixFd8XwVlLrUy/RU0FfQi6RZYpqOeO/DRZpsHjWsaGIe19lUy7PsR89grpm2t59Z Lfm42Sa6qlHz1QUNxYd96lKd5B1a6NaIU5KAWxzV0cagoX2HkyhbSBUeiYb1Pwyv50swM1 Hfh11xanG8HWm6IqyPkU7RCGzrLrb175homEeMoAMRDgiDR58ZDESxoOvYyAi9ZQEghNi7 zgrmKnKmVVm6TsyCLn8rwoxhrmmYnwvT/wxiGuSWDkRJgDpnPdevuotVP5OHAVo4T4tM2j 0AyCFU/zGZrLzHYP7SvG7q+Bn4HtY41Yj+S7VyFBApIcm799OZHwAIjqnzUJlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767061199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WosGBOq+MkGV3CWraFXWMi7AG6jLUDZeV8Tn8mF478=; b=hjiOuJ3GfOJIuX5mMPfUh6srfXdd53rIKzbsvgn2v3X+9X1xOGX2R0oEhaSAtPPvOetNlU sErtETokT+8Vh6TLH8wa8RYTMAlL5v0RfX+GPB8RUQttfcAO1ljpNze983vutVF2AXmJeu mjHC+55sBTqeG8OLuMyrwvjprv95jgCOrU81e2difJnFC2TMIcG4uI19Zvy2UReXlGzrZH SeO/ip3CQOS6rrae82X3ZGCdmRMBsdjIuKeP/XOX9GRE4hbc9ihsQfYHxzN1U52//eiwkJ gfwO4tLVWAvbFvoKvoMoTkhu2trUil2qYub19eaGrDPf9vom/2AD/rPeabrC1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767061199; a=rsa-sha256; cv=none; b=kEQLD99NBYFKa+xuW+x5i9OP6Y70WBsrHNPMowIR4aJ9u/o3As5lLJ+ePJXsbBKbKVE2Lr urJzpTrtNbydg3IMbd6diWpKoSwxkUgDqi26WPfOsHC3LCE7/joqZs1jz0wayZRi6MzOZn +BEloczQrKj2vepyf/jYRyLQoQOqeM8o4/5H9XP68nc+/p6pum4G9rUS4eeS2J+GSm5t7c G9fg6lcf0PwBARO7tadUFUKU9+m6Ztm15YfLKCUVbjSYoT4j5WpYYzUycpmUldMpK7+QT6 yrLxmlfhRDXsFQfZC2+SrvQ73CvbATZG3HemlNpjoqq3ezgMUcNG84miYDeTrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgGy73gRDzhT0 for ; Tue, 30 Dec 2025 02:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b323 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 02:19:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 4e48e50ea598 - stable/15 - MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4e48e50ea5982387a1c9f164953315f7fe1f76a3 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 02:19:59 +0000 Message-Id: <695336cf.3b323.314f61a@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4e48e50ea5982387a1c9f164953315f7fe1f76a3 commit 4e48e50ea5982387a1c9f164953315f7fe1f76a3 Author: Xin LI AuthorDate: 2025-12-23 08:24:13 +0000 Commit: Xin LI CommitDate: 2025-12-30 02:19:14 +0000 MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. (cherry picked from commit ae12432049e7873ab3912643ae5d08297b8cbc49) --- contrib/xz/ChangeLog | 1586 +++++++++++++++++++++ contrib/xz/THANKS | 402 +++--- contrib/xz/doxygen/Doxyfile | 8 +- contrib/xz/src/common/my_landlock.h | 45 +- contrib/xz/src/common/mythread.h | 3 +- contrib/xz/src/liblzma/api/lzma/base.h | 6 +- contrib/xz/src/liblzma/api/lzma/container.h | 38 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 5 +- contrib/xz/src/liblzma/check/crc32_fast.c | 2 +- contrib/xz/src/liblzma/check/crc64_fast.c | 10 +- contrib/xz/src/liblzma/check/crc_common.h | 19 +- contrib/xz/src/liblzma/common/alone_decoder.c | 6 +- contrib/xz/src/liblzma/common/filter_common.c | 4 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 3 +- contrib/xz/src/liblzma/common/outqueue.h | 1 + contrib/xz/src/liblzma/common/stream_decoder_mt.c | 79 +- contrib/xz/src/liblzma/common/vli_decoder.c | 2 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 4 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 11 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 6 +- contrib/xz/src/liblzma/validate_map.sh | 4 +- contrib/xz/src/xz/args.c | 1 - contrib/xz/src/xz/file_io.c | 3 +- contrib/xz/src/xz/hardware.c | 72 + contrib/xz/src/xz/list.c | 2 + contrib/xz/src/xz/message.h | 4 + contrib/xz/src/xz/sandbox.c | 26 +- contrib/xz/src/xz/signals.c | 17 +- contrib/xz/src/xz/util.c | 4 + contrib/xz/src/xz/xz.1 | 9 +- contrib/xz/src/xzdec/xzdec.c | 2 +- lib/liblzma/config.h | 12 +- 33 files changed, 2072 insertions(+), 326 deletions(-) diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 577dce5e12a2..bd7fad97695d 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,3 +1,1589 @@ +commit 3d078b52adbff566ccfc51067dfbf742ecf3ef86 +Author: Lasse Collin +Date: 2025-12-17 13:36:42 +0200 + + Bump version and soname for 5.8.2 + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit fb14afd5c9bf14d8c67ee11e4139885072071ddd +Author: Lasse Collin +Date: 2025-12-17 13:36:35 +0200 + + Add NEWS for 5.8.2 + + NEWS | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +commit 590f4713b29f0236ab944487f40069355a515dbc +Author: Lasse Collin +Date: 2025-12-16 11:30:35 +0200 + + CMake: Bump maximum policy version to 4.2 + + CMP0186 is curious but we aren't affected. + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 26d22ed16b6e38ce8ed45cb29076f454cd488762 +Author: Lasse Collin +Date: 2025-12-10 19:20:05 +0200 + + tuklib_integer/CMake: Log a message about unaligned access check + + cmake/tuklib_integer.cmake | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f7381cf927576164c17be4e4c1edeec3cdaca7cf +Author: Lasse Collin +Date: 2025-12-10 19:11:27 +0200 + + tuklib_integer/CMake: Don't run unaligned access checks unnecessarily + + If the cache variable TUKLIB_FAST_UNALIGNED_ACCESS is already set, + the autodetection result isn't needed because the option() command + does nothing when the cache variable is already set. + + This is largely white space change to indent the if...endif block. + + cmake/tuklib_integer.cmake | 226 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 109 deletions(-) + +commit dc1a421ce35f10b9a0c00d1bd42f1fdac0c3e9eb +Author: Lasse Collin +Date: 2025-12-10 16:49:55 +0200 + + tuklib_integer: Use CMAKE_C_COMPILER_ARCHITECTURE_ID when available + + CMake >= 4.1 sets CMAKE__COMPILER_ARCHITECTURE_ID on many + platforms. The list of possible values are documented. Use this + variable when available. On older CMake versions CMAKE_SYSTEM_PROCESSOR + is still used, thus the regexes have to include values like ^amd64 still. + + With old CMake versions, checking CMAKE_C_COMPILER_ARCHITECTURE_ID + is somewhat useful with MSVC because CMAKE_SYSTEM_PROCESSOR might + not match the target architecture. + + cmake/tuklib_integer.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit c690101dddd784b75224a8935f56cd163d3e90a3 +Author: Lasse Collin +Date: 2025-12-10 16:49:55 +0200 + + tuklib_integer: Autodetect when -mstrict-align is used with GCC on ARM64 + + On ARM64, support for fast unaligned memory access was autodetected by + checking if __ARM_FEATURE_UNALIGNED is defined. However, at least GCC + versions up to 15.2.0 define the macro even when -mstrict-align has + been specified. Thus, autodetection with GCC doesn't work correctly, + and binaries built using -mstrict-align can be much slower than they + need to be, unless the user also passes --disable-unaligned-access + to configure or -DTUKLIB_FAST_UNALIGNED_ACCESS=OFF to cmake. + + See the GCC bug: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111555 + + Workaround the issue by using heuristics with GCC on ARM64. + + With Clang, the detection using __ARM_FEATURE_UNALIGNED works. + It also works with GCC on 32-bit ARM. + + Fixes: e5f13a66567b ("tuklib_integer: Autodetect support for unaligned access on ARM.") + + cmake/tuklib_integer.cmake | 63 ++++++++++++++++++++++++++++++------- + m4/tuklib_integer.m4 | 78 +++++++++++++++++++++++++++++++++++----------- + 2 files changed, 110 insertions(+), 31 deletions(-) + +commit d9b318f5b8a3524e90ac17471e79db7de012caf5 +Author: Lasse Collin +Date: 2025-12-09 18:02:23 +0200 + + CI: Update MSYS2 + + .github/workflows/msys2.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 700e32f1b7dd6d674f12bbdabc35a3bc4a2860f5 +Author: Lasse Collin +Date: 2025-12-09 18:02:05 +0200 + + CI: Update DragonFly BSD + + .github/workflows/dragonflybsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a7b749389c64dfbee1c29d88e61e71186b472784 +Author: Lasse Collin +Date: 2025-12-09 17:58:52 +0200 + + CI: Update Solaris + + .github/workflows/solaris.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0b3c6ee0ab3243e48291e5f9b6333c3d052311d +Author: Lasse Collin +Date: 2025-12-09 17:56:58 +0200 + + CI: Update NetBSD + + .github/workflows/netbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fbc1046248cfe3c730437ba7d98dde89b0eced3e +Author: Lasse Collin +Date: 2025-12-09 17:54:54 +0200 + + CI: Update OpenBSD + + .github/workflows/openbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f0579ba5650bbbfa88a04adf8115b8fb4aff476 +Author: Lasse Collin +Date: 2025-12-09 17:52:01 +0200 + + CI: Update FreeBSD + + .github/workflows/freebsd.yml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f8424b0416266c393c84a315e3bdedbc19efa0a8 +Author: Lasse Collin +Date: 2025-12-09 17:40:05 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit c4340692d4490ff80e897d4840fadc033c46d81a +Author: Lasse Collin +Date: 2025-12-09 13:01:36 +0200 + + Translations: Add src/xz/sandbox.c to POTFILES.in + + There are no strings to translate in that file now, but it's good to + list it anyway in case translatable strings are added in the future. + + Fixes: 374868d81d47 ("xz: Move sandboxing code to sandbox.c and improve Landlock sandbox.") + + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) + +commit b8af36920b0857c0329f61414df5989093386db1 +Author: Lasse Collin +Date: 2025-12-09 12:55:45 +0200 + + xz: Never translate "Failed to enable the sandbox" + + This was already the case in practice because I had forgotten to list + src/xz/sandbox.c in po/POTFILES.in. However, it seems better to never + translate this particular error message. It should almost never occur + and if it does, an untranslated message is should make it easier to + find bug reports about it. + + src/xz/sandbox.c | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +commit 5a7fc1af3d9ec115f796cba110eb78e63ff1df5c +Author: Lasse Collin +Date: 2025-12-09 12:27:15 +0200 + + Translations: Update the Swedish man page translations + + po4a/sv.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 88531e5463d9f028387a11b78d53c9c269e6a3a0 +Author: Lasse Collin +Date: 2025-12-09 12:26:24 +0200 + + Translations: Update the Romanian man page translations + + po4a/ro.po | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit 8a817277192e6379a8c6f2eefbaed65c6b7d92fa +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 1ec43aa7810d159ed76a6188b17c0bb474ca5ab5 +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + CMake: Autodetect unaligned access support on LoongArch + + This still relies on CMAKE_SYSTEM_PROCESSOR. CMake 4.1 added more + CMAKE__COMPILER_ARCHITECTURE_ID values to detect the arch in + a more defined manner, but 4.1 is too new to require for now. + + Thanks-to: Li Chenggang + Closes: https://github.com/tukaani-project/xz/pull/186 + + cmake/tuklib_integer.cmake | 81 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 81 insertions(+) + +commit 7971566247914ec1854b125ff99c2a617f5c1e3a +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + Autotools: Autodetect unaligned access support on LoongArch + + According to [1] sections 7.4, 8.1, and 8.2, desktop and server + processors support fast unaligned access, but embedded systems likely + don't. + + It's important that TUKLIB_FAST_UNALIGNED_ACCESS isn't defined when + -mstrict-align is in use because it will result in slower binaries + even if running on a processor that supports fast unaligned access. + It's because compilers will translate multibyte memcpy() to multiple + byte-by-byte instructions instead of wider loads and stores. The + compression times from [2] show this well: + + Unaligned access CFLAGS Compression time + enabled -O2 -mno-strict-align 66.1 s + disabled -O2 -mno-strict-align 79.5 s + disabled -O2 -mstrict-align 79.9 s + enabled -O2 -mstrict-align 129.1 s + + There currently (GCC 15.2) is no preprocessor macro on LoongArch + to detect if -mstrict-align or -mno-strict-align is in effect (the + default is -mno-strict-align). Use heuristics to detect which of the + flags is in effect. + + [1] https://github.com/loongson/la-softdev-convention/blob/v0.2/la-softdev-convention.adoc + [2] https://github.com/tukaani-project/xz/pull/186#issuecomment-3494570304 + + Thanks-to: Li Chenggang + Thanks-to: Xi Ruoyao + See: https://github.com/tukaani-project/xz/pull/186 + + m4/tuklib_integer.m4 | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +commit 338f952c0039b153a1fbdf6a535c4bd6a61f33cd +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + xz: Silence clang -Wunreachable-code-break + + Fixes: a165d7df1964 ("xz: Add a new --filters-help option.") + + src/xz/args.c | 1 - + 1 file changed, 1 deletion(-) + +commit 723cee44d076281bce9c3d7bd2c17b0680bd8884 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + liblzma: Remove unwanted semicolons + + These didn't affect control flow. + + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/lzma/lzma_common.h | 4 ++-- + src/liblzma/rangecoder/range_decoder.h | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 524f6a7384f15e52ec13c72adbdf18ddeecbc735 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + Tests: Remove an unwanted semicolon from a macro definition + + It didn't affect control flow. + + Fixes: fe3bd438fb11 ("Tests: Fix memory leaks in test_block_header.") + + tests/test_block_header.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f41a28bfab98d1f5171ee5c9da6dfdc15f62549 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + Build: Use -Wextra-semi-stmt when supported + + CMakeLists.txt | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +commit 91170c8cab72b94a697f5228f4df13483ef5be91 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + CI: Add clang-cl + + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-3577456136 + + .github/workflows/msvc.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit a3c6cb09113de978b971cbdacf5c4890d4237c28 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + xz/Windows: Add a missing #include to fix the build with clang-cl + + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-1986829734 + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-3577456136 + + src/xz/util.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c410ccc62511ec95b20639defb10650ef9b75e8c +Author: Lasse Collin +Date: 2025-11-25 21:05:37 +0200 + + xz: Check return value of sigaction() before calling raise() + + Fixes: Coverity CID 456022 + + src/xz/signals.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 6cc2da0a4b180b71cb6e781c897052def103ad3e +Author: Lasse Collin +Date: 2025-11-02 12:57:00 +0200 + + liblzma: Refactor a loop in lzma_filters_copy() + + Arguably it's nicer if i doesn't wrap around when the loop terminates. + + Fixes: Coverity CID 464589 + Fixes: 6d118a0b9def ("Add lzma_filters_copy().") + + src/liblzma/common/filter_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 90b67853d57562c5ad4fdb3215ceb9b9bd3958bf +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + liblzma: Silence two Coverity warnings + + lzma_lzma_decoder_memusage() returns UINT64_MAX if lc/lp/pb aren't + valid. alone_decoder.c and lzip_decoder.c didn't check the return + value because in both it is known that lc/lp/pb are valid. Make them + call the _nocheck() variant instead which skips the validation (it + already existed for LZMA2's internal use). + + Fixes: Coverity CID 464658 + Fixes: Coverity CID 897069 + + src/liblzma/common/alone_decoder.c | 6 ++++-- + src/liblzma/common/lzip_decoder.c | 3 ++- + src/liblzma/lzma/lzma_decoder.h | 11 ++++++----- + 3 files changed, 12 insertions(+), 8 deletions(-) + +commit be365b701024b9acbfef4035c6433a0fbb4be823 +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + liblzma: Fix a harmless read of shared variable without mutex + + The partial_update_mode enumeration had three states, _DISABLED, + _START, and _ENABLED. Main thread changed it from _DISABLED to _START + while holding a mutex. Once set to _START, worker thread changed it + to _ENABLED without a mutex. Later main thread read it without a mutex, + so it could see either _START or _ENABLED. However, it made no + difference because the main thread checked for != _DISABLED, so + it didn't matter if it saw _START or _ENABLED. + + Nevertheless, such things must not be done. It's clear it was a mistake + because there were two comments that directly contradicted each + other about how the variable was accessed. + + Split the enumeration into two booleans: + + - partial_update_enabled: A worker thread locks the mutex to read + this variable and the main thread locks the mutex to change the + value. Because only the main thread modifies the variable, the + main thread can read the value without locking the mutex. + This variable replaces the _DISABLED -> _START transition. + + - partial_update_started is for worker thread's internal use and thus + needs no mutex. This replaces the _START -> _ENABLED transition. + + Fixes: Coverity CID 456025 + Fixes: bd93b776c1bd ("liblzma: Fix a deadlock in threaded decoder.") + + src/liblzma/common/stream_decoder_mt.c | 79 +++++++++++++++------------------- + 1 file changed, 34 insertions(+), 45 deletions(-) + +commit 2686554da0103580a472919220931c397b1d1f7a +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + CI: Add Coverity Scan + + Co-authored-by: Lasse Collin + Fixes: https://github.com/tukaani-project/xz/issues/198 + + .github/workflows/coverity.yml | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 1b30734c9c08a3f628574d172f1a6034277a2163 +Author: Lasse Collin +Date: 2025-11-25 13:55:35 +0200 + + Change the sorting order in THANKS + + In short, sort the names with this command (-k1,1 isn't needed because + the lines with names start with " -"): + + LC_ALL=en_US.UTF-8 sort -k2,2 -k3,3 -k4,4 -k5,5 + + When THANKS was created, I wrote the names as "First Last" and attempted + to keep them sorted by last name / surname / family name. This works + with many names in THANKS, but it becomes complicated with names that + don't fit that pattern. For example, names that are written as + "Last First" can be manually sorted by family name, but only if one + knows which part of the name is the family name.[*] And of course, + the concept of first/last name doesn't apply to all names. + + [*] xz had a co-maintainer who could help me with such names, + but fortunately he isn't working on the project anymore. + + Adding the names in chronological order could have worked too, although + if something is contributed by multiple people, one would still have to + decide how to sort the names within the batch. Another downside would + be that if THANKS is updated in more than one work-in-progress branch, + merge conflicts would occur more often. + + Don't attempt to sort by last name. Let's be happy that people tend to + provide names that can be expressed in a reasonable number of printable + Unicode characters. In practice, people have been even nicer: if the + native language doesn't use a Latin script alphabet, people often provide + a transliterated name (only or in addition to the original spelling), + which is very much appreciated by those who don't know the native script. + + Treat the names as opaque strings or space-separated strings for sorting + purposes. This means that most names will now be sorted by first name. + There still are many choices how to sort: + + (1) LC_ALL=en_US.UTF-8 sort + + The project is in English, so this may sound like a logical choice. + However, spaces have a lower weight than letters, which results in + this order: + + - A Ba + - Ab C + - A Bc + - A Bd + + (2) LC_ALL=en_US.UTF-8 sort -k2,2 + + This first sorts by the first word and then by the rest of the + string. It's -k2,2 instead of -k1,1 to skip the leading dash. + + - A Ba + - A Bc + - A Bd + - Ab C + + I like this more than (1). One could add -k3,3 -k4,4 -k5,5 ... too. + With current THANKS it makes no difference but it might some day. + + NOTE: The ordering in en_US.UTF-8 can differ between libc versions + and operating systems. Luckily it's not a big deal in THANKS. + + (3) LC_ALL=en_US.UTF-8 sort -f -k2,2 + + Passing -f (--ignore-case) to sort affects sorting of single-byte + characters but not multibyte characters (GNU coreutils 9.9): + + No -f With -f LC_ALL=C + Aa A.A A.A + A.A Aa Aa + Ää Ää Ä.Ä + Ä.Ä Ä.Ä Ää + + In GNU coreutils, the THANKS file is sorted using "sort -f -k1,1". + There is also a basic check that the en_US.UTF-8 locale is + behaving as expected. + + (4) LC_ALL=C sort + + This sorts by byte order which in UTF-8 is the same as Unicode + code point order. With the strings in (1) and (2), this produces + the same result as in (2). The difference in (3) can be seen above. + + The results differ from en_US.UTF-8 when a name component starts + with a lower case ASCII letter (like "von" or "de"). Worse, any + non-ASCII characters sort after ASCII chars. These properties might + look weird in English language text, although it's good to remember + that en_US.UTF-8 sorting can appear weird too if one's native + language isn't English. + + The choice between (2) and (4) was difficult but I went with (2). + + ;-) + + THANKS | 414 ++++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 207 insertions(+), 207 deletions(-) + +commit 8bb516887c1912106a72db96216cab46954e6190 +Author: Lasse Collin +Date: 2025-11-23 20:39:28 +0200 + + Landlock: Add missing #ifdefs + + The build was broken on distros that have an old . + + Fixes: 2b2652e914b1 ("Landlock: Workaround a bug in RHEL 9 kernel") + + src/common/my_landlock.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 23c95c6a7c374962103dbd35cb79fdd5a6fe8b52 +Author: Lasse Collin +Date: 2025-11-23 20:13:50 +0200 + + Update THANKS + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2b2652e914b1c38d4c009a8dcac11dfee9c7e008 +Author: Lasse Collin +Date: 2025-11-23 20:13:49 +0200 + + Landlock: Workaround a bug in RHEL 9 kernel + + If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container + on RHEL 9, xz will fail with the message "Failed to enable the sandbox". + + RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support + Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. + The issue is still present in 5.14.0-643.el9 (2025-11-22). Red Hat is + aware of the issue, but I don't know when it will be fixed. + + The sandbox is meant to be transparent to users, thus there isn't and + won't be a command line option to disable it. Instead, add a workaround + to keep xz working on the buggy RHEL 9 kernels. + + Reported-by: Richard W.M. Jones + Thanks-to: Pavel Raiskup + Tested-by: Orgad Shaneh + Tested-by: Richard W.M. Jones + Fixes: https://github.com/tukaani-project/xz/issues/199 + Link: https://issues.redhat.com/browse/RHEL-125143 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105 + Link: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/65BDSY56R5ZJRTUC4B6CIVCVLY4LG4ME/ + + src/common/my_landlock.h | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +commit ee75c76958dd891906745125590563ab64e85995 +Author: Lasse Collin +Date: 2025-11-23 20:13:37 +0200 + + Landlock: Cache the ABI version + + In xz it can avoid up to two syscalls that query the ABI version. + + src/common/my_landlock.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit f57b1716cd0853474980c90a892204dee9bdea1a +Author: Lasse Collin +Date: 2025-11-03 14:52:45 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 211cde09236165dbd379644753337be1de64b151 +Author: Lasse Collin +Date: 2025-11-03 12:41:31 +0200 + + mythread.h: Fix the build on Emscripten when threading is disabled + + To make a non-threaded liblzma-only build work with WASI SDK, + and mythread_sigmask() were omitted from mythread.h in the commit + 81db3b889830. This broke non-threaded full build with Emscripten because + src/xz/signals.c needs mythread_sigmask() (liblzma-only build was fine). + + If __wasm__ is defined, omit and mythread_sigmask() in + non-threaded builds only when __EMSCRIPTEN__ isn't defined. + + Reported-by: Marcus Tillmanns + Thanks-to: ChanTsune + Fixes: https://github.com/tukaani-project/xz/issues/161 + Fixes: 81db3b889830 ("mythread.h: Disable signal functions in builds targeting Wasm + WASI.") + + src/common/mythread.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cbf50a99e3f0c2735fd573e166baf37df063b37b +Author: Lasse Collin +Date: 2025-11-03 11:56:32 +0200 + + Translations: Update the Serbian man page translations + + The earlier bug fixes are now included in the Translation Project. + + po4a/sr.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 68d1591187512d8872615c8a904d43073440d93f +Author: Lasse Collin +Date: 2025-11-02 19:40:55 +0200 + + xz: Silence a compiler warning when signals_block_count is unused + + Move the static variable signals_block_count to the #ifndef block + that already has the functions that need the variable. + + src/xz/signals.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit beca015891fbd22657663ec23809184dda0677cd +Author: Lasse Collin +Date: 2025-11-02 17:45:20 +0200 + + xz: Silence a warning from Clang on glibc systems + + Fixes: e8838b2f5922 ("xz: Look at resource limits when determining the default memlimit") + + src/xz/hardware.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 3e394278ed537575b5db43c09989c6ca99f762de +Author: Lasse Collin +Date: 2025-11-02 14:37:52 +0200 + + Translations: Update the Serbian man page translations + + Preserve the bug fixes made in 71ad5e82888f and 4f52e7387012 because + upstream hasn't included them. + + po4a/sr.po | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit ace28e35732fc43f58ea1aac146fdb73084f2548 +Author: Lasse Collin +Date: 2025-11-02 14:27:10 +0200 + + Translations: Update the Korean man page translations + + po4a/ko.po | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit ffd14a099f0d8c92d4f74018d3a52bd2327df4db +Author: Lasse Collin +Date: 2025-11-02 14:24:43 +0200 + + Translations: Update the Italian man page translations + + po4a/it.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 6f3152874ee375b581aa858fccab7865dcbf6403 +Author: Lasse Collin +Date: 2025-11-02 14:12:23 +0200 + + Translations: Update the Ukrainian man page translations + + po4a/uk.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit ef67e051d71938a23713d9782a3f0c470ac51b1e +Author: Lasse Collin +Date: 2025-09-28 18:32:05 +0300 + + liblzma: Fix build on old Linux/glibc on ARM64 + + getauxval() can be available even if HWCAP_CRC32 isn't #defined, so + both have to be checked. HWCAP_CRC32 was added in glibc 2.24 (2016). + + Fixes: https://github.com/tukaani-project/xz/issues/190 + + CMakeLists.txt | 7 +++++++ + configure.ac | 6 +++++- + src/liblzma/check/crc32_arm64.h | 5 +++-- + src/liblzma/check/crc_common.h | 3 ++- + 4 files changed, 17 insertions(+), 4 deletions(-) + +commit 71c2ede383f6dc6661b8a9d844f4bcf81c563643 +Author: Lasse Collin +Date: 2025-10-31 14:36:26 +0200 + + CI: Update Solaris + + .github/workflows/solaris.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02da8de0edddd31a3e9818c2200b97c446d6eb5b +Author: Lasse Collin +Date: 2025-10-31 14:32:47 +0200 + + CI: Update DragonFly BSD + + .github/workflows/dragonflybsd.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 75b18d325f6a993eac2d5f44c7aad941aa20df94 +Author: Lasse Collin +Date: 2025-10-31 14:30:24 +0200 + + CI: Update NetBSD + + .github/workflows/netbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0102072915f38e747ee55aa9c52351dfe81b8c14 +Author: Lasse Collin +Date: 2025-10-31 14:21:37 +0200 + + CI: Update FreeBSD + + .github/workflows/freebsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83419783a67a6097c7d5ed5663734c04eb8c8b55 +Author: Lasse Collin +Date: 2025-10-31 14:17:30 +0200 + + CI: Update OpenBSD + + .github/workflows/openbsd.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3b5f5af9bcd9b5752608a099fcfab331c0c613b3 +Author: Lasse Collin +Date: 2025-10-26 12:07:34 +0200 + + Update THANKS + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit e8838b2f59221f46bf34c79431d286e8ac34fb8b +Author: Kirill A. Korinsky +Date: 2025-10-26 12:07:34 +0200 + + xz: Look at resource limits when determining the default memlimit + + When no memory usage limits have been set by the user, the default + for multithreaded mode has been 1/4 of total RAM. If this limit is + too high and memory allocation fails, liblzma (and xz) fail. Perhaps + liblzma should handle it better by reducing the number of threads + and continuing with the amount of memory it can allocate, but currently + that isn't the case. + + If resource limits were set to about 1/4 of RAM or lower, then xz + could fail for the above reason. This commit makes xz look at + RLIMIT_DATA, RLIMIT_AS, and RLIMIT_VMEM when they are available, + and set the limit 64 MiB below the lowest of those limits. This is + more or less a hack just like the 1/4-of-RAM method is, but this is + simple and quick to implement. + + On Linux, there are other limits like cgroup v2 memory.max which + can still make xz fail. The same is likely possible with FreeBSD's + rctl(8). + + Co-authored-by: Lasse Collin + Thanks-to: Fangrui Song + Fixes: https://github.com/tukaani-project/xz/issues/195 + Closes: https://github.com/tukaani-project/xz/pull/196 + + CMakeLists.txt | 3 +++ + configure.ac | 4 ++-- + src/xz/hardware.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 64 insertions(+), 2 deletions(-) + +commit 8d26b72915e0d373f898b55935505857c30dbdb3 +Author: Lasse Collin +Date: 2025-10-01 12:46:26 +0300 + + CI: Remove windows-2019 (which had VS 2019) + + GitHub has removed the runner image. + + A breakage with CLMUL CRC code occurred with VS 2019 but not 2022, + see b5a5d9e3f702. MS supports VS 2019 for a few more years, so it's + unfortunate that it can no longer be tested on GitHub. + + .github/workflows/msvc.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32412bd2a42fda639765c3046e91f964e286b6d9 +Author: Lasse Collin +Date: 2025-09-29 19:34:58 +0300 + + Update THANKS + + THANKS | 3 +++ + 1 file changed, 3 insertions(+) + +commit eaa150df9803c982adf28d4533c7a4264ea17757 +Author: Lakshmi-Surekha +Date: 2025-07-17 23:27:06 -0500 + + xz: Don't fsync() directories on AIX + + It fails with EBADF. + + Fixes: https://github.com/tukaani-project/xz/issues/188 + Closes: https://github.com/tukaani-project/xz/pull/189 + + src/xz/file_io.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 61b114e92f53b7977aad69f8a7130fc25d8a80e5 +Author: Lasse Collin +Date: 2025-09-29 18:37:19 +0300 + + liblzma: Document that lzma_allocator.free(opaque, NULL) is possible + + It feels better to fix the docs than change the code because this + way newly-written applications will be forced to be compatible with + the lzma_allocator behavior of old liblzma versions. It can matter + if someone builds the application against an older liblzma version. + + Fixes: https://github.com/tukaani-project/xz/issues/183 + + src/liblzma/api/lzma/base.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6d287a3ae90e1b990294f3d5264003d81e853c5e +Author: Simon Josefsson +Date: 2025-08-26 09:41:02 +0200 + + Update GPLv2 and LGPLv2.1 copies from gnu.org + + Closes: https://github.com/tukaani-project/xz/pull/194 + + COPYING.GPLv2 | 9 ++++----- + COPYING.LGPLv2.1 | 9 ++++----- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit 41a421dbadf13af2a59aaafa43836026b83340a7 +Author: Lasse Collin +Date: 2025-05-24 12:07:13 +0300 + + tests/test_suffix.sh: Avoid variables in printf format string + + tests/test_suffix.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a2c6aa8764a2e5248572d461305bd05c5950bf94 +Author: Lasse Collin +Date: 2025-05-24 12:02:09 +0300 + + build-aux/manconv.sh: Add quotes + + build-aux/manconv.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8e4153253eea2b5a9466467b2ce0249e56277c9a +Author: Lasse Collin +Date: 2025-05-24 12:01:35 +0300 + + windows/build.bash: Add quotes + + In this case they aren't needed but it's better style. + + windows/build.bash | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 37a57a926dd1ae6cde1544d8487e27982d2db4a4 +Author: Lasse Collin +Date: 2025-05-24 12:00:13 +0300 + + po4a/update-po: Ensure that a glob won't expand to a command line option + + po4a/update-po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3ba73034a3f8e414882af39d62f479e9717e061 +Author: Lasse Collin +Date: 2025-05-24 11:57:23 +0300 + + liblzma: validate_map.sh: Catch some unlikely errors + + src/liblzma/validate_map.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 067cecdea69067973e44dc1afb9be763faccecb2 +Author: Lasse Collin +Date: 2025-05-24 11:55:59 +0300 + + CI: Catch unsupported arguments in ci_build.bash + + build-aux/ci_build.bash | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4fc6208abebfe6b8c8348c412b4bcc594ae11c88 +Author: Lasse Collin *** 2120 LINES SKIPPED *** From nobody Tue Dec 30 02:20:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgGz11jGpz6MgkK for ; Tue, 30 Dec 2025 02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgGz064rtz3NV8 for ; Tue, 30 Dec 2025 02: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=1767061244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0X5JCmXpLrpfhDjDOzZlni0K4GNg+MNc6TG9GKkgM8=; b=JauzJE57Cs0QUrHSt7Ut3X44I0MszXEhbViE9ZH7yXlmedv7D32pouYWdzxyGMwVSk+J8k RZ6JmXo9mPXLALYgwaKN1rej9R0wZSe8R1ogHJcL1dppiTyUQDzupv+94d6dk4hbr/Mvtx gEvx6P+PzPbTa4uLNN5gKpfYXQFdhoUFDIO0+pZIYc/KN9TOJURfbkF7WoKd1idsbt4/MW VhglGdjHYst6zxHKdpqDcaPGR1uGEjtcyPhx5CwxPQF9imU8j82Ww5vrFybD1GasK7wPFQ 95OKn9HANaQ5yhYGwYRolretnTrSOPB1Hd0yaHNXZF1JYGkmNcv3TQ8GxniuSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767061244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0X5JCmXpLrpfhDjDOzZlni0K4GNg+MNc6TG9GKkgM8=; b=b4ydrBghtiRYBYiFzm2pSLejy9roomueBisoVayWZG+TYZouKeruwmNY+uTj2zG3cS+gnu F7Xa8NqCcO7eTXatMdVKmiQKjDIfZbaF5zkCJ/Bz7UKkOb2HXegfEv9isBMcE15l6+EQ8g C6cfpUT/X8vXNvvW02BZkMzxr9mHB0KgQsmcJbnForR7FL6QanZzm48XSGvg36bM83GYnr 5Q8FqTivaSEuhkm3pCxNO+yloJTJxoeHiT2tAOz7yIb55NAs+khft+NfBfNEYtXaB1y6Vm pzmzLN2pedpt853DYvxcfrqYF3ce9vgFX5/XjGEP6sw/p6ptHxsLBXVx+A7zmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767061244; a=rsa-sha256; cv=none; b=exzlsSuRsWKQBnczEtidHxbAUhqMkYSTY6jbHq0+FlljWxRPYNrSJrXmSpKt8JKGi+n4VH /MtUCsZNCDwVlYYa4kRUNHO96sQI3/2kAZ1ulontxayfV7/Ae7PJlGawqYhwISWKtm9iCD DO4h7NGsZByNz7dz78LTrLFIVKgXgGqWlO18RyZ3NL4BqCEdda8QxJtr61fkHJw6hC1Dnz JlGpxVERLLdy4XU2CrakUwZnwwnMa4WEZ4tcr+yLFTxHITYtxFU1fDVfNNMEJ2W9sOxujA aN11WpQ2HgBFOy94N7E6dn92GTKa6Gso6TfParfuVsrlZeAKibZ4revg0msklQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgGz05gwwzhhM for ; Tue, 30 Dec 2025 02:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c76e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 02:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 07700b0107dc - stable/14 - MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07700b0107dc642b47c78917102b1f059e2af645 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 02:20:44 +0000 Message-Id: <695336fc.3c76e.4d292ad8@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=07700b0107dc642b47c78917102b1f059e2af645 commit 07700b0107dc642b47c78917102b1f059e2af645 Author: Xin LI AuthorDate: 2025-12-23 08:24:13 +0000 Commit: Xin LI CommitDate: 2025-12-30 02:20:31 +0000 MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. (cherry picked from commit ae12432049e7873ab3912643ae5d08297b8cbc49) --- contrib/xz/ChangeLog | 1586 +++++++++++++++++++++ contrib/xz/THANKS | 402 +++--- contrib/xz/doxygen/Doxyfile | 8 +- contrib/xz/src/common/my_landlock.h | 45 +- contrib/xz/src/common/mythread.h | 3 +- contrib/xz/src/liblzma/api/lzma/base.h | 6 +- contrib/xz/src/liblzma/api/lzma/container.h | 38 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 5 +- contrib/xz/src/liblzma/check/crc32_fast.c | 2 +- contrib/xz/src/liblzma/check/crc64_fast.c | 10 +- contrib/xz/src/liblzma/check/crc_common.h | 19 +- contrib/xz/src/liblzma/common/alone_decoder.c | 6 +- contrib/xz/src/liblzma/common/filter_common.c | 4 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 3 +- contrib/xz/src/liblzma/common/outqueue.h | 1 + contrib/xz/src/liblzma/common/stream_decoder_mt.c | 79 +- contrib/xz/src/liblzma/common/vli_decoder.c | 2 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 4 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 11 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 6 +- contrib/xz/src/liblzma/validate_map.sh | 4 +- contrib/xz/src/xz/args.c | 1 - contrib/xz/src/xz/file_io.c | 3 +- contrib/xz/src/xz/hardware.c | 72 + contrib/xz/src/xz/list.c | 2 + contrib/xz/src/xz/message.h | 4 + contrib/xz/src/xz/sandbox.c | 26 +- contrib/xz/src/xz/signals.c | 17 +- contrib/xz/src/xz/util.c | 4 + contrib/xz/src/xz/xz.1 | 9 +- contrib/xz/src/xzdec/xzdec.c | 2 +- lib/liblzma/config.h | 12 +- 33 files changed, 2072 insertions(+), 326 deletions(-) diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 577dce5e12a2..bd7fad97695d 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,3 +1,1589 @@ +commit 3d078b52adbff566ccfc51067dfbf742ecf3ef86 +Author: Lasse Collin +Date: 2025-12-17 13:36:42 +0200 + + Bump version and soname for 5.8.2 + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit fb14afd5c9bf14d8c67ee11e4139885072071ddd +Author: Lasse Collin +Date: 2025-12-17 13:36:35 +0200 + + Add NEWS for 5.8.2 + + NEWS | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +commit 590f4713b29f0236ab944487f40069355a515dbc +Author: Lasse Collin +Date: 2025-12-16 11:30:35 +0200 + + CMake: Bump maximum policy version to 4.2 + + CMP0186 is curious but we aren't affected. + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 26d22ed16b6e38ce8ed45cb29076f454cd488762 +Author: Lasse Collin +Date: 2025-12-10 19:20:05 +0200 + + tuklib_integer/CMake: Log a message about unaligned access check + + cmake/tuklib_integer.cmake | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f7381cf927576164c17be4e4c1edeec3cdaca7cf +Author: Lasse Collin +Date: 2025-12-10 19:11:27 +0200 + + tuklib_integer/CMake: Don't run unaligned access checks unnecessarily + + If the cache variable TUKLIB_FAST_UNALIGNED_ACCESS is already set, + the autodetection result isn't needed because the option() command + does nothing when the cache variable is already set. + + This is largely white space change to indent the if...endif block. + + cmake/tuklib_integer.cmake | 226 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 109 deletions(-) + +commit dc1a421ce35f10b9a0c00d1bd42f1fdac0c3e9eb +Author: Lasse Collin +Date: 2025-12-10 16:49:55 +0200 + + tuklib_integer: Use CMAKE_C_COMPILER_ARCHITECTURE_ID when available + + CMake >= 4.1 sets CMAKE__COMPILER_ARCHITECTURE_ID on many + platforms. The list of possible values are documented. Use this + variable when available. On older CMake versions CMAKE_SYSTEM_PROCESSOR + is still used, thus the regexes have to include values like ^amd64 still. + + With old CMake versions, checking CMAKE_C_COMPILER_ARCHITECTURE_ID + is somewhat useful with MSVC because CMAKE_SYSTEM_PROCESSOR might + not match the target architecture. + + cmake/tuklib_integer.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit c690101dddd784b75224a8935f56cd163d3e90a3 +Author: Lasse Collin +Date: 2025-12-10 16:49:55 +0200 + + tuklib_integer: Autodetect when -mstrict-align is used with GCC on ARM64 + + On ARM64, support for fast unaligned memory access was autodetected by + checking if __ARM_FEATURE_UNALIGNED is defined. However, at least GCC + versions up to 15.2.0 define the macro even when -mstrict-align has + been specified. Thus, autodetection with GCC doesn't work correctly, + and binaries built using -mstrict-align can be much slower than they + need to be, unless the user also passes --disable-unaligned-access + to configure or -DTUKLIB_FAST_UNALIGNED_ACCESS=OFF to cmake. + + See the GCC bug: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111555 + + Workaround the issue by using heuristics with GCC on ARM64. + + With Clang, the detection using __ARM_FEATURE_UNALIGNED works. + It also works with GCC on 32-bit ARM. + + Fixes: e5f13a66567b ("tuklib_integer: Autodetect support for unaligned access on ARM.") + + cmake/tuklib_integer.cmake | 63 ++++++++++++++++++++++++++++++------- + m4/tuklib_integer.m4 | 78 +++++++++++++++++++++++++++++++++++----------- + 2 files changed, 110 insertions(+), 31 deletions(-) + +commit d9b318f5b8a3524e90ac17471e79db7de012caf5 +Author: Lasse Collin +Date: 2025-12-09 18:02:23 +0200 + + CI: Update MSYS2 + + .github/workflows/msys2.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 700e32f1b7dd6d674f12bbdabc35a3bc4a2860f5 +Author: Lasse Collin +Date: 2025-12-09 18:02:05 +0200 + + CI: Update DragonFly BSD + + .github/workflows/dragonflybsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a7b749389c64dfbee1c29d88e61e71186b472784 +Author: Lasse Collin +Date: 2025-12-09 17:58:52 +0200 + + CI: Update Solaris + + .github/workflows/solaris.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0b3c6ee0ab3243e48291e5f9b6333c3d052311d +Author: Lasse Collin +Date: 2025-12-09 17:56:58 +0200 + + CI: Update NetBSD + + .github/workflows/netbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fbc1046248cfe3c730437ba7d98dde89b0eced3e +Author: Lasse Collin +Date: 2025-12-09 17:54:54 +0200 + + CI: Update OpenBSD + + .github/workflows/openbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f0579ba5650bbbfa88a04adf8115b8fb4aff476 +Author: Lasse Collin +Date: 2025-12-09 17:52:01 +0200 + + CI: Update FreeBSD + + .github/workflows/freebsd.yml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f8424b0416266c393c84a315e3bdedbc19efa0a8 +Author: Lasse Collin +Date: 2025-12-09 17:40:05 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit c4340692d4490ff80e897d4840fadc033c46d81a +Author: Lasse Collin +Date: 2025-12-09 13:01:36 +0200 + + Translations: Add src/xz/sandbox.c to POTFILES.in + + There are no strings to translate in that file now, but it's good to + list it anyway in case translatable strings are added in the future. + + Fixes: 374868d81d47 ("xz: Move sandboxing code to sandbox.c and improve Landlock sandbox.") + + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) + +commit b8af36920b0857c0329f61414df5989093386db1 +Author: Lasse Collin +Date: 2025-12-09 12:55:45 +0200 + + xz: Never translate "Failed to enable the sandbox" + + This was already the case in practice because I had forgotten to list + src/xz/sandbox.c in po/POTFILES.in. However, it seems better to never + translate this particular error message. It should almost never occur + and if it does, an untranslated message is should make it easier to + find bug reports about it. + + src/xz/sandbox.c | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +commit 5a7fc1af3d9ec115f796cba110eb78e63ff1df5c +Author: Lasse Collin +Date: 2025-12-09 12:27:15 +0200 + + Translations: Update the Swedish man page translations + + po4a/sv.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 88531e5463d9f028387a11b78d53c9c269e6a3a0 +Author: Lasse Collin +Date: 2025-12-09 12:26:24 +0200 + + Translations: Update the Romanian man page translations + + po4a/ro.po | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit 8a817277192e6379a8c6f2eefbaed65c6b7d92fa +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 1ec43aa7810d159ed76a6188b17c0bb474ca5ab5 +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + CMake: Autodetect unaligned access support on LoongArch + + This still relies on CMAKE_SYSTEM_PROCESSOR. CMake 4.1 added more + CMAKE__COMPILER_ARCHITECTURE_ID values to detect the arch in + a more defined manner, but 4.1 is too new to require for now. + + Thanks-to: Li Chenggang + Closes: https://github.com/tukaani-project/xz/pull/186 + + cmake/tuklib_integer.cmake | 81 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 81 insertions(+) + +commit 7971566247914ec1854b125ff99c2a617f5c1e3a +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + Autotools: Autodetect unaligned access support on LoongArch + + According to [1] sections 7.4, 8.1, and 8.2, desktop and server + processors support fast unaligned access, but embedded systems likely + don't. + + It's important that TUKLIB_FAST_UNALIGNED_ACCESS isn't defined when + -mstrict-align is in use because it will result in slower binaries + even if running on a processor that supports fast unaligned access. + It's because compilers will translate multibyte memcpy() to multiple + byte-by-byte instructions instead of wider loads and stores. The + compression times from [2] show this well: + + Unaligned access CFLAGS Compression time + enabled -O2 -mno-strict-align 66.1 s + disabled -O2 -mno-strict-align 79.5 s + disabled -O2 -mstrict-align 79.9 s + enabled -O2 -mstrict-align 129.1 s + + There currently (GCC 15.2) is no preprocessor macro on LoongArch + to detect if -mstrict-align or -mno-strict-align is in effect (the + default is -mno-strict-align). Use heuristics to detect which of the + flags is in effect. + + [1] https://github.com/loongson/la-softdev-convention/blob/v0.2/la-softdev-convention.adoc + [2] https://github.com/tukaani-project/xz/pull/186#issuecomment-3494570304 + + Thanks-to: Li Chenggang + Thanks-to: Xi Ruoyao + See: https://github.com/tukaani-project/xz/pull/186 + + m4/tuklib_integer.m4 | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +commit 338f952c0039b153a1fbdf6a535c4bd6a61f33cd +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + xz: Silence clang -Wunreachable-code-break + + Fixes: a165d7df1964 ("xz: Add a new --filters-help option.") + + src/xz/args.c | 1 - + 1 file changed, 1 deletion(-) + +commit 723cee44d076281bce9c3d7bd2c17b0680bd8884 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + liblzma: Remove unwanted semicolons + + These didn't affect control flow. + + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/lzma/lzma_common.h | 4 ++-- + src/liblzma/rangecoder/range_decoder.h | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 524f6a7384f15e52ec13c72adbdf18ddeecbc735 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + Tests: Remove an unwanted semicolon from a macro definition + + It didn't affect control flow. + + Fixes: fe3bd438fb11 ("Tests: Fix memory leaks in test_block_header.") + + tests/test_block_header.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f41a28bfab98d1f5171ee5c9da6dfdc15f62549 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + Build: Use -Wextra-semi-stmt when supported + + CMakeLists.txt | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +commit 91170c8cab72b94a697f5228f4df13483ef5be91 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + CI: Add clang-cl + + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-3577456136 + + .github/workflows/msvc.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit a3c6cb09113de978b971cbdacf5c4890d4237c28 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + xz/Windows: Add a missing #include to fix the build with clang-cl + + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-1986829734 + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-3577456136 + + src/xz/util.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c410ccc62511ec95b20639defb10650ef9b75e8c +Author: Lasse Collin +Date: 2025-11-25 21:05:37 +0200 + + xz: Check return value of sigaction() before calling raise() + + Fixes: Coverity CID 456022 + + src/xz/signals.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 6cc2da0a4b180b71cb6e781c897052def103ad3e +Author: Lasse Collin +Date: 2025-11-02 12:57:00 +0200 + + liblzma: Refactor a loop in lzma_filters_copy() + + Arguably it's nicer if i doesn't wrap around when the loop terminates. + + Fixes: Coverity CID 464589 + Fixes: 6d118a0b9def ("Add lzma_filters_copy().") + + src/liblzma/common/filter_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 90b67853d57562c5ad4fdb3215ceb9b9bd3958bf +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + liblzma: Silence two Coverity warnings + + lzma_lzma_decoder_memusage() returns UINT64_MAX if lc/lp/pb aren't + valid. alone_decoder.c and lzip_decoder.c didn't check the return + value because in both it is known that lc/lp/pb are valid. Make them + call the _nocheck() variant instead which skips the validation (it + already existed for LZMA2's internal use). + + Fixes: Coverity CID 464658 + Fixes: Coverity CID 897069 + + src/liblzma/common/alone_decoder.c | 6 ++++-- + src/liblzma/common/lzip_decoder.c | 3 ++- + src/liblzma/lzma/lzma_decoder.h | 11 ++++++----- + 3 files changed, 12 insertions(+), 8 deletions(-) + +commit be365b701024b9acbfef4035c6433a0fbb4be823 +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + liblzma: Fix a harmless read of shared variable without mutex + + The partial_update_mode enumeration had three states, _DISABLED, + _START, and _ENABLED. Main thread changed it from _DISABLED to _START + while holding a mutex. Once set to _START, worker thread changed it + to _ENABLED without a mutex. Later main thread read it without a mutex, + so it could see either _START or _ENABLED. However, it made no + difference because the main thread checked for != _DISABLED, so + it didn't matter if it saw _START or _ENABLED. + + Nevertheless, such things must not be done. It's clear it was a mistake + because there were two comments that directly contradicted each + other about how the variable was accessed. + + Split the enumeration into two booleans: + + - partial_update_enabled: A worker thread locks the mutex to read + this variable and the main thread locks the mutex to change the + value. Because only the main thread modifies the variable, the + main thread can read the value without locking the mutex. + This variable replaces the _DISABLED -> _START transition. + + - partial_update_started is for worker thread's internal use and thus + needs no mutex. This replaces the _START -> _ENABLED transition. + + Fixes: Coverity CID 456025 + Fixes: bd93b776c1bd ("liblzma: Fix a deadlock in threaded decoder.") + + src/liblzma/common/stream_decoder_mt.c | 79 +++++++++++++++------------------- + 1 file changed, 34 insertions(+), 45 deletions(-) + +commit 2686554da0103580a472919220931c397b1d1f7a +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + CI: Add Coverity Scan + + Co-authored-by: Lasse Collin + Fixes: https://github.com/tukaani-project/xz/issues/198 + + .github/workflows/coverity.yml | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 1b30734c9c08a3f628574d172f1a6034277a2163 +Author: Lasse Collin +Date: 2025-11-25 13:55:35 +0200 + + Change the sorting order in THANKS + + In short, sort the names with this command (-k1,1 isn't needed because + the lines with names start with " -"): + + LC_ALL=en_US.UTF-8 sort -k2,2 -k3,3 -k4,4 -k5,5 + + When THANKS was created, I wrote the names as "First Last" and attempted + to keep them sorted by last name / surname / family name. This works + with many names in THANKS, but it becomes complicated with names that + don't fit that pattern. For example, names that are written as + "Last First" can be manually sorted by family name, but only if one + knows which part of the name is the family name.[*] And of course, + the concept of first/last name doesn't apply to all names. + + [*] xz had a co-maintainer who could help me with such names, + but fortunately he isn't working on the project anymore. + + Adding the names in chronological order could have worked too, although + if something is contributed by multiple people, one would still have to + decide how to sort the names within the batch. Another downside would + be that if THANKS is updated in more than one work-in-progress branch, + merge conflicts would occur more often. + + Don't attempt to sort by last name. Let's be happy that people tend to + provide names that can be expressed in a reasonable number of printable + Unicode characters. In practice, people have been even nicer: if the + native language doesn't use a Latin script alphabet, people often provide + a transliterated name (only or in addition to the original spelling), + which is very much appreciated by those who don't know the native script. + + Treat the names as opaque strings or space-separated strings for sorting + purposes. This means that most names will now be sorted by first name. + There still are many choices how to sort: + + (1) LC_ALL=en_US.UTF-8 sort + + The project is in English, so this may sound like a logical choice. + However, spaces have a lower weight than letters, which results in + this order: + + - A Ba + - Ab C + - A Bc + - A Bd + + (2) LC_ALL=en_US.UTF-8 sort -k2,2 + + This first sorts by the first word and then by the rest of the + string. It's -k2,2 instead of -k1,1 to skip the leading dash. + + - A Ba + - A Bc + - A Bd + - Ab C + + I like this more than (1). One could add -k3,3 -k4,4 -k5,5 ... too. + With current THANKS it makes no difference but it might some day. + + NOTE: The ordering in en_US.UTF-8 can differ between libc versions + and operating systems. Luckily it's not a big deal in THANKS. + + (3) LC_ALL=en_US.UTF-8 sort -f -k2,2 + + Passing -f (--ignore-case) to sort affects sorting of single-byte + characters but not multibyte characters (GNU coreutils 9.9): + + No -f With -f LC_ALL=C + Aa A.A A.A + A.A Aa Aa + Ää Ää Ä.Ä + Ä.Ä Ä.Ä Ää + + In GNU coreutils, the THANKS file is sorted using "sort -f -k1,1". + There is also a basic check that the en_US.UTF-8 locale is + behaving as expected. + + (4) LC_ALL=C sort + + This sorts by byte order which in UTF-8 is the same as Unicode + code point order. With the strings in (1) and (2), this produces + the same result as in (2). The difference in (3) can be seen above. + + The results differ from en_US.UTF-8 when a name component starts + with a lower case ASCII letter (like "von" or "de"). Worse, any + non-ASCII characters sort after ASCII chars. These properties might + look weird in English language text, although it's good to remember + that en_US.UTF-8 sorting can appear weird too if one's native + language isn't English. + + The choice between (2) and (4) was difficult but I went with (2). + + ;-) + + THANKS | 414 ++++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 207 insertions(+), 207 deletions(-) + +commit 8bb516887c1912106a72db96216cab46954e6190 +Author: Lasse Collin +Date: 2025-11-23 20:39:28 +0200 + + Landlock: Add missing #ifdefs + + The build was broken on distros that have an old . + + Fixes: 2b2652e914b1 ("Landlock: Workaround a bug in RHEL 9 kernel") + + src/common/my_landlock.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 23c95c6a7c374962103dbd35cb79fdd5a6fe8b52 +Author: Lasse Collin +Date: 2025-11-23 20:13:50 +0200 + + Update THANKS + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2b2652e914b1c38d4c009a8dcac11dfee9c7e008 +Author: Lasse Collin +Date: 2025-11-23 20:13:49 +0200 + + Landlock: Workaround a bug in RHEL 9 kernel + + If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container + on RHEL 9, xz will fail with the message "Failed to enable the sandbox". + + RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support + Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. + The issue is still present in 5.14.0-643.el9 (2025-11-22). Red Hat is + aware of the issue, but I don't know when it will be fixed. + + The sandbox is meant to be transparent to users, thus there isn't and + won't be a command line option to disable it. Instead, add a workaround + to keep xz working on the buggy RHEL 9 kernels. + + Reported-by: Richard W.M. Jones + Thanks-to: Pavel Raiskup + Tested-by: Orgad Shaneh + Tested-by: Richard W.M. Jones + Fixes: https://github.com/tukaani-project/xz/issues/199 + Link: https://issues.redhat.com/browse/RHEL-125143 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105 + Link: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/65BDSY56R5ZJRTUC4B6CIVCVLY4LG4ME/ + + src/common/my_landlock.h | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +commit ee75c76958dd891906745125590563ab64e85995 +Author: Lasse Collin +Date: 2025-11-23 20:13:37 +0200 + + Landlock: Cache the ABI version + + In xz it can avoid up to two syscalls that query the ABI version. + + src/common/my_landlock.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit f57b1716cd0853474980c90a892204dee9bdea1a +Author: Lasse Collin +Date: 2025-11-03 14:52:45 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 211cde09236165dbd379644753337be1de64b151 +Author: Lasse Collin +Date: 2025-11-03 12:41:31 +0200 + + mythread.h: Fix the build on Emscripten when threading is disabled + + To make a non-threaded liblzma-only build work with WASI SDK, + and mythread_sigmask() were omitted from mythread.h in the commit + 81db3b889830. This broke non-threaded full build with Emscripten because + src/xz/signals.c needs mythread_sigmask() (liblzma-only build was fine). + + If __wasm__ is defined, omit and mythread_sigmask() in + non-threaded builds only when __EMSCRIPTEN__ isn't defined. + + Reported-by: Marcus Tillmanns + Thanks-to: ChanTsune + Fixes: https://github.com/tukaani-project/xz/issues/161 + Fixes: 81db3b889830 ("mythread.h: Disable signal functions in builds targeting Wasm + WASI.") + + src/common/mythread.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cbf50a99e3f0c2735fd573e166baf37df063b37b +Author: Lasse Collin +Date: 2025-11-03 11:56:32 +0200 + + Translations: Update the Serbian man page translations + + The earlier bug fixes are now included in the Translation Project. + + po4a/sr.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 68d1591187512d8872615c8a904d43073440d93f +Author: Lasse Collin +Date: 2025-11-02 19:40:55 +0200 + + xz: Silence a compiler warning when signals_block_count is unused + + Move the static variable signals_block_count to the #ifndef block + that already has the functions that need the variable. + + src/xz/signals.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit beca015891fbd22657663ec23809184dda0677cd +Author: Lasse Collin +Date: 2025-11-02 17:45:20 +0200 + + xz: Silence a warning from Clang on glibc systems + + Fixes: e8838b2f5922 ("xz: Look at resource limits when determining the default memlimit") + + src/xz/hardware.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 3e394278ed537575b5db43c09989c6ca99f762de +Author: Lasse Collin +Date: 2025-11-02 14:37:52 +0200 + + Translations: Update the Serbian man page translations + + Preserve the bug fixes made in 71ad5e82888f and 4f52e7387012 because + upstream hasn't included them. + + po4a/sr.po | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit ace28e35732fc43f58ea1aac146fdb73084f2548 +Author: Lasse Collin +Date: 2025-11-02 14:27:10 +0200 + + Translations: Update the Korean man page translations + + po4a/ko.po | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit ffd14a099f0d8c92d4f74018d3a52bd2327df4db +Author: Lasse Collin +Date: 2025-11-02 14:24:43 +0200 + + Translations: Update the Italian man page translations + + po4a/it.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 6f3152874ee375b581aa858fccab7865dcbf6403 +Author: Lasse Collin +Date: 2025-11-02 14:12:23 +0200 + + Translations: Update the Ukrainian man page translations + + po4a/uk.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit ef67e051d71938a23713d9782a3f0c470ac51b1e +Author: Lasse Collin +Date: 2025-09-28 18:32:05 +0300 + + liblzma: Fix build on old Linux/glibc on ARM64 + + getauxval() can be available even if HWCAP_CRC32 isn't #defined, so + both have to be checked. HWCAP_CRC32 was added in glibc 2.24 (2016). + + Fixes: https://github.com/tukaani-project/xz/issues/190 + + CMakeLists.txt | 7 +++++++ + configure.ac | 6 +++++- + src/liblzma/check/crc32_arm64.h | 5 +++-- + src/liblzma/check/crc_common.h | 3 ++- + 4 files changed, 17 insertions(+), 4 deletions(-) + +commit 71c2ede383f6dc6661b8a9d844f4bcf81c563643 +Author: Lasse Collin +Date: 2025-10-31 14:36:26 +0200 + + CI: Update Solaris + + .github/workflows/solaris.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02da8de0edddd31a3e9818c2200b97c446d6eb5b +Author: Lasse Collin +Date: 2025-10-31 14:32:47 +0200 + + CI: Update DragonFly BSD + + .github/workflows/dragonflybsd.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 75b18d325f6a993eac2d5f44c7aad941aa20df94 +Author: Lasse Collin +Date: 2025-10-31 14:30:24 +0200 + + CI: Update NetBSD + + .github/workflows/netbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0102072915f38e747ee55aa9c52351dfe81b8c14 +Author: Lasse Collin +Date: 2025-10-31 14:21:37 +0200 + + CI: Update FreeBSD + + .github/workflows/freebsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83419783a67a6097c7d5ed5663734c04eb8c8b55 +Author: Lasse Collin +Date: 2025-10-31 14:17:30 +0200 + + CI: Update OpenBSD + + .github/workflows/openbsd.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3b5f5af9bcd9b5752608a099fcfab331c0c613b3 +Author: Lasse Collin +Date: 2025-10-26 12:07:34 +0200 + + Update THANKS + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit e8838b2f59221f46bf34c79431d286e8ac34fb8b +Author: Kirill A. Korinsky +Date: 2025-10-26 12:07:34 +0200 + + xz: Look at resource limits when determining the default memlimit + + When no memory usage limits have been set by the user, the default + for multithreaded mode has been 1/4 of total RAM. If this limit is + too high and memory allocation fails, liblzma (and xz) fail. Perhaps + liblzma should handle it better by reducing the number of threads + and continuing with the amount of memory it can allocate, but currently + that isn't the case. + + If resource limits were set to about 1/4 of RAM or lower, then xz + could fail for the above reason. This commit makes xz look at + RLIMIT_DATA, RLIMIT_AS, and RLIMIT_VMEM when they are available, + and set the limit 64 MiB below the lowest of those limits. This is + more or less a hack just like the 1/4-of-RAM method is, but this is + simple and quick to implement. + + On Linux, there are other limits like cgroup v2 memory.max which + can still make xz fail. The same is likely possible with FreeBSD's + rctl(8). + + Co-authored-by: Lasse Collin + Thanks-to: Fangrui Song + Fixes: https://github.com/tukaani-project/xz/issues/195 + Closes: https://github.com/tukaani-project/xz/pull/196 + + CMakeLists.txt | 3 +++ + configure.ac | 4 ++-- + src/xz/hardware.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 64 insertions(+), 2 deletions(-) + +commit 8d26b72915e0d373f898b55935505857c30dbdb3 +Author: Lasse Collin +Date: 2025-10-01 12:46:26 +0300 + + CI: Remove windows-2019 (which had VS 2019) + + GitHub has removed the runner image. + + A breakage with CLMUL CRC code occurred with VS 2019 but not 2022, + see b5a5d9e3f702. MS supports VS 2019 for a few more years, so it's + unfortunate that it can no longer be tested on GitHub. + + .github/workflows/msvc.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32412bd2a42fda639765c3046e91f964e286b6d9 +Author: Lasse Collin +Date: 2025-09-29 19:34:58 +0300 + + Update THANKS + + THANKS | 3 +++ + 1 file changed, 3 insertions(+) + +commit eaa150df9803c982adf28d4533c7a4264ea17757 +Author: Lakshmi-Surekha +Date: 2025-07-17 23:27:06 -0500 + + xz: Don't fsync() directories on AIX + + It fails with EBADF. + + Fixes: https://github.com/tukaani-project/xz/issues/188 + Closes: https://github.com/tukaani-project/xz/pull/189 + + src/xz/file_io.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 61b114e92f53b7977aad69f8a7130fc25d8a80e5 +Author: Lasse Collin +Date: 2025-09-29 18:37:19 +0300 + + liblzma: Document that lzma_allocator.free(opaque, NULL) is possible + + It feels better to fix the docs than change the code because this + way newly-written applications will be forced to be compatible with + the lzma_allocator behavior of old liblzma versions. It can matter + if someone builds the application against an older liblzma version. + + Fixes: https://github.com/tukaani-project/xz/issues/183 + + src/liblzma/api/lzma/base.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6d287a3ae90e1b990294f3d5264003d81e853c5e +Author: Simon Josefsson +Date: 2025-08-26 09:41:02 +0200 + + Update GPLv2 and LGPLv2.1 copies from gnu.org + + Closes: https://github.com/tukaani-project/xz/pull/194 + + COPYING.GPLv2 | 9 ++++----- + COPYING.LGPLv2.1 | 9 ++++----- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit 41a421dbadf13af2a59aaafa43836026b83340a7 +Author: Lasse Collin +Date: 2025-05-24 12:07:13 +0300 + + tests/test_suffix.sh: Avoid variables in printf format string + + tests/test_suffix.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a2c6aa8764a2e5248572d461305bd05c5950bf94 +Author: Lasse Collin +Date: 2025-05-24 12:02:09 +0300 + + build-aux/manconv.sh: Add quotes + + build-aux/manconv.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8e4153253eea2b5a9466467b2ce0249e56277c9a +Author: Lasse Collin +Date: 2025-05-24 12:01:35 +0300 + + windows/build.bash: Add quotes + + In this case they aren't needed but it's better style. + + windows/build.bash | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 37a57a926dd1ae6cde1544d8487e27982d2db4a4 +Author: Lasse Collin +Date: 2025-05-24 12:00:13 +0300 + + po4a/update-po: Ensure that a glob won't expand to a command line option + + po4a/update-po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3ba73034a3f8e414882af39d62f479e9717e061 +Author: Lasse Collin +Date: 2025-05-24 11:57:23 +0300 + + liblzma: validate_map.sh: Catch some unlikely errors + + src/liblzma/validate_map.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 067cecdea69067973e44dc1afb9be763faccecb2 +Author: Lasse Collin +Date: 2025-05-24 11:55:59 +0300 + + CI: Catch unsupported arguments in ci_build.bash + + build-aux/ci_build.bash | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4fc6208abebfe6b8c8348c412b4bcc594ae11c88 +Author: Lasse Collin *** 2120 LINES SKIPPED *** From nobody Tue Dec 30 02:21:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgGzn6ZTFz6MgZb for ; Tue, 30 Dec 2025 02:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgGzn6KQ0z3NsS for ; Tue, 30 Dec 2025 02:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767061285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QddvX5/oWpK0r46xFEoq/L5TBWQ5dxKwfJw4l6jwr4I=; b=FkVP3722UCOGCZUChHBSSXQD4RNlr9clAOtIjuDVoz0kB+puLvrMX86AEDpZZox9bkFRJl lWg0yaq58g37C8yigElPan0+A/K0u65Xnl25/lTIPJfPOZp8CWSM2Mx37EZDPmQx46GXbx HF/3YIYV+i3e10JUT04iUcq10MkTKe2iKxTTkJcxvVMaoWonswRpKGBXJVwzCzXWHi2/Sl ZVgq+hqBZw/qW7oEeaxaCoTLf/B6rADfvHHAAVJduKMw3O1i4wEkFVQWTQzI8+bL4QJKZu P3iQbT22G9VXkyyfHH7aJ401fkU7gzI+HV9/MxOTyqeAbFvyctT+7k+urM5Cfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767061285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QddvX5/oWpK0r46xFEoq/L5TBWQ5dxKwfJw4l6jwr4I=; b=YmatBMj/viQF+6ByKhUOoRI6HZlkhGn0sh4+qRVx4Ju4tgxl2h0y30OqkPJDOFi9/WLuae MDO+7pBWQp5DJlT0GJ4LGZa7ONlqNjk+YruBX4PnlbyYZxu4cBvAeyZfJ8SXAvfTUh+o2A Cq5NOmrRSjPZBP5Nzy7GCT/XnMNt52cuggT9AYr0y9XzmGbegAKbwMMyEPwUk1O3kU3a/l QlPHOdPU+oEsJ/7AEUn+wCDNS7Nc5wujePQEk79OmddqYQRe/gykZs6o/YOUb3PczfhD5w 5WoeynffH1+IebXx0wzXoOr3TzM2TcA/4VAPmLdZ8LpblGhe+XYt9rPyLTehFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767061285; a=rsa-sha256; cv=none; b=JeJb+IGzP2EUmTFFHOfeD6/SciPV3xrvADu2UhMJvfOBxuHbgYY44B1NGfHkUgobDuvsEJ wjOCPc3BSZekn5DHp4SjRcKGNdSE09BP9F0l8KOm0HLZikU73alh2K4Lyx4q4EaYVNZDUp Lk0H6xgmHdjw7bdX/rgcYE5oq5/eHFztuZYih0GEQk6DLNmSb3jCd+/uea7hnFftrqemvL C4Z4dQftfPAJOG/tRKIubFHhuoH8g0/dfLFWGNyk0CfwP+gMaPthWWEdoTtWaa4uwcmjtl HPCVIojR69tpCCybXItZ4dmEOKM3rnCDyguNGMvk5yjP+JIp1Pd6aaUhH6GROQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgGzn5tvQzgtx for ; Tue, 30 Dec 2025 02:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d63d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 02:21:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 8b4f1d73496c - stable/13 - MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b4f1d73496cf433d165220f6546d9e05115af74 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 02:21:25 +0000 Message-Id: <69533725.3d63d.9573168@gitrepo.freebsd.org> The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4f1d73496cf433d165220f6546d9e05115af74 commit 8b4f1d73496cf433d165220f6546d9e05115af74 Author: Xin LI AuthorDate: 2025-12-23 08:24:13 +0000 Commit: Xin LI CommitDate: 2025-12-30 02:21:15 +0000 MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. (cherry picked from commit ae12432049e7873ab3912643ae5d08297b8cbc49) --- contrib/xz/ChangeLog | 1586 +++++++++++++++++++++ contrib/xz/THANKS | 402 +++--- contrib/xz/doxygen/Doxyfile | 8 +- contrib/xz/src/common/my_landlock.h | 45 +- contrib/xz/src/common/mythread.h | 3 +- contrib/xz/src/liblzma/api/lzma/base.h | 6 +- contrib/xz/src/liblzma/api/lzma/container.h | 38 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 5 +- contrib/xz/src/liblzma/check/crc32_fast.c | 2 +- contrib/xz/src/liblzma/check/crc64_fast.c | 10 +- contrib/xz/src/liblzma/check/crc_common.h | 19 +- contrib/xz/src/liblzma/common/alone_decoder.c | 6 +- contrib/xz/src/liblzma/common/filter_common.c | 4 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 3 +- contrib/xz/src/liblzma/common/outqueue.h | 1 + contrib/xz/src/liblzma/common/stream_decoder_mt.c | 79 +- contrib/xz/src/liblzma/common/vli_decoder.c | 2 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 4 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 11 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 6 +- contrib/xz/src/liblzma/validate_map.sh | 4 +- contrib/xz/src/xz/args.c | 1 - contrib/xz/src/xz/file_io.c | 3 +- contrib/xz/src/xz/hardware.c | 72 + contrib/xz/src/xz/list.c | 2 + contrib/xz/src/xz/message.h | 4 + contrib/xz/src/xz/sandbox.c | 26 +- contrib/xz/src/xz/signals.c | 17 +- contrib/xz/src/xz/util.c | 4 + contrib/xz/src/xz/xz.1 | 9 +- contrib/xz/src/xzdec/xzdec.c | 2 +- lib/liblzma/config.h | 12 +- 33 files changed, 2072 insertions(+), 326 deletions(-) diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 577dce5e12a2..bd7fad97695d 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,3 +1,1589 @@ +commit 3d078b52adbff566ccfc51067dfbf742ecf3ef86 +Author: Lasse Collin +Date: 2025-12-17 13:36:42 +0200 + + Bump version and soname for 5.8.2 + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit fb14afd5c9bf14d8c67ee11e4139885072071ddd +Author: Lasse Collin +Date: 2025-12-17 13:36:35 +0200 + + Add NEWS for 5.8.2 + + NEWS | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +commit 590f4713b29f0236ab944487f40069355a515dbc +Author: Lasse Collin +Date: 2025-12-16 11:30:35 +0200 + + CMake: Bump maximum policy version to 4.2 + + CMP0186 is curious but we aren't affected. + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 26d22ed16b6e38ce8ed45cb29076f454cd488762 +Author: Lasse Collin +Date: 2025-12-10 19:20:05 +0200 + + tuklib_integer/CMake: Log a message about unaligned access check + + cmake/tuklib_integer.cmake | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f7381cf927576164c17be4e4c1edeec3cdaca7cf +Author: Lasse Collin +Date: 2025-12-10 19:11:27 +0200 + + tuklib_integer/CMake: Don't run unaligned access checks unnecessarily + + If the cache variable TUKLIB_FAST_UNALIGNED_ACCESS is already set, + the autodetection result isn't needed because the option() command + does nothing when the cache variable is already set. + + This is largely white space change to indent the if...endif block. + + cmake/tuklib_integer.cmake | 226 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 109 deletions(-) + +commit dc1a421ce35f10b9a0c00d1bd42f1fdac0c3e9eb +Author: Lasse Collin +Date: 2025-12-10 16:49:55 +0200 + + tuklib_integer: Use CMAKE_C_COMPILER_ARCHITECTURE_ID when available + + CMake >= 4.1 sets CMAKE__COMPILER_ARCHITECTURE_ID on many + platforms. The list of possible values are documented. Use this + variable when available. On older CMake versions CMAKE_SYSTEM_PROCESSOR + is still used, thus the regexes have to include values like ^amd64 still. + + With old CMake versions, checking CMAKE_C_COMPILER_ARCHITECTURE_ID + is somewhat useful with MSVC because CMAKE_SYSTEM_PROCESSOR might + not match the target architecture. + + cmake/tuklib_integer.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit c690101dddd784b75224a8935f56cd163d3e90a3 +Author: Lasse Collin +Date: 2025-12-10 16:49:55 +0200 + + tuklib_integer: Autodetect when -mstrict-align is used with GCC on ARM64 + + On ARM64, support for fast unaligned memory access was autodetected by + checking if __ARM_FEATURE_UNALIGNED is defined. However, at least GCC + versions up to 15.2.0 define the macro even when -mstrict-align has + been specified. Thus, autodetection with GCC doesn't work correctly, + and binaries built using -mstrict-align can be much slower than they + need to be, unless the user also passes --disable-unaligned-access + to configure or -DTUKLIB_FAST_UNALIGNED_ACCESS=OFF to cmake. + + See the GCC bug: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111555 + + Workaround the issue by using heuristics with GCC on ARM64. + + With Clang, the detection using __ARM_FEATURE_UNALIGNED works. + It also works with GCC on 32-bit ARM. + + Fixes: e5f13a66567b ("tuklib_integer: Autodetect support for unaligned access on ARM.") + + cmake/tuklib_integer.cmake | 63 ++++++++++++++++++++++++++++++------- + m4/tuklib_integer.m4 | 78 +++++++++++++++++++++++++++++++++++----------- + 2 files changed, 110 insertions(+), 31 deletions(-) + +commit d9b318f5b8a3524e90ac17471e79db7de012caf5 +Author: Lasse Collin +Date: 2025-12-09 18:02:23 +0200 + + CI: Update MSYS2 + + .github/workflows/msys2.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 700e32f1b7dd6d674f12bbdabc35a3bc4a2860f5 +Author: Lasse Collin +Date: 2025-12-09 18:02:05 +0200 + + CI: Update DragonFly BSD + + .github/workflows/dragonflybsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a7b749389c64dfbee1c29d88e61e71186b472784 +Author: Lasse Collin +Date: 2025-12-09 17:58:52 +0200 + + CI: Update Solaris + + .github/workflows/solaris.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0b3c6ee0ab3243e48291e5f9b6333c3d052311d +Author: Lasse Collin +Date: 2025-12-09 17:56:58 +0200 + + CI: Update NetBSD + + .github/workflows/netbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fbc1046248cfe3c730437ba7d98dde89b0eced3e +Author: Lasse Collin +Date: 2025-12-09 17:54:54 +0200 + + CI: Update OpenBSD + + .github/workflows/openbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f0579ba5650bbbfa88a04adf8115b8fb4aff476 +Author: Lasse Collin +Date: 2025-12-09 17:52:01 +0200 + + CI: Update FreeBSD + + .github/workflows/freebsd.yml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f8424b0416266c393c84a315e3bdedbc19efa0a8 +Author: Lasse Collin +Date: 2025-12-09 17:40:05 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit c4340692d4490ff80e897d4840fadc033c46d81a +Author: Lasse Collin +Date: 2025-12-09 13:01:36 +0200 + + Translations: Add src/xz/sandbox.c to POTFILES.in + + There are no strings to translate in that file now, but it's good to + list it anyway in case translatable strings are added in the future. + + Fixes: 374868d81d47 ("xz: Move sandboxing code to sandbox.c and improve Landlock sandbox.") + + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) + +commit b8af36920b0857c0329f61414df5989093386db1 +Author: Lasse Collin +Date: 2025-12-09 12:55:45 +0200 + + xz: Never translate "Failed to enable the sandbox" + + This was already the case in practice because I had forgotten to list + src/xz/sandbox.c in po/POTFILES.in. However, it seems better to never + translate this particular error message. It should almost never occur + and if it does, an untranslated message is should make it easier to + find bug reports about it. + + src/xz/sandbox.c | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +commit 5a7fc1af3d9ec115f796cba110eb78e63ff1df5c +Author: Lasse Collin +Date: 2025-12-09 12:27:15 +0200 + + Translations: Update the Swedish man page translations + + po4a/sv.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 88531e5463d9f028387a11b78d53c9c269e6a3a0 +Author: Lasse Collin +Date: 2025-12-09 12:26:24 +0200 + + Translations: Update the Romanian man page translations + + po4a/ro.po | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit 8a817277192e6379a8c6f2eefbaed65c6b7d92fa +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 1ec43aa7810d159ed76a6188b17c0bb474ca5ab5 +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + CMake: Autodetect unaligned access support on LoongArch + + This still relies on CMAKE_SYSTEM_PROCESSOR. CMake 4.1 added more + CMAKE__COMPILER_ARCHITECTURE_ID values to detect the arch in + a more defined manner, but 4.1 is too new to require for now. + + Thanks-to: Li Chenggang + Closes: https://github.com/tukaani-project/xz/pull/186 + + cmake/tuklib_integer.cmake | 81 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 81 insertions(+) + +commit 7971566247914ec1854b125ff99c2a617f5c1e3a +Author: Lasse Collin +Date: 2025-12-09 12:13:36 +0200 + + Autotools: Autodetect unaligned access support on LoongArch + + According to [1] sections 7.4, 8.1, and 8.2, desktop and server + processors support fast unaligned access, but embedded systems likely + don't. + + It's important that TUKLIB_FAST_UNALIGNED_ACCESS isn't defined when + -mstrict-align is in use because it will result in slower binaries + even if running on a processor that supports fast unaligned access. + It's because compilers will translate multibyte memcpy() to multiple + byte-by-byte instructions instead of wider loads and stores. The + compression times from [2] show this well: + + Unaligned access CFLAGS Compression time + enabled -O2 -mno-strict-align 66.1 s + disabled -O2 -mno-strict-align 79.5 s + disabled -O2 -mstrict-align 79.9 s + enabled -O2 -mstrict-align 129.1 s + + There currently (GCC 15.2) is no preprocessor macro on LoongArch + to detect if -mstrict-align or -mno-strict-align is in effect (the + default is -mno-strict-align). Use heuristics to detect which of the + flags is in effect. + + [1] https://github.com/loongson/la-softdev-convention/blob/v0.2/la-softdev-convention.adoc + [2] https://github.com/tukaani-project/xz/pull/186#issuecomment-3494570304 + + Thanks-to: Li Chenggang + Thanks-to: Xi Ruoyao + See: https://github.com/tukaani-project/xz/pull/186 + + m4/tuklib_integer.m4 | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +commit 338f952c0039b153a1fbdf6a535c4bd6a61f33cd +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + xz: Silence clang -Wunreachable-code-break + + Fixes: a165d7df1964 ("xz: Add a new --filters-help option.") + + src/xz/args.c | 1 - + 1 file changed, 1 deletion(-) + +commit 723cee44d076281bce9c3d7bd2c17b0680bd8884 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + liblzma: Remove unwanted semicolons + + These didn't affect control flow. + + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/lzma/lzma_common.h | 4 ++-- + src/liblzma/rangecoder/range_decoder.h | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 524f6a7384f15e52ec13c72adbdf18ddeecbc735 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + Tests: Remove an unwanted semicolon from a macro definition + + It didn't affect control flow. + + Fixes: fe3bd438fb11 ("Tests: Fix memory leaks in test_block_header.") + + tests/test_block_header.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f41a28bfab98d1f5171ee5c9da6dfdc15f62549 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + Build: Use -Wextra-semi-stmt when supported + + CMakeLists.txt | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +commit 91170c8cab72b94a697f5228f4df13483ef5be91 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + CI: Add clang-cl + + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-3577456136 + + .github/workflows/msvc.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit a3c6cb09113de978b971cbdacf5c4890d4237c28 +Author: Lasse Collin +Date: 2025-11-26 13:50:57 +0200 + + xz/Windows: Add a missing #include to fix the build with clang-cl + + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-1986829734 + Fixes: https://github.com/tukaani-project/xz/issues/18#issuecomment-3577456136 + + src/xz/util.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c410ccc62511ec95b20639defb10650ef9b75e8c +Author: Lasse Collin +Date: 2025-11-25 21:05:37 +0200 + + xz: Check return value of sigaction() before calling raise() + + Fixes: Coverity CID 456022 + + src/xz/signals.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 6cc2da0a4b180b71cb6e781c897052def103ad3e +Author: Lasse Collin +Date: 2025-11-02 12:57:00 +0200 + + liblzma: Refactor a loop in lzma_filters_copy() + + Arguably it's nicer if i doesn't wrap around when the loop terminates. + + Fixes: Coverity CID 464589 + Fixes: 6d118a0b9def ("Add lzma_filters_copy().") + + src/liblzma/common/filter_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 90b67853d57562c5ad4fdb3215ceb9b9bd3958bf +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + liblzma: Silence two Coverity warnings + + lzma_lzma_decoder_memusage() returns UINT64_MAX if lc/lp/pb aren't + valid. alone_decoder.c and lzip_decoder.c didn't check the return + value because in both it is known that lc/lp/pb are valid. Make them + call the _nocheck() variant instead which skips the validation (it + already existed for LZMA2's internal use). + + Fixes: Coverity CID 464658 + Fixes: Coverity CID 897069 + + src/liblzma/common/alone_decoder.c | 6 ++++-- + src/liblzma/common/lzip_decoder.c | 3 ++- + src/liblzma/lzma/lzma_decoder.h | 11 ++++++----- + 3 files changed, 12 insertions(+), 8 deletions(-) + +commit be365b701024b9acbfef4035c6433a0fbb4be823 +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + liblzma: Fix a harmless read of shared variable without mutex + + The partial_update_mode enumeration had three states, _DISABLED, + _START, and _ENABLED. Main thread changed it from _DISABLED to _START + while holding a mutex. Once set to _START, worker thread changed it + to _ENABLED without a mutex. Later main thread read it without a mutex, + so it could see either _START or _ENABLED. However, it made no + difference because the main thread checked for != _DISABLED, so + it didn't matter if it saw _START or _ENABLED. + + Nevertheless, such things must not be done. It's clear it was a mistake + because there were two comments that directly contradicted each + other about how the variable was accessed. + + Split the enumeration into two booleans: + + - partial_update_enabled: A worker thread locks the mutex to read + this variable and the main thread locks the mutex to change the + value. Because only the main thread modifies the variable, the + main thread can read the value without locking the mutex. + This variable replaces the _DISABLED -> _START transition. + + - partial_update_started is for worker thread's internal use and thus + needs no mutex. This replaces the _START -> _ENABLED transition. + + Fixes: Coverity CID 456025 + Fixes: bd93b776c1bd ("liblzma: Fix a deadlock in threaded decoder.") + + src/liblzma/common/stream_decoder_mt.c | 79 +++++++++++++++------------------- + 1 file changed, 34 insertions(+), 45 deletions(-) + +commit 2686554da0103580a472919220931c397b1d1f7a +Author: Lasse Collin +Date: 2025-11-02 12:17:50 +0200 + + CI: Add Coverity Scan + + Co-authored-by: Lasse Collin + Fixes: https://github.com/tukaani-project/xz/issues/198 + + .github/workflows/coverity.yml | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 1b30734c9c08a3f628574d172f1a6034277a2163 +Author: Lasse Collin +Date: 2025-11-25 13:55:35 +0200 + + Change the sorting order in THANKS + + In short, sort the names with this command (-k1,1 isn't needed because + the lines with names start with " -"): + + LC_ALL=en_US.UTF-8 sort -k2,2 -k3,3 -k4,4 -k5,5 + + When THANKS was created, I wrote the names as "First Last" and attempted + to keep them sorted by last name / surname / family name. This works + with many names in THANKS, but it becomes complicated with names that + don't fit that pattern. For example, names that are written as + "Last First" can be manually sorted by family name, but only if one + knows which part of the name is the family name.[*] And of course, + the concept of first/last name doesn't apply to all names. + + [*] xz had a co-maintainer who could help me with such names, + but fortunately he isn't working on the project anymore. + + Adding the names in chronological order could have worked too, although + if something is contributed by multiple people, one would still have to + decide how to sort the names within the batch. Another downside would + be that if THANKS is updated in more than one work-in-progress branch, + merge conflicts would occur more often. + + Don't attempt to sort by last name. Let's be happy that people tend to + provide names that can be expressed in a reasonable number of printable + Unicode characters. In practice, people have been even nicer: if the + native language doesn't use a Latin script alphabet, people often provide + a transliterated name (only or in addition to the original spelling), + which is very much appreciated by those who don't know the native script. + + Treat the names as opaque strings or space-separated strings for sorting + purposes. This means that most names will now be sorted by first name. + There still are many choices how to sort: + + (1) LC_ALL=en_US.UTF-8 sort + + The project is in English, so this may sound like a logical choice. + However, spaces have a lower weight than letters, which results in + this order: + + - A Ba + - Ab C + - A Bc + - A Bd + + (2) LC_ALL=en_US.UTF-8 sort -k2,2 + + This first sorts by the first word and then by the rest of the + string. It's -k2,2 instead of -k1,1 to skip the leading dash. + + - A Ba + - A Bc + - A Bd + - Ab C + + I like this more than (1). One could add -k3,3 -k4,4 -k5,5 ... too. + With current THANKS it makes no difference but it might some day. + + NOTE: The ordering in en_US.UTF-8 can differ between libc versions + and operating systems. Luckily it's not a big deal in THANKS. + + (3) LC_ALL=en_US.UTF-8 sort -f -k2,2 + + Passing -f (--ignore-case) to sort affects sorting of single-byte + characters but not multibyte characters (GNU coreutils 9.9): + + No -f With -f LC_ALL=C + Aa A.A A.A + A.A Aa Aa + Ää Ää Ä.Ä + Ä.Ä Ä.Ä Ää + + In GNU coreutils, the THANKS file is sorted using "sort -f -k1,1". + There is also a basic check that the en_US.UTF-8 locale is + behaving as expected. + + (4) LC_ALL=C sort + + This sorts by byte order which in UTF-8 is the same as Unicode + code point order. With the strings in (1) and (2), this produces + the same result as in (2). The difference in (3) can be seen above. + + The results differ from en_US.UTF-8 when a name component starts + with a lower case ASCII letter (like "von" or "de"). Worse, any + non-ASCII characters sort after ASCII chars. These properties might + look weird in English language text, although it's good to remember + that en_US.UTF-8 sorting can appear weird too if one's native + language isn't English. + + The choice between (2) and (4) was difficult but I went with (2). + + ;-) + + THANKS | 414 ++++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 207 insertions(+), 207 deletions(-) + +commit 8bb516887c1912106a72db96216cab46954e6190 +Author: Lasse Collin +Date: 2025-11-23 20:39:28 +0200 + + Landlock: Add missing #ifdefs + + The build was broken on distros that have an old . + + Fixes: 2b2652e914b1 ("Landlock: Workaround a bug in RHEL 9 kernel") + + src/common/my_landlock.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 23c95c6a7c374962103dbd35cb79fdd5a6fe8b52 +Author: Lasse Collin +Date: 2025-11-23 20:13:50 +0200 + + Update THANKS + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2b2652e914b1c38d4c009a8dcac11dfee9c7e008 +Author: Lasse Collin +Date: 2025-11-23 20:13:49 +0200 + + Landlock: Workaround a bug in RHEL 9 kernel + + If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container + on RHEL 9, xz will fail with the message "Failed to enable the sandbox". + + RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support + Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. + The issue is still present in 5.14.0-643.el9 (2025-11-22). Red Hat is + aware of the issue, but I don't know when it will be fixed. + + The sandbox is meant to be transparent to users, thus there isn't and + won't be a command line option to disable it. Instead, add a workaround + to keep xz working on the buggy RHEL 9 kernels. + + Reported-by: Richard W.M. Jones + Thanks-to: Pavel Raiskup + Tested-by: Orgad Shaneh + Tested-by: Richard W.M. Jones + Fixes: https://github.com/tukaani-project/xz/issues/199 + Link: https://issues.redhat.com/browse/RHEL-125143 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105 + Link: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/65BDSY56R5ZJRTUC4B6CIVCVLY4LG4ME/ + + src/common/my_landlock.h | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +commit ee75c76958dd891906745125590563ab64e85995 +Author: Lasse Collin +Date: 2025-11-23 20:13:37 +0200 + + Landlock: Cache the ABI version + + In xz it can avoid up to two syscalls that query the ABI version. + + src/common/my_landlock.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit f57b1716cd0853474980c90a892204dee9bdea1a +Author: Lasse Collin +Date: 2025-11-03 14:52:45 +0200 + + Update THANKS + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 211cde09236165dbd379644753337be1de64b151 +Author: Lasse Collin +Date: 2025-11-03 12:41:31 +0200 + + mythread.h: Fix the build on Emscripten when threading is disabled + + To make a non-threaded liblzma-only build work with WASI SDK, + and mythread_sigmask() were omitted from mythread.h in the commit + 81db3b889830. This broke non-threaded full build with Emscripten because + src/xz/signals.c needs mythread_sigmask() (liblzma-only build was fine). + + If __wasm__ is defined, omit and mythread_sigmask() in + non-threaded builds only when __EMSCRIPTEN__ isn't defined. + + Reported-by: Marcus Tillmanns + Thanks-to: ChanTsune + Fixes: https://github.com/tukaani-project/xz/issues/161 + Fixes: 81db3b889830 ("mythread.h: Disable signal functions in builds targeting Wasm + WASI.") + + src/common/mythread.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cbf50a99e3f0c2735fd573e166baf37df063b37b +Author: Lasse Collin +Date: 2025-11-03 11:56:32 +0200 + + Translations: Update the Serbian man page translations + + The earlier bug fixes are now included in the Translation Project. + + po4a/sr.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 68d1591187512d8872615c8a904d43073440d93f +Author: Lasse Collin +Date: 2025-11-02 19:40:55 +0200 + + xz: Silence a compiler warning when signals_block_count is unused + + Move the static variable signals_block_count to the #ifndef block + that already has the functions that need the variable. + + src/xz/signals.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit beca015891fbd22657663ec23809184dda0677cd +Author: Lasse Collin +Date: 2025-11-02 17:45:20 +0200 + + xz: Silence a warning from Clang on glibc systems + + Fixes: e8838b2f5922 ("xz: Look at resource limits when determining the default memlimit") + + src/xz/hardware.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 3e394278ed537575b5db43c09989c6ca99f762de +Author: Lasse Collin +Date: 2025-11-02 14:37:52 +0200 + + Translations: Update the Serbian man page translations + + Preserve the bug fixes made in 71ad5e82888f and 4f52e7387012 because + upstream hasn't included them. + + po4a/sr.po | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit ace28e35732fc43f58ea1aac146fdb73084f2548 +Author: Lasse Collin +Date: 2025-11-02 14:27:10 +0200 + + Translations: Update the Korean man page translations + + po4a/ko.po | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit ffd14a099f0d8c92d4f74018d3a52bd2327df4db +Author: Lasse Collin +Date: 2025-11-02 14:24:43 +0200 + + Translations: Update the Italian man page translations + + po4a/it.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 6f3152874ee375b581aa858fccab7865dcbf6403 +Author: Lasse Collin +Date: 2025-11-02 14:12:23 +0200 + + Translations: Update the Ukrainian man page translations + + po4a/uk.po | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit ef67e051d71938a23713d9782a3f0c470ac51b1e +Author: Lasse Collin +Date: 2025-09-28 18:32:05 +0300 + + liblzma: Fix build on old Linux/glibc on ARM64 + + getauxval() can be available even if HWCAP_CRC32 isn't #defined, so + both have to be checked. HWCAP_CRC32 was added in glibc 2.24 (2016). + + Fixes: https://github.com/tukaani-project/xz/issues/190 + + CMakeLists.txt | 7 +++++++ + configure.ac | 6 +++++- + src/liblzma/check/crc32_arm64.h | 5 +++-- + src/liblzma/check/crc_common.h | 3 ++- + 4 files changed, 17 insertions(+), 4 deletions(-) + +commit 71c2ede383f6dc6661b8a9d844f4bcf81c563643 +Author: Lasse Collin +Date: 2025-10-31 14:36:26 +0200 + + CI: Update Solaris + + .github/workflows/solaris.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02da8de0edddd31a3e9818c2200b97c446d6eb5b +Author: Lasse Collin +Date: 2025-10-31 14:32:47 +0200 + + CI: Update DragonFly BSD + + .github/workflows/dragonflybsd.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 75b18d325f6a993eac2d5f44c7aad941aa20df94 +Author: Lasse Collin +Date: 2025-10-31 14:30:24 +0200 + + CI: Update NetBSD + + .github/workflows/netbsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0102072915f38e747ee55aa9c52351dfe81b8c14 +Author: Lasse Collin +Date: 2025-10-31 14:21:37 +0200 + + CI: Update FreeBSD + + .github/workflows/freebsd.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83419783a67a6097c7d5ed5663734c04eb8c8b55 +Author: Lasse Collin +Date: 2025-10-31 14:17:30 +0200 + + CI: Update OpenBSD + + .github/workflows/openbsd.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3b5f5af9bcd9b5752608a099fcfab331c0c613b3 +Author: Lasse Collin +Date: 2025-10-26 12:07:34 +0200 + + Update THANKS + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit e8838b2f59221f46bf34c79431d286e8ac34fb8b +Author: Kirill A. Korinsky +Date: 2025-10-26 12:07:34 +0200 + + xz: Look at resource limits when determining the default memlimit + + When no memory usage limits have been set by the user, the default + for multithreaded mode has been 1/4 of total RAM. If this limit is + too high and memory allocation fails, liblzma (and xz) fail. Perhaps + liblzma should handle it better by reducing the number of threads + and continuing with the amount of memory it can allocate, but currently + that isn't the case. + + If resource limits were set to about 1/4 of RAM or lower, then xz + could fail for the above reason. This commit makes xz look at + RLIMIT_DATA, RLIMIT_AS, and RLIMIT_VMEM when they are available, + and set the limit 64 MiB below the lowest of those limits. This is + more or less a hack just like the 1/4-of-RAM method is, but this is + simple and quick to implement. + + On Linux, there are other limits like cgroup v2 memory.max which + can still make xz fail. The same is likely possible with FreeBSD's + rctl(8). + + Co-authored-by: Lasse Collin + Thanks-to: Fangrui Song + Fixes: https://github.com/tukaani-project/xz/issues/195 + Closes: https://github.com/tukaani-project/xz/pull/196 + + CMakeLists.txt | 3 +++ + configure.ac | 4 ++-- + src/xz/hardware.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 64 insertions(+), 2 deletions(-) + +commit 8d26b72915e0d373f898b55935505857c30dbdb3 +Author: Lasse Collin +Date: 2025-10-01 12:46:26 +0300 + + CI: Remove windows-2019 (which had VS 2019) + + GitHub has removed the runner image. + + A breakage with CLMUL CRC code occurred with VS 2019 but not 2022, + see b5a5d9e3f702. MS supports VS 2019 for a few more years, so it's + unfortunate that it can no longer be tested on GitHub. + + .github/workflows/msvc.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32412bd2a42fda639765c3046e91f964e286b6d9 +Author: Lasse Collin +Date: 2025-09-29 19:34:58 +0300 + + Update THANKS + + THANKS | 3 +++ + 1 file changed, 3 insertions(+) + +commit eaa150df9803c982adf28d4533c7a4264ea17757 +Author: Lakshmi-Surekha +Date: 2025-07-17 23:27:06 -0500 + + xz: Don't fsync() directories on AIX + + It fails with EBADF. + + Fixes: https://github.com/tukaani-project/xz/issues/188 + Closes: https://github.com/tukaani-project/xz/pull/189 + + src/xz/file_io.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 61b114e92f53b7977aad69f8a7130fc25d8a80e5 +Author: Lasse Collin +Date: 2025-09-29 18:37:19 +0300 + + liblzma: Document that lzma_allocator.free(opaque, NULL) is possible + + It feels better to fix the docs than change the code because this + way newly-written applications will be forced to be compatible with + the lzma_allocator behavior of old liblzma versions. It can matter + if someone builds the application against an older liblzma version. + + Fixes: https://github.com/tukaani-project/xz/issues/183 + + src/liblzma/api/lzma/base.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6d287a3ae90e1b990294f3d5264003d81e853c5e +Author: Simon Josefsson +Date: 2025-08-26 09:41:02 +0200 + + Update GPLv2 and LGPLv2.1 copies from gnu.org + + Closes: https://github.com/tukaani-project/xz/pull/194 + + COPYING.GPLv2 | 9 ++++----- + COPYING.LGPLv2.1 | 9 ++++----- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit 41a421dbadf13af2a59aaafa43836026b83340a7 +Author: Lasse Collin +Date: 2025-05-24 12:07:13 +0300 + + tests/test_suffix.sh: Avoid variables in printf format string + + tests/test_suffix.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a2c6aa8764a2e5248572d461305bd05c5950bf94 +Author: Lasse Collin +Date: 2025-05-24 12:02:09 +0300 + + build-aux/manconv.sh: Add quotes + + build-aux/manconv.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8e4153253eea2b5a9466467b2ce0249e56277c9a +Author: Lasse Collin +Date: 2025-05-24 12:01:35 +0300 + + windows/build.bash: Add quotes + + In this case they aren't needed but it's better style. + + windows/build.bash | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 37a57a926dd1ae6cde1544d8487e27982d2db4a4 +Author: Lasse Collin +Date: 2025-05-24 12:00:13 +0300 + + po4a/update-po: Ensure that a glob won't expand to a command line option + + po4a/update-po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3ba73034a3f8e414882af39d62f479e9717e061 +Author: Lasse Collin +Date: 2025-05-24 11:57:23 +0300 + + liblzma: validate_map.sh: Catch some unlikely errors + + src/liblzma/validate_map.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 067cecdea69067973e44dc1afb9be763faccecb2 +Author: Lasse Collin +Date: 2025-05-24 11:55:59 +0300 + + CI: Catch unsupported arguments in ci_build.bash + + build-aux/ci_build.bash | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4fc6208abebfe6b8c8348c412b4bcc594ae11c88 +Author: Lasse Collin *** 2120 LINES SKIPPED *** From nobody Tue Dec 30 03:25:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ53Bwmz6MknR for ; Tue, 30 Dec 2025 03:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ50hY0z3VjZ for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFNkeXa62k+d2PRPOp1tSR8rruCGqNRkEfoR2xjXveE=; b=mxL/YGH9AYSIlNnu6Ac6ZjztJLFjAOmv35v+Hm1p1mp3rRL6dF3PBDY3UwoxtP/R3Gigsj 8ie8IRZVkK/Kh9wMRkBGHYGrMaCVRtZnNQbD859q5FR4bmpf1f0nLVMmfTcgxPecpHI4B8 Ju5M1cZbEFllwSFN4lK+kfAsqAkJBSoZ9s9yhtO9O1O/JzN5a0rwuiqsMH4YEGRUJhfc8l GepN9ydTNPq18fDUZqEj/FN1BcggvrGONdsft63V9gTYI8Zv3hOhpbdG5UFT3Qns2+b611 CgSpqTVWm2FmSTCj26E44UkbQ8a10iyemilXixaJvW7cOOSW6u7xsM+M63V0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFNkeXa62k+d2PRPOp1tSR8rruCGqNRkEfoR2xjXveE=; b=F8msK8ZHWvPhY/6tahHmscKyxoS3V39KpcYFWfNpkQO91YndKnALnkFKkElj+MvRL59KWi 0ApMUalxR/fPnqLlD4IuPJeV/rIVwNZ38yjFfJNzI8i6Zr78zikQITO7fOAFQyu2ecCOQ8 ZfENveqXFc+bx1sFwAXxswLyKcb7lrV2KnPqCT+5roDVnUcc6JAXEi+gTl72OHZvIEnMBW YS2AZn2cJEGhNnJTA0AsF8RaPw+JxycMad2bxfQVHi8ufBaP8jwf5UpX+smAAzD/jhAWZW II7WflKVFY9iuCpyOUB3QnG33gDuWWf4m6hymB+Xc14bJ6kleIU3+imuh/l23A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065149; a=rsa-sha256; cv=none; b=MNe1LUH8Q4U0/ftnRebg01EEyKfoH/yaEHVv4f/71PsyViIQ43whWUrd1AbL0cV0g4NfGI TP/ViRyeuFAzv+e1/JsGfYaTOCHkVVYWuDW0ifmib+HEfNDlVQSdl63KA/SfHQ7JDwRsoy hCiiyREJxnZ/+Orri7T7giWDrhznP4cq0S/SefHpULFWydakaObQFc1ISOP9xQRQ05pmgg Gcw4Xj3h2l6dpjMUAEgTFMW4fF5Y34vO0G8UNI75fsMNmiXVKAPM3vXPxcC5pA4/92h6jO Id+JGAcmcXNdiTphmLpwNEAXVGn6NG6WlfMjfJ/qsX1ZynbcaVd5rF3eWwXl/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ5054fzkHC for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9d3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: efcb109940ca - main - vm_object_coalesce(): remove commented out 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 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: efcb109940ca607130af4498e1e33b54c58ba43c Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:49 +0000 Message-Id: <6953463d.9d3e.32ca39a8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=efcb109940ca607130af4498e1e33b54c58ba43c commit efcb109940ca607130af4498e1e33b54c58ba43c Author: Konstantin Belousov AuthorDate: 2025-12-20 16:09:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:24:35 +0000 vm_object_coalesce(): remove commented out code Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54263 --- sys/vm/vm_object.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 117900135ac3..a8ec98f2c98d 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2223,20 +2223,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * Remove any pages that may still be in the object from a previous * deallocation. */ - if (next_pindex < prev_object->size) { + if (next_pindex < prev_object->size) vm_object_page_remove(prev_object, next_pindex, next_pindex + next_size, 0); -#if 0 - if (prev_object->cred != NULL) { - KASSERT(prev_object->charge >= - ptoa(prev_object->size - next_pindex), - ("object %p overcharged 1 %jx %jx", prev_object, - (uintmax_t)next_pindex, (uintmax_t)next_size)); - prev_object->charge -= ptoa(prev_object->size - - next_pindex); - } -#endif - } /* * Extend the object if necessary. From nobody Tue Dec 30 03:25:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ73lHRz6MlBg for ; Tue, 30 Dec 2025 03:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ720Gcz3VJQ for ; Tue, 30 Dec 2025 03:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8opr1u2aDRz/VRKwLT6SwSGLFfbC2EOoPGxGXD04Oo=; b=UCqa8lgHmZBFZ59LxJYZ5TNejT0PU2ncjfo+UQLwcffnLnXBJVkUa4ZLy5NHuNnKra8un3 KHDZiY6tyRadDaspS/+AknOOKKsHu1ouusenq0jqaxWmfPlxOYEaa9FZDVW+lCu+xqWYd+ MlbLO4Ux64K+lSVdCnLcY8hB/Mq3x1+mUYkgRkQt48hklt3kjfbMGOWxSEiqsQRaTYpRQP cmSyLhE6GoS5G890cIekfCgU6Zf+sRncUkeFhNOEOmFlya0QKhFmuhWcmEyg0ZMaQzNOEN k6x10rOiWghLeGBrHtsMTGl6UUGGY0s3okjiycyRrtLL5XZ2ug2r2BXqkzWvSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8opr1u2aDRz/VRKwLT6SwSGLFfbC2EOoPGxGXD04Oo=; b=cl/diSR4RHN4mlrnXJk9iibMM1Hj8fT1I4CdbqpJabbPFG8bbqCXPT2VZUUqf8M7/ggwuk U0frwg/35mBtKBp9qjxUcuPU1A2aXVOOKJrowt7zCP38r8HxifCmOZpIUmYQPJ2deU2YIm d30v/+iaqBk9yJQl6LfZ7HxwDjQtfYb4CRCqC07vgLcVKhC0Y128jgDTIMrzL9H9UKfkv9 lltuDohEUZ9wQiW0U1jNpGuqoMdDqza7eCMNNzHR/Opdt5v88+f3oDKiD8DOup3mkXcD0R v7ZO36wGFFyw0YHcwkISltyHgkRA1ZY3hTyiTsZOqilquZluaEKr8LVB/mVniQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065151; a=rsa-sha256; cv=none; b=Dd+pSl6uB3wVsqxWj0jN/W85Fi+n0zRHKRidj9Ogg0RGuh8ov0ABzMTtYQYiB97KUl0j2o VYwSRv1YEugPIul9u2gYkt4hfQb84VWfCJaqMUDj8+hZZd7oJO/o3cZk+nJjBne3Vvo7Gv jEXQlJbeOlMx8xNJ33ta6UANYa544NQpn2TNWGlXR97nV0twK1z1z/cabs8/+7fY0mh23j rVQe53YrKqZv8GwgfZ6ahHHy87PxM/HRW0yyla4LXqvxVtcNblqZQFTPAU5CdxZ5hmMHle raqLFCHSPcvv+IsY4FgkumhAEUPGLIP50YTZjO/3j1LEy9/fc5cAmPVpNF0DTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ71XTnzjvq for ; Tue, 30 Dec 2025 03:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 353ba3bf08fd - main - vm_object_coalesce(): do not account holes twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 353ba3bf08fdef69b77e3e565435e50784a51412 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:51 +0000 Message-Id: <6953463f.b120.10e84c41@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=353ba3bf08fdef69b77e3e565435e50784a51412 commit 353ba3bf08fdef69b77e3e565435e50784a51412 Author: Konstantin Belousov AuthorDate: 2025-11-27 21:53:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:25:36 +0000 vm_object_coalesce(): do not account holes twice alc wrote: Suppose that the object is OBJ_ONEMAPPING and that we, in fact, have a single mapping to it. Then, we punch a hole in that mapping. vm_map_entry_delete() only subtracts from the object's charge when we shrink the size of the object. Now, suppose that we perform mmap(MAP_ANON) to reallocate some of the hole. Aren't we going to add to the charge here, even though vm_map_entry_delete() never subtracted from the charge for the hole that was created? Only account the change in the charged object size that was added to it. Noted by: alc Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54263 --- sys/vm/vm_object.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 36edb279bbce..c216fdc01af1 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2202,7 +2202,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, /* * Account for the charge. */ - if (prev_object->cred != NULL) { + if (prev_object->cred != NULL && + next_pindex + next_size > prev_object->size) { /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2213,12 +2214,14 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * entry, and swap reservation for this entry is * managed in appropriate time. */ - if (!reserved && !swap_reserve_by_cred(ptoa(next_size), - prev_object->cred)) { + vm_size_t charge = ptoa(next_pindex + next_size - + prev_object->size); + if (!reserved && + !swap_reserve_by_cred(charge, prev_object->cred)) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } - prev_object->charge += ptoa(next_size); + prev_object->charge += charge; } /* From nobody Tue Dec 30 03:25:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ8570Wz6MktT for ; Tue, 30 Dec 2025 03:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ83KJ8z3VJT for ; Tue, 30 Dec 2025 03:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjhNTRvGDRC5MLlejagKCGP/eab3wsTXD/fWYvsid38=; b=u/3Bglcup0x6Z0KVjAAOGKdii5KoPx7JqPJ3NOxQ5Mi6vtpZjcAjaYSEjVxSUCfTmeFR+L PPq5l0ZoDI8aVAWndilWXgW4BGcUHXN7vPFzPCp4RqTy5jDD7oKYG0hS9QvxIO1XFLUl+k L+u9QBLoRJMhPK/DXQT4ghVObEszmABWHb0/j2CbGLTTm9uRzJPfsLEvOVyU/ORMZJt+p1 Ibj/DwsjY/SuIw9w+krbNX98pBVVUevGrsvXlGUUXfBBmqJge6O3KvjjScN1kavMq9nnXr zl/qz12spGd+gXP70JjpAUI3zRVpoavGEcckP7TGIFPQWuRbn2UqsUVXXO9mNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjhNTRvGDRC5MLlejagKCGP/eab3wsTXD/fWYvsid38=; b=N/Xuze5KGlTaJHrLsSu3iEm6m5+aWibzQ1dJnIP6RHDSUcTMlxwJMxX2d3DoTSY7li57jH WUlvyh6MRNomZk1OjGWC2xTJWVcpgVOvH516bS5/NwaKwtfozIVGFT7HjJzub6wlDGjMDk PBU1cey57jsvC6PuEExiTzIyP+4Km+wQGL/UFphvBHVi0OcBfWt7sBpcy/KEVwOYwng4eE 9JvmAmKXhbQvLzMJMxK14PmpdxjDFOnuwTtGKtzZbYG0JE0Qw8lrBlXGcfN8o+RaTGtKjO rjnF67A2QlGzxxI5tK/2j0bIXkqPat3GpIhAxS9TEVHLGex6fUdvEstq9eKvGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065152; a=rsa-sha256; cv=none; b=YdWIMNYqdCyKxBwVrFmi03nXJ+Bt9lDrWAyd8GEj8p+mwn/bVkqt84GHvEK2B/GxU4tzLo D5BhoOqlzVttCCBAxAN/HVkKcw3lB5ZGZvpaKBrdKPXaBAvWDU0eRd94keqEqYCKprEWgB h7ZVV+/wWEd+Goo2T0GPB58w3vnF8ltP7zzwS2bOa63L8XzH5LUpfUu0nJUpuX7Xy2aDgl 3spt02v7Kt6QBRgoU4QcQY2iblTEeY7BME/8bgy1rlhj5p/j408GZLeNcQrzLgqdmS90dV MADcZQdGHTTX8RbKX7/L+2APLU1xDl8znoowPId6z3x7szUdnaNjIwuyLYJsog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ82LbZzkFB for ; Tue, 30 Dec 2025 03:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9dbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7685aaea8850 - main - vm_object_coalesce(): return swap reservation back if overcharged List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7685aaea8850f5b6995a17740a016019e0956c70 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:52 +0000 Message-Id: <69534640.9dbf.27c06818@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7685aaea8850f5b6995a17740a016019e0956c70 commit 7685aaea8850f5b6995a17740a016019e0956c70 Author: Konstantin Belousov AuthorDate: 2025-12-20 16:03:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:25:36 +0000 vm_object_coalesce(): return swap reservation back if overcharged It is possible for both vm_map_insert() and vm_object_coalesce() to charge both for the same region. The issue is that vm_map_insert() must charge in advance to ensure that the mapping would not exceed the swap limit, but then the coalesce might decide to extend the object, and already (partially) backs the mapped region. Handle this by passing to vm_object_coalesce() exact information about the charging mode of the extending range 'not charging', 'charged' using flags instead of simple boolean. In vm_object_coalesce(), detect overcharge and undo it if needed. Note that this relies on vm_object_coalesce() call being the last action in vm_map_insert() before extending the previous map entry. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54338 --- sys/vm/vm_map.c | 44 ++++++++++++++++++++++++++++++-------------- sys/vm/vm_object.c | 41 +++++++++++++++++++++++++++++++---------- sys/vm/vm_object.h | 8 +++++++- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 6b09552c5fee..68dcadd2b2f1 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1620,6 +1620,7 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, vm_inherit_t inheritance; u_long bdry; u_int bidx; + int cflags; VM_MAP_ASSERT_LOCKED(map); KASSERT(object != kernel_object || @@ -1696,20 +1697,36 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, } cred = NULL; - if ((cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT | MAP_CREATE_GUARD)) != 0) - goto charged; - if ((cow & MAP_ACC_CHARGED) || ((prot & VM_PROT_WRITE) && - ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) { - if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start)) - return (KERN_RESOURCE_SHORTAGE); - KASSERT(object == NULL || - (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || - object->cred == NULL, - ("overcommit: vm_map_insert o %p", object)); - cred = curthread->td_ucred; + if ((cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT | MAP_CREATE_GUARD)) != 0) { + cflags = OBJCO_NO_CHARGE; + } else { + cflags = 0; + if ((cow & MAP_ACC_CHARGED) != 0 || + ((prot & VM_PROT_WRITE) != 0 && + ((protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || + object == NULL))) { + if ((cow & MAP_ACC_CHARGED) == 0) { + if (!swap_reserve(end - start)) + return (KERN_RESOURCE_SHORTAGE); + + /* + * Only inform vm_object_coalesce() + * that the object was charged if + * there is no need for CoW, so the + * swap amount reserved is applicable + * to the prev_entry->object. + */ + if ((protoeflags & MAP_ENTRY_NEEDS_COPY) == 0) + cflags |= OBJCO_CHARGED; + } + KASSERT(object == NULL || + (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || + object->cred == NULL, + ("overcommit: vm_map_insert o %p", object)); + cred = curthread->td_ucred; + } } -charged: /* Expand the kernel pmap, if necessary. */ if (map == kernel_map && end > kernel_vm_end) { int rv; @@ -1741,8 +1758,7 @@ charged: vm_object_coalesce(prev_entry->object.vm_object, prev_entry->offset, (vm_size_t)(prev_entry->end - prev_entry->start), - (vm_size_t)(end - prev_entry->end), cred != NULL && - (protoeflags & MAP_ENTRY_NEEDS_COPY) == 0)) { + (vm_size_t)(end - prev_entry->end), cflags)) { /* * We were able to extend the object. Determine if we * can extend the previous map entry to include the diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c216fdc01af1..f4c54ba91742 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2161,7 +2161,7 @@ vm_object_populate(vm_object_t object, vm_pindex_t start, vm_pindex_t end) */ boolean_t vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, - vm_size_t prev_size, vm_size_t next_size, boolean_t reserved) + vm_size_t prev_size, vm_size_t next_size, int cflags) { vm_pindex_t next_end, next_pindex; @@ -2202,8 +2202,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, /* * Account for the charge. */ - if (prev_object->cred != NULL && - next_pindex + next_size > prev_object->size) { + if (prev_object->cred != NULL && (cflags & OBJCO_NO_CHARGE) == 0) { /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2214,14 +2213,36 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * entry, and swap reservation for this entry is * managed in appropriate time. */ - vm_size_t charge = ptoa(next_pindex + next_size - - prev_object->size); - if (!reserved && - !swap_reserve_by_cred(charge, prev_object->cred)) { - VM_OBJECT_WUNLOCK(prev_object); - return (FALSE); + if (next_end > prev_object->size) { + vm_size_t charge = ptoa(next_end - prev_object->size); + + if ((cflags & OBJCO_CHARGED) == 0) { + if (!swap_reserve_by_cred(charge, + prev_object->cred)) { + VM_OBJECT_WUNLOCK(prev_object); + return (FALSE); + } + } else if (prev_object->size > next_pindex) { + /* + * The caller charged, but: + * - the object has already accounted for the + * space, + * - and the object end is between previous + * mapping end and next_end. + */ + swap_release_by_cred(ptoa(prev_object->size - + next_pindex), prev_object->cred); + } + prev_object->charge += charge; + } else if ((cflags & OBJCO_CHARGED) != 0) { + /* + * The caller charged, but the object has + * already accounted for the space. Whole new + * mapping charge should be released, + */ + swap_release_by_cred(ptoa(next_size), + prev_object->cred); } - prev_object->charge += charge; } /* diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index e58fae5f0090..98afb93f8389 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -228,6 +228,12 @@ struct vm_object { #define OBJPR_NOTMAPPED 0x2 /* Don't unmap pages. */ #define OBJPR_VALIDONLY 0x4 /* Ignore invalid pages. */ +/* + * Options for vm_object_coalesce(). + */ +#define OBJCO_CHARGED 0x1 /* The next_size was charged already */ +#define OBJCO_NO_CHARGE 0x2 /* Do not do swap accounting at all */ + TAILQ_HEAD(object_q, vm_object); extern struct object_q vm_object_list; /* list of allocated objects */ @@ -354,7 +360,7 @@ vm_object_t vm_object_allocate_anon(vm_pindex_t, vm_object_t, struct ucred *, vm_size_t); vm_object_t vm_object_allocate_dyn(objtype_t, vm_pindex_t, u_short); boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t, - boolean_t); + int); void vm_object_collapse (vm_object_t); void vm_object_deallocate (vm_object_t); void vm_object_destroy (vm_object_t); From nobody Tue Dec 30 03:51:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJzt34H4z6Mm29; Tue, 30 Dec 2025 03:51:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJzs5bCrz3ZLx; Tue, 30 Dec 2025 03:51:37 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5BU3pN7S028084; Tue, 30 Dec 2025 05:51:26 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5BU3pN7S028084 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5BU3pNmD028083; Tue, 30 Dec 2025 05:51:23 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 30 Dec 2025 05:51:23 +0200 From: Konstantin Belousov To: Kristof Provost Cc: Ka Ho Ng , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 112c453ba910 - stable/15 - geom(9): struct bio KBI fix Message-ID: References: <69489316.252e6.179063dd@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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dgJzs5bCrz3ZLx On Mon, Dec 29, 2025 at 10:22:50AM +0100, Kristof Provost wrote: > On 22 Dec 2025, at 1:38, Ka Ho Ng wrote: > > The branch stable/15 has been updated by khng: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=112c453ba91012f19ed140c56a3ac8fc929ddabb > > > > commit 112c453ba91012f19ed140c56a3ac8fc929ddabb > > Author: Ka Ho Ng > > AuthorDate: 2025-12-21 22:45:03 +0000 > > Commit: Ka Ho Ng > > CommitDate: 2025-12-22 00:37:40 +0000 > > > > geom(9): struct bio KBI fix > > > > The struct bio was changed after cb85c2e2e995 on the branch. To fix > > this, move BIO_ERROR flag to another value, and now BIO_ERROR_COMPAT > > occupies 0x1 instead. Also, introduce b_error_compat field at the > > place > > where the old bio_error was. > > > > This allows non-CAM(9) disk drivers and software volume manager > > modules > > compiled against 15.0-RELEASE kernel to work on 15-STABLE kernel > > again. > > > > Reviewed by: kib > > Differential Revision: https://reviews.freebsd.org/D54327 > > > > Approved by: re (cperciva) > > I’m seeing panics on boot now: > > vtnet0: Ethernet address: 58:9c:fc:0c:60:85 > vtnet0: netmap queues/slots: TX 1/1024, RX 1panic: Memory modified after > free 0xfffff800038b51a8 (424, g_bio) + 0 = deadc0dedeacc0de > > cpuid = 6 > time = 1 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame > 0xfffffe008d5679a0 > vpanic() at vpanic+0x136/frame 0xfffffe008d567ad0 > panic() at panic+0x43/frame 0xfffffe008d567b30 > trash_ctor() at trash_ctor+0x74/frame 0xfffffe008d567b40 > item_ctor() at item_ctor+0x59/frame 0xfffffe008d567b90 > g_clone_bio() at g_clone_bio+0x1d/frame 0xfffffe008d567bb0 > g_part_start() at g_part_start+0x96/frame 0xfffffe008d567c40 > g_io_request() at g_io_request+0x2ca/frame 0xfffffe008d567c70 > g_read_data() at g_read_data+0x95/frame 0xfffffe008d567cb0 > g_raid_md_taste_intel() at g_raid_md_taste_intel+0x1d8/frame > 0xfffffe008d567e50 > g_raid_taste() at g_raid_taste+0x18e/frame 0xfffffe008d567ea0 > g_new_provider_event() at g_new_provider_event+0xaa/frame > 0xfffffe008d567ec0 > g_run_events() at g_run_events+0x104/frame 0xfffffe008d567ef0 > fork_exit() at fork_exit+0x82/frame 0xfffffe008d567f30 > fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe008d567f30 > --- trap 0, rip = 0, rsp = 0, rbp = 0 --- > KDB: enter: panic > [ thread pid 13 tid 100069 ] > Stopped at kdb_enter+0x33: movq $0,0x121aa92(%rip) > db> > > With this commit (and the follow-up “geom(9): unset the BIO_ERROR_COMPAT > flag correctly”) reverted the VM boots again. Does the following help? diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index dc90bd3add22..2368f863a248 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4523,8 +4523,6 @@ biodone(struct bio *bp) bp->bio_flags |= BIO_ERROR_COMPAT; } done(bp); - bp->bio_error_compat = 0; - bp->bio_flags &= ~BIO_ERROR_COMPAT; } } From nobody Tue Dec 30 04:17:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgKYn0FLDz6MnLy for ; Tue, 30 Dec 2025 04:17:33 +0000 (UTC) (envelope-from khng300@gmail.com) Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 4dgKYl4fFQz3bc4 for ; Tue, 30 Dec 2025 04:17:31 +0000 (UTC) (envelope-from khng300@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=SACTh3+V; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of khng300@gmail.com designates 2001:4860:4864:20::35 as permitted sender) smtp.mailfrom=khng300@gmail.com Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-3fe9d6179efso1148084fac.1 for ; Mon, 29 Dec 2025 20:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767068245; x=1767673045; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=hZrIeaYTRpWI/V1lQcYUDwkEsK20+xQ44ieIQ0pqK3E=; b=SACTh3+VTlXOftisv3sgr5y8GL9Ej8t2verKUgQabhDt4fdxMrlN/1JCr0SRK3dl42 IyaLK6LSi7NyAUneDrj95CVsft7Y7A36CZxf5tzNuA/aTxtEOOzzWmvFZQGtViKdKBoC 7kh5Zo2gLm1ehZnd41/vOx3IZcdbmGcHAbs47ZaDLsgO8WHgjNAbbcA4LXm9khmW9oil f6i2sqlf0yCdaXqerezbp8S4E/1RpgRaNuKHqiJGvs1vBO77VUA6dSKou4WYA/WLHDHv iukMoMDdnWGVQjHwGBf32AqtDCrhFPBtOsxXXI1RCZZn6aXFl7eNDNU5VAM6p9H/0xAM rPtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767068245; x=1767673045; h=cc: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=hZrIeaYTRpWI/V1lQcYUDwkEsK20+xQ44ieIQ0pqK3E=; b=Ql6lcswAQHsksZv3zrGTOJsET7lgtihu6TZTi7Wa03un2g193f0yi+cuLeR7fxBQgA b5kUHZOobR59N256Z01HMDGD7CJQ1trCUBouFwRwlnkO7kszIsTwEsudl5w/GEp4jw9t U2mqNSmTezjRHCX5kJiTz8J04tmnMU/QyrqvETuhhDOBpunR8gYqp/NsnPD0EnxqzVLC f9/C5F7U1Ek4vtkY4WK276+BpZwnQpbNo06VRygG0Jy4BuxGARM5ercSd4jBVm+P8w+2 6vWAL5iRu6CMx2XbAXcC3rZJZra9/yrbMekWIWxMH2DVKz7RX6iDTRIaPUp9rHWfc8Zn 4ruw== X-Forwarded-Encrypted: i=1; AJvYcCU/yz1vIO3RE6fZQuUoBZc84aCoCl0dKIqsZLBUo11rmoS2s4fu56Nx/SoOiGGONkrGBa3/F2HZZd6sXUULOqKlPqiQ@freebsd.org X-Gm-Message-State: AOJu0YwXSM2jEsnEsVm6JmoAQV8/nMeCtODkeTTMOw/vfRQ2qBaZNzRZ JoVi4pBlXRBqMzQP0PDqaxQiI0e9Ha8/ZC+3HvEdHwOLzHiVQ2AxanwGnVl6VZr5Ah/LOBRGNX9 kpm10cNjERuIWVQvebrLFnItPxLS00Mc= X-Gm-Gg: AY/fxX4l1fZM7I0NKxuFh8JE+hOE9WzcE7QzCSvhGPXEOo4M4rHFlnUNSm6X/jDwoRF UXDcdP8PB9DuzzpA61uRk0RJW6CgOOrNsdtTyT1uSZ6s8WCw4RS4F6AYSCm6CCYK8f+5336659S YCuZQzUWvQ4wYjYVQg8WHKWNyKcX2GPGtTaWXE+MertWdtctQo/vdB3ewJXqZFc9xDc20kNsVQT EltEC4WxiHq7Hskp4jmOF/KlQLjRZzBonxymZ0dDPjfsjZtfF3QHzcC3Ku63AEWBvO5JrnwYxMS nXdifbHHBFm6BF1aumcSSFuHGNc1B3r19p+8uvWz X-Google-Smtp-Source: AGHT+IEO0NypnSLYeH+wiJmIUdxVOe8SQPjX+ol64Ec5gMJCHLl9mg8foSaTTmo5FREeaes3XYkLNngU7pz72qED+4M= X-Received: by 2002:a4a:ddc1:0:b0:65b:2b26:8022 with SMTP id 006d021491bc7-65cfe667108mr13765193eaf.6.1767068245631; Mon, 29 Dec 2025 20:17:25 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <69489316.252e6.179063dd@gitrepo.freebsd.org> In-Reply-To: From: Ka Ho Ng Date: Mon, 29 Dec 2025 23:17:14 -0500 X-Gm-Features: AQt7F2qS32NMYLMjKObaibR4dGkiwC66bHH-tyLCWrH3dxnsft9fjkXhdCwivLk Message-ID: Subject: Re: git: 112c453ba910 - stable/15 - geom(9): struct bio KBI fix To: Konstantin Belousov Cc: Kristof Provost , Ka Ho Ng , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Type: multipart/alternative; boundary="00000000000013296d064723a3b4" X-Spamd-Bar: --- 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.985]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2001:4860:4000::/36]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FREEMAIL_TO(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2001:4860:4864:20::35:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MID_RHS_MATCH_FROMTLD(0.00)[]; BLOCKLISTDE_FAIL(0.00)[2001:4860:4864:20::35:server fail]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_ONE(0.00)[1]; MISSING_XM_UA(0.00)[]; RCPT_COUNT_FIVE(0.00)[6] X-Rspamd-Queue-Id: 4dgKYl4fFQz3bc4 --00000000000013296d064723a3b4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Dec 29, 2025 at 11:08=E2=80=AFPM Ka Ho Ng wrote= : > On Mon, Dec 29, 2025 at 10:51=E2=80=AFPM Konstantin Belousov > wrote: > >> On Mon, Dec 29, 2025 at 10:22:50AM +0100, Kristof Provost wrote: >> > On 22 Dec 2025, at 1:38, Ka Ho Ng wrote: >> > > The branch stable/15 has been updated by khng: >> > > >> > > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D112c453ba91012f19ed140c56a3ac8= fc929ddabb >> > > >> > > commit 112c453ba91012f19ed140c56a3ac8fc929ddabb >> > > Author: Ka Ho Ng >> > > AuthorDate: 2025-12-21 22:45:03 +0000 >> > > Commit: Ka Ho Ng >> > > CommitDate: 2025-12-22 00:37:40 +0000 >> > > >> > > geom(9): struct bio KBI fix >> > > >> > > The struct bio was changed after cb85c2e2e995 on the branch. To >> fix >> > > this, move BIO_ERROR flag to another value, and now >> BIO_ERROR_COMPAT >> > > occupies 0x1 instead. Also, introduce b_error_compat field at th= e >> > > place >> > > where the old bio_error was. >> > > >> > > This allows non-CAM(9) disk drivers and software volume manager >> > > modules >> > > compiled against 15.0-RELEASE kernel to work on 15-STABLE kernel >> > > again. >> > > >> > > Reviewed by: kib >> > > Differential Revision: https://reviews.freebsd.org/D54327 >> > > >> > > Approved by: re (cperciva) >> > >> > I=E2=80=99m seeing panics on boot now: >> > >> > vtnet0: Ethernet address: 58:9c:fc:0c:60:85 >> > vtnet0: netmap queues/slots: TX 1/1024, RX 1panic: Memory >> modified after >> > free 0xfffff800038b51a8 (424, g_bio) + 0 =3D deadc0dedeacc0de >> > >> > cpuid =3D 6 >> > time =3D 1 >> > KDB: stack backtrace: >> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame >> > 0xfffffe008d5679a0 >> > vpanic() at vpanic+0x136/frame 0xfffffe008d567ad0 >> > panic() at panic+0x43/frame 0xfffffe008d567b30 >> > trash_ctor() at trash_ctor+0x74/frame 0xfffffe008d567b40 >> > item_ctor() at item_ctor+0x59/frame 0xfffffe008d567b90 >> > g_clone_bio() at g_clone_bio+0x1d/frame 0xfffffe008d567bb0 >> > g_part_start() at g_part_start+0x96/frame 0xfffffe008d567c40 >> > g_io_request() at g_io_request+0x2ca/frame 0xfffffe008d567c70 >> > g_read_data() at g_read_data+0x95/frame 0xfffffe008d567cb0 >> > g_raid_md_taste_intel() at g_raid_md_taste_intel+0x1d8/frame >> > 0xfffffe008d567e50 >> > g_raid_taste() at g_raid_taste+0x18e/frame 0xfffffe008d567ea0 >> > g_new_provider_event() at g_new_provider_event+0xaa/frame >> > 0xfffffe008d567ec0 >> > g_run_events() at g_run_events+0x104/frame 0xfffffe008d567ef0 >> > fork_exit() at fork_exit+0x82/frame 0xfffffe008d567f30 >> > fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe008d567f3= 0 >> > --- trap 0, rip =3D 0, rsp =3D 0, rbp =3D 0 --- >> > KDB: enter: panic >> > [ thread pid 13 tid 100069 ] >> > Stopped at kdb_enter+0x33: movq $0,0x121aa92(%rip) >> > db> >> > >> > With this commit (and the follow-up =E2=80=9Cgeom(9): unset the BIO_ER= ROR_COMPAT >> > flag correctly=E2=80=9D) reverted the VM boots again. >> >> Does the following help? >> >> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c >> index dc90bd3add22..2368f863a248 100644 >> --- a/sys/kern/vfs_bio.c >> +++ b/sys/kern/vfs_bio.c >> @@ -4523,8 +4523,6 @@ biodone(struct bio *bp) >> bp->bio_flags |=3D BIO_ERROR_COMPAT; >> } >> done(bp); >> - bp->bio_error_compat =3D 0; >> - bp->bio_flags &=3D ~BIO_ERROR_COMPAT; >> } >> } >> >> >> Yep that fixes the issue. I committed this as 9cfd75a6f88f. > > Ka Ho > + the missing recipients and the mailing lists. Ka Ho --00000000000013296d064723a3b4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Mon, Dec 29, 2025 at 11:08=E2=80=AFPM = Ka Ho Ng <khng300@gmail.com>= wrote:
On Mon, Dec 29, 2025 at 10:51=E2=80=AFPM Konstantin Belousov &= lt;kostikbel@gmail= .com> wrote:
On Mon, Dec 29, 2025 at 10:22:50AM +0100, Kristo= f Provost wrote:
> On 22 Dec 2025, at 1:38, Ka Ho Ng wrote:
> > The branch stable/15 has been updated by khng:
> >
> > URL: htt= ps://cgit.FreeBSD.org/src/commit/?id=3D112c453ba91012f19ed140c56a3ac8fc929d= dabb
> >
> > commit 112c453ba91012f19ed140c56a3ac8fc929ddabb
> > Author:=C2=A0 =C2=A0 =C2=A0Ka Ho Ng <khng@FreeBSD.org>
> > AuthorDate: 2025-12-21 22:45:03 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Ka Ho Ng <khng@FreeBSD.org>
> > CommitDate: 2025-12-22 00:37:40 +0000
> >
> >=C2=A0 =C2=A0 =C2=A0geom(9): struct bio KBI fix
> >
> >=C2=A0 =C2=A0 =C2=A0The struct bio was changed after cb85c2e2e995 = on the branch. To fix
> >=C2=A0 =C2=A0 =C2=A0this, move BIO_ERROR flag to another value, an= d now BIO_ERROR_COMPAT
> >=C2=A0 =C2=A0 =C2=A0occupies 0x1 instead. Also, introduce b_error_= compat field at the
> > place
> >=C2=A0 =C2=A0 =C2=A0where the old bio_error was.
> >
> >=C2=A0 =C2=A0 =C2=A0This allows non-CAM(9) disk drivers and softwa= re volume manager
> > modules
> >=C2=A0 =C2=A0 =C2=A0compiled against 15.0-RELEASE kernel to work o= n 15-STABLE kernel
> > again.
> >
> >=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kib
> >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://= reviews.freebsd.org/D54327
> >
> >=C2=A0 =C2=A0 =C2=A0Approved by:=C2=A0 =C2=A0 re (cperciva)
>
> I=E2=80=99m seeing panics on boot now:
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0vtnet0: Ethernet address: 58:9c:fc:0c:60:85<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0vtnet0: netmap queues/slots: TX 1/1024, RX 1= panic: Memory modified after
> free 0xfffff800038b51a8 (424, g_bio) + 0 =3D deadc0dedeacc0de
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cpuid =3D 6
>=C2=A0 =C2=A0 =C2=A0 =C2=A0time =3D 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0KDB: stack backtrace:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0db_trace_self_wrapper() at db_trace_self_wra= pper+0x2b/frame
> 0xfffffe008d5679a0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0vpanic() at vpanic+0x136/frame 0xfffffe008d5= 67ad0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0panic() at panic+0x43/frame 0xfffffe008d567b= 30
>=C2=A0 =C2=A0 =C2=A0 =C2=A0trash_ctor() at trash_ctor+0x74/frame 0xffff= fe008d567b40
>=C2=A0 =C2=A0 =C2=A0 =C2=A0item_ctor() at item_ctor+0x59/frame 0xfffffe= 008d567b90
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_clone_bio() at g_clone_bio+0x1d/frame 0xff= fffe008d567bb0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_part_start() at g_part_start+0x96/frame 0x= fffffe008d567c40
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_io_request() at g_io_request+0x2ca/frame 0= xfffffe008d567c70
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_read_data() at g_read_data+0x95/frame 0xff= fffe008d567cb0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_raid_md_taste_intel() at g_raid_md_taste_i= ntel+0x1d8/frame
> 0xfffffe008d567e50
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_raid_taste() at g_raid_taste+0x18e/frame 0= xfffffe008d567ea0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_new_provider_event() at g_new_provider_eve= nt+0xaa/frame
> 0xfffffe008d567ec0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0g_run_events() at g_run_events+0x104/frame 0= xfffffe008d567ef0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0fork_exit() at fork_exit+0x82/frame 0xfffffe= 008d567f30
>=C2=A0 =C2=A0 =C2=A0 =C2=A0fork_trampoline() at fork_trampoline+0xe/fra= me 0xfffffe008d567f30
>=C2=A0 =C2=A0 =C2=A0 =C2=A0--- trap 0, rip =3D 0, rsp =3D 0, rbp =3D 0 = ---
>=C2=A0 =C2=A0 =C2=A0 =C2=A0KDB: enter: panic
>=C2=A0 =C2=A0 =C2=A0 =C2=A0[ thread pid 13 tid 100069 ]
>=C2=A0 =C2=A0 =C2=A0 =C2=A0Stopped at=C2=A0 =C2=A0 =C2=A0 kdb_enter+0x3= 3: movq=C2=A0 =C2=A0 $0,0x121aa92(%rip)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0db>
>
> With this commit (and the follow-up =E2=80=9Cgeom(9): unset the BIO_ER= ROR_COMPAT
> flag correctly=E2=80=9D) reverted the VM boots again.

Does the following help?

diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index dc90bd3add22..2368f863a248 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -4523,8 +4523,6 @@ biodone(struct bio *bp)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 bp->bio_flags |=3D BIO_ERROR_COMPAT;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 done(bp);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bp->bio_error_co= mpat =3D 0;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bp->bio_flags &a= mp;=3D ~BIO_ERROR_COMPAT;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0}


Yep that fixes=C2=A0the issue. I committed this as=C2= =A09cfd75a6f88f.

Ka Ho=C2=A0
+ the missing recipients and the mailing lists.

Ka Ho
--00000000000013296d064723a3b4-- From nobody Tue Dec 30 12:47:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgXt44lh4z6Ls8Y for ; Tue, 30 Dec 2025 12:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXt44Bx5z3Q6n for ; Tue, 30 Dec 2025 12:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glP4Y0QJvof/BB371LR0BrB4O/J/jqZm6K29jb6s2DA=; b=PwWFqojtLnC5tpr+G/o42fwf7NB8nUCBmNpvK+dHb3cO3vTjWBnVdDI/7fZJYA5ckiI+Yx MkChS56i69fQ9phnlRbZRcnl797XB1fZgwtSs43nOfpQqJImjHJCR4gyNPm2vxMDxjXlqj Iw0cBl9DF4UcAAuzkZXoT7dMNkm6kslqzBWKqTd6tpTblM4cNm6hdqPEQUSl1d05teTkRr NiD+0SBwitdkylb8/HALuEwYYfVRVnYWJyFNHw1tkKTKH5F70QqqkrNOJgF4Kz3g6cPQ75 BaZ5//t1qDbJQp1q3b+Cyvkx+Epoci6IL3E811OBCJ+jI5qQEdlpVB1crvHXIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glP4Y0QJvof/BB371LR0BrB4O/J/jqZm6K29jb6s2DA=; b=DnpDSUhjQrvlLJ4P5pZVrpyqXcnU9oVJgyP16klLBpL+rtJKtMiKlz9qSzvK47vh4UY7r3 g8/osgD9n8Vj2TgX2JrTSP86uRSiq+ZphAtfZxuyaPdIwY1IqjGNSu2tmDLSoZNFAntFfC 8uT62PycpdAAHvCqBZKymNRG1jUGBp4LNJSP4rq8SyR70U/EOwZqd02ue6g1xgZtInrRgW oPzV9nbUBhHij2Y00a4EChgYkxQbSBN2VJwi8IhhPWy6KUaC9qgWtl2tn+nC12VTLxZwyq xvj65zKn8sIAXNI9/BrXAhSxOeMu2I83F2qehpRyR8l1U7CZbektQyzWWn7NUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767098844; a=rsa-sha256; cv=none; b=BjvE3CaQBotjBObJdWXZmoDPAjwDNhmvJQLmI5j7VxyVF73RBro07ZFM1qLS4rXfUVBz0X OvuGTlRR3+iu/TmZd0roMPLvu1yZWjwS0yh1t4Dy9j/Xuh4Lo8mhJaf6wK0mqoppea7JGC pBr1oJdU/1HerkLwBIkB/Q09RTTnaelXQkpjlp8xxBKpYK3awpRIdfuT1a1XMrqBo8M9mV OHUKwGNGH5Epv+/8bHFcV5NSUyTBvRej0pySaNA8otAUMgfJ1Gyk312Nze1+zPqBX6JR3U WfZShUiLtko+Fjk6WIB7esejlTuoyxikmaWg8xrUAQk54kpmFSIqqgrJFLGVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXt43QCnz11Nd for ; Tue, 30 Dec 2025 12:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 394b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:47:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 710ec409dffe - main - crypto: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 710ec409dffed3306ced253bba85dbdc7758510b Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:47:24 +0000 Message-Id: <6953c9dc.394b6.4b8b5085@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=710ec409dffed3306ced253bba85dbdc7758510b commit 710ec409dffed3306ced253bba85dbdc7758510b Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:46:46 +0000 crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 --- sys/crypto/chacha20/chacha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c index cb06003b0ecf..0509b05cab22 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -50,8 +50,8 @@ typedef struct chacha_ctx chacha_ctx; a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); -static const char sigma[16] = "expand 32-byte k"; -static const char tau[16] = "expand 16-byte k"; +static const char sigma[16] __nonstring = "expand 32-byte k"; +static const char tau[16] __nonstring = "expand 16-byte k"; LOCAL void chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) From nobody Tue Dec 30 12:49:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgXwc2Y7Jz6Lsfg for ; Tue, 30 Dec 2025 12:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXwc1yPVz3Qm5 for ; Tue, 30 Dec 2025 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hv4lRVtiBxczeYLYPT3lLxgM8RbmAWR7NMM0SYABe14=; b=lugCzOYJfI2DmE998AXAc48YDhtKqJl4wPa73ZUqG88ATLcxybiAVfEKfAsszE3WstpPMi JU6QE0tHe05nNtA8tCYL79GKRwynF8NVSaP2k1VkAzJgC7IGnr11M0EfmzZEUwedC5/NpY ZpDitC5hMlXkX9KaJEJqWJZWh5NbpYFYioEJNN2oVOOlf/tBLsg4eRJyJ/X7Bu5AAUqbhc dLX+iyuEIlZWwuRdjobEzULJI8bfQetcYsxbY3sDtoJCW/6BpKpcgPXaOMNVCXzES7ju1S jfJuBlGg6rfsp5ww7iXEZDcpyTxjT/Qeua67jumb/9udDB7dJtahgH4S8L5PHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hv4lRVtiBxczeYLYPT3lLxgM8RbmAWR7NMM0SYABe14=; b=nyMJjqpmMWVS1P1rrhjJ04Lck4f9I9gs+CByN69NStp90mp2HX+O40kS7+feUrTlhbMcB+ ZVc0T/b5p5QZaaEX1cO6Zffw7v2K4uqMbbIuS+9zcVQoN5LeISPLMOTauR/3xZBLct734W 7lzfN+8Fo44MXs2XJ0GOFf4RkyMVWqHd1FfaeYhj0NqsN+gfDUOf9sDDatNpo8ayiGt9US JYt9AnSuqtcmZLL2jsQQ1Z6qQqBxHiuO9onM/qaEh3Ybuc724MU8yoni0tKwd3lsaKbp/D rnu1rS6MJ7abqCv+6OJ9Wg9pcwK40q3pdmOrHoTEqjYU5nEzOLf50xjl/ecyMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767098976; a=rsa-sha256; cv=none; b=aa708A3Y5tVUO4iI0v1qo5qLjgoyRAd8lM94l6ya1KEdlHDlHC04XVYQ84vyfW+fV7WQc4 CCj0F6nZkzLZ8WjnrjpnnVwx2BxF5xPshTG3B2GlOYuuqkVILO81d+oRbrDLf78QaDfryy QU7aY7blF95CPggbgLplUIcBBwb/jA8XtcarC00DmSJ9/4SCf02eIgroS2FE0XrkB8qyOO qJsitz5ezLH6gahJC7HXSEkTEEY6fHSom97pcjTlOD9/Rwkz5rxr6IEDH94pmV3/RVKK02 nEjzY6P+5Rbz8nEM9zGXjcu8BFeeViQbCfoZG7SR1acE9801L5WRsPNVkN0KFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXwc1SMZz11fH for ; Tue, 30 Dec 2025 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 392d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:49:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 667259b392ec - main - ncurses: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 667259b392ec0a86d066ccc6ba0f4025b3d2a083 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:49:36 +0000 Message-Id: <6953ca60.392d8.2ff7c69d@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=667259b392ec0a86d066ccc6ba0f4025b3d2a083 commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083 Author: Dimitry Andric AuthorDate: 2025-12-30 12:48:07 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:48:56 +0000 ncurses: avoid warnings about too-long initializer strings Increase the size of `assoc::from` to 8 bytes, to avoid warnings from clang 21 similar to: contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 702 | DATA("\033[2J", "ED2"), /* clear page */ | ^~~~~~~~~ contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 716 | DATA("\033[!p", "DECSTR"), /* soft reset */ | ^~~~~~~~~ Reviewed by: markj Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54371 --- contrib/ncurses/progs/infocmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index 7932203ac2b1..f61633cfad80 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -687,7 +687,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; From nobody Tue Dec 30 12:51:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgXyZ36kYz6LsRx for ; Tue, 30 Dec 2025 12:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXyZ2W0Qz3R0m for ; Tue, 30 Dec 2025 12:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767099078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N51n0MrGe/tPRbNDghTqAHA5Z7vi6bwC/b6ngUHgj7Q=; b=Ws8GhM/C2Qldp38++xygsFDRHH4uaNmsCVpiucTVEaGkRgIhRJ9menf8RlkcsswD6jDvaw 157qVZyHfP4oV8vBkWw4VHPJGsPwK+ZMXwJCLcnpSLqS4t1ki6pnepPdeRTGpdKLdFZCy7 YTtBl/CGZkaUQyBNiVF4Jb3DDfl0bsTphNPBmF7m5jxrCSQWRK2t7CX49l4w8BsFfKULkL E9Xh60Zzzv2bwJrBrk83nQ9Oyyx/a9XSnysR0Hnu9c3y5GcvpubBhhZJyuQe22dWOOYgd8 UYjNe5VWTUQ+M7D05Ny/aSsBJNBWRTFZojVnwbJO3zKgAVp3Kg/NKYYVzs1kTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767099078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N51n0MrGe/tPRbNDghTqAHA5Z7vi6bwC/b6ngUHgj7Q=; b=quAwmeIt6JzgI2a/+CN7cFqhTSDl6fKrTaMVZMZC4p4N66e2PmjzsbR5sTU28NSiOe6gjo GlbFl5DY2PGqNJZox/H5FYR7A7BiVLuPEByU2dWQmW+eo+qgMiK5t/uKxCkBRwXloJHXRy gObNs9ml1ldEik6EdkJzqU2ZYBiqGxjGv8u+IzDHLMpUV66/CGidDJvj9jEDDh9T1L83wF oyyrb5gCLSspzi1RnEdBCd2hmmOEn5QvErWFCeKxjXNrowNxUR+9dCLJk0bJV0QX+IIqjo Vb3L1GHl/fquF3UomgY7KiMDLabQLmzwmKY025lhclVRfWQNmeSox0w6YZl+QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767099078; a=rsa-sha256; cv=none; b=HYoLRoZCAOLTESAEIlQ4XE6d+1hh1dapRznVeB1Vutr0iHeBK+AXYvZbHNtKSbYDLN/XU/ eHdG+AalgjWUSZ7j1/m754n8rc93BohS65sUqdUardb/KyHLu0wNDYE3jIqthMZlbB00+v xMuSM9/TJw1msCLslKFVObuPpzCgZSuk1shZr9lw+nufeHWI7a2w9ISy6m8X0d05ttdXDo FEHmu2usdZqJQ67C+LEiHRaUOTp7N0pxni0qZkR4v/HV/dWzXTHW2WgViFaUS5w3TKQqlL WNLuEEe4fSdxs2SQm0IRQkYlP/PpYIto7/bB7kCPqPnj2DxCpVWMV0foG11khw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXyZ1sfnz10l9 for ; Tue, 30 Dec 2025 12:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:51:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: bcd9ea853b14 - main - zfs: rename several printf attribute declarations to __printf__ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd9ea853b14c85a61eb9079c59e966eed336578 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:51:18 +0000 Message-Id: <6953cac6.3a2c6.5dd38de3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd9ea853b14c85a61eb9079c59e966eed336578 commit bcd9ea853b14c85a61eb9079c59e966eed336578 Author: Dimitry Andric AuthorDate: 2025-12-30 12:50:24 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:50:45 +0000 zfs: rename several printf attribute declarations to __printf__ For kernel builds, we redefine `__printf__` to `__freebsd_kprintf__`, to support FreeBSD kernel printf(9) extensions with clang. In OpenZFS various printf related functions are declared with __attribute__((format(printf, X, Y))), so these won't work with the above redefinition. With clang 21 and higher, this leads to errors similar to: sys/contrib/openzfs/module/zfs/spa_misc.c:414:38: error: passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat] 414 | (void) vsnprintf(buf, sizeof (buf), fmt, adx); | ^ Since attribute names can always be spelled with leading and trailing double underscores, rename these instances. Note that in FreeBSD proper we usually use `__printflike` from , but that does not apply to OpenZFS. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54388 --- sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h | 16 ++++++++-------- sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h | 4 ++-- sys/contrib/openzfs/include/sys/spa.h | 4 ++-- sys/contrib/openzfs/include/sys/vdev.h | 2 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h index 93dd1196d977..fa55b3917669 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h @@ -52,28 +52,28 @@ extern "C" { #ifndef _ASM extern void cmn_err(int, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vzcmn_err(zoneid_t, int, const char *, __va_list) - __attribute__((format(printf, 3, 0))); + __attribute__((format(__printf__, 3, 0))); extern void vcmn_err(int, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zcmn_err(zoneid_t, int, const char *, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(__printf__, 3, 4))); extern void vzprintf(zoneid_t, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zprintf(zoneid_t, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vuprintf(const char *, __va_list) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2), __noreturn__)); + __attribute__((format(__printf__, 1, 2), __noreturn__)); #define cmn_err_once(ce, ...) \ do { \ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h index a9619d7d0219..4ae96c91a5f3 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h @@ -55,9 +55,9 @@ MALLOC_DECLARE(M_SOLARIS); typedef struct vmem vmem_t; extern char *kmem_asprintf(const char *, ...) - __attribute__((format(printf, 1, 2))); + __attribute__((format(__printf__, 1, 2))); extern char *kmem_vasprintf(const char *fmt, va_list ap) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern int kmem_scnprintf(char *restrict str, size_t size, const char *restrict fmt, ...); diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 2a4cc60c4aa8..db30b5a066de 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -1127,9 +1127,9 @@ extern void spa_set_allocator(spa_t *spa, const char *allocator); /* Miscellaneous support routines */ extern void spa_load_failed(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_load_note(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_activate_mos_feature(spa_t *spa, const char *feature, dmu_tx_t *tx); extern void spa_deactivate_mos_feature(spa_t *spa, const char *feature); diff --git a/sys/contrib/openzfs/include/sys/vdev.h b/sys/contrib/openzfs/include/sys/vdev.h index 510474d6c085..86f2235f03ac 100644 --- a/sys/contrib/openzfs/include/sys/vdev.h +++ b/sys/contrib/openzfs/include/sys/vdev.h @@ -54,7 +54,7 @@ extern int zfs_nocacheflush; typedef boolean_t vdev_open_children_func_t(vdev_t *vd); extern void vdev_dbgmsg(vdev_t *vd, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vdev_dbgmsg_print_tree(vdev_t *, int); extern int vdev_open(vdev_t *); extern void vdev_open_children(vdev_t *); diff --git a/sys/contrib/openzfs/include/sys/zfs_debug.h b/sys/contrib/openzfs/include/sys/zfs_debug.h index 0f021d15157b..6fe5cf062c17 100644 --- a/sys/contrib/openzfs/include/sys/zfs_debug.h +++ b/sys/contrib/openzfs/include/sys/zfs_debug.h @@ -68,7 +68,7 @@ extern int zfs_dbgmsg_enable; extern void __set_error(const char *file, const char *func, int line, int err); extern void __zfs_dbgmsg(char *buf); extern void __dprintf(boolean_t dprint, const char *file, const char *func, - int line, const char *fmt, ...) __attribute__((format(printf, 5, 6))); + int line, const char *fmt, ...) __attribute__((format(__printf__, 5, 6))); /* * Some general principles for using zfs_dbgmsg(): From nobody Tue Dec 30 13:17:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXR5wrJz6LtwV for ; Tue, 30 Dec 2025 13:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXR4HZZz3ThR for ; Tue, 30 Dec 2025 13:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3lphhODO2G2tvCpM2IhaP7/ZQmYV6UrXln1J3mfhUk=; b=p45PHDexd6E8OMmN9gqHP1GZcuv9OYN3/KUggftCmCXazwua6Ouu2UtG+pJ407RBX2Cg/8 YRLavNymUKOHrCrBYnynLx6WPn7tWuvmIoxILSUGFvZkvgjNMsc58dV0/PHWjNMsZw7eAS DnLNfunTcu4SUqC1pc08m/0ofoJo7T5dXgDKuEXyUN0Gw1zn3THOXoqkP/1rvdSieMQQsJ oFlvzjX5TpHzRAMTiG0GVrF1+mXMZLFdltLUAQp9SAmojxIOXdQsE/5ZnD2Dftfg7jiqqu Zw/8IAlO8mF26oshD6TMFD+TXuhsaFNInkZxsDu907qQXUU+GTXoCMHvVKwnbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3lphhODO2G2tvCpM2IhaP7/ZQmYV6UrXln1J3mfhUk=; b=XOJZJVPSt2fRMqcX+czwk9OaoVy4Zjwa7qSWo8MHkvbf/TfJO1ZbZAEqe6xZPUQa1D5C5B e04Mj+if5gPoZpJwBi5oAO7SVwIDnRViUY+5n1ARBP3uugYfe/6cX5PV374U+43Qts0+U/ hfM5wBjJI/HAUTImiwvCUl8Uh61N2sk0QGYytwZa05G/DJWLVA+Hd2FfEoDR5uHcLw2hRH MlV56+Po/IhcwieN1gMX+7MEjel5CmcOTX9jGSDMR3dXEag+zCgwDsDeoK7tm6S6I2pHoT Qkd85qXrEzp19U/dgDL+iqX+Re/x4skdcQvvw0JG0sX3W/LJXy4WiRvPKxH+HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100631; a=rsa-sha256; cv=none; b=dZvcH0FhrEB7wAlFp7K5MA2PgLUjkGw4yQOQhDSTMIKAdgYQWmbD3UIO+RQNhg+37HGr4o yemszfvkhMVnSv7zeflS9HAPmDPDHduEVHGQYJtWbtdUgmplOa5h/2sKyTbWkWfgtsZzjX REZGLKVwLh9eupu1u05hk3xzt2giZQ2RomR+XqtD6MkpTD0Vhtn7pz1OfJi8FDZ3KeiM5I OKFFjY74abctSMqjEdCywJt/QbNZiLSyf5HFoHdzrQ/trdmDzCCZzFOmu+Pl0PQsDiDZQt mdDOPfM+WKsKalFozkruXJpSwYBxD7A5DjVEk2n8QCsMDGrbo3h/HeaCrgh/qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXR3HlKz123Z for ; Tue, 30 Dec 2025 13:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d21f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 190c1f3d9326 - main - pfctl: allow network programs select DSCP_VA for network ToS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 190c1f3d9326afbc1eabd48e5cb3fe96043508c9 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:11 +0000 Message-Id: <6953d0d7.3d21f.ecdf8cc@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=190c1f3d9326afbc1eabd48e5cb3fe96043508c9 commit 190c1f3d9326afbc1eabd48e5cb3fe96043508c9 Author: Kristof Provost AuthorDate: 2025-12-29 09:52:39 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:52 +0000 pfctl: allow network programs select DSCP_VA for network ToS OK stsp@ Obtained from: OpenBSD, phessler , f8a2f73b65 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 127e2c257d69..c52eb3f86c60 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7604,6 +7604,7 @@ map_tos(char *s, int *val) { "cs6", IPTOS_DSCP_CS6 }, { "cs7", IPTOS_DSCP_CS7 }, { "ef", IPTOS_DSCP_EF }, + { "va", IPTOS_DSCP_VA }, { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, { "lowdelay", IPTOS_LOWDELAY }, { "netcontrol", IPTOS_PREC_NETCONTROL }, From nobody Tue Dec 30 13:17:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXS5pXQz6Ltmx for ; Tue, 30 Dec 2025 13:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXS43Msz3Tn2 for ; Tue, 30 Dec 2025 13:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsA539rFm6XFgsOu1blV7Qur7S0jZMOkwzIocpHzgMc=; b=R+354odsEEvrcoECgEzEt+3oSyDgxOB8+A2JfTaCaHWwxDOJBv2SklhnEjL+c2L3CjsfVs p5ECVaEJVAqWz53JKBb4wwlg4kn6Z6ZCqO4SzbY370HZazwja/2Omd+872pdTMMzsyQaL9 soRR3KZB+osUzPtrej6JHnM2po1zNLdlVJEUG2mfGTo/x/0n67xgbCG8Q1SmsBCw4VHNQM PrVx699cqavqjg16XrhAQd0OLbh4ifGV+ZkrN10muf8cK9+b8XFU1Y9ZfhntRsAr2Qo81C 1yVFrDf8hWJfREdsq2gaeR6zOww7NRTAd01hxfBF0u8Wn+6L3erCdHJg+/tDwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsA539rFm6XFgsOu1blV7Qur7S0jZMOkwzIocpHzgMc=; b=mgcDQqdunptGFPPEqnQ7mh/46lAmuvEtdMKFq17MPKyeBpGhtUVfJfqfFJ/vGck4QN6M00 Q9RD9LN4V5nY5lmISqper9ymGLwzGCQeUTsIysCqCYqBNSDWTISG24pETqb+iQceBKfcTh KSbXmM6GjbSHZdx1MfyBhB1DTnOubTSjk2YLl7NXN0TitgCot8b1ivzhNBsxuTFUjGbZ4F KMeSUbNz/nUp5bhbFcwcrpEmT0Yeu3fLkhRgw4+iOFsIPN01r4z8OP+yau3fjJIrrlqYcE E5N6MtPef3MJdm9Zaju+OoSAABbYqgHxlrdWJMA3gknnPCUwi7K+1mRv2u9x4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100632; a=rsa-sha256; cv=none; b=Vdwg7QqCz1IxtN0rQEUiIwS8FsgdBkbwDOo+S/M7490fzb+PsAaGf6UB3uI9dihlFmYswd iBREN801DtdnJNPuSlc5GSlCP58qqCQxvEGsq/jaYXL6mdunZg7DOSCJRCaUL3Z0EIZ8+S ngnozTDppxCtbyxWwyXZVWcaGjRzBxbL2UMV/5HCWaRwfN/5tJuAaquvnQsHyKPkJ2k97D LMcdrjpU1BygtEEs2NpbdOrAvW2aPBiTm9kRA/WNss9PGFsxrMoJamKhlQMEfnQJU0ymAn lzGGVz8QNs5Hd7FOXaXnC/ehmkjFKz/G5KZ6MKv5JCEYJbjWdeq/jBvYN6ODkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXS3RxKz12Cb for ; Tue, 30 Dec 2025 13:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c15f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c2e7a52374b3 - main - pf: move DIOCRCLRASTATS into libpfctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2e7a52374b3e4bef41c5cad4c24f158c870b476 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:12 +0000 Message-Id: <6953d0d8.3c15f.4e8f391c@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2e7a52374b3e4bef41c5cad4c24f158c870b476 commit c2e7a52374b3e4bef41c5cad4c24f158c870b476 Author: Kristof Provost AuthorDate: 2025-12-29 09:45:48 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:52 +0000 pf: move DIOCRCLRASTATS into libpfctl Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 25 +++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 2 ++ sbin/pfctl/pfctl_radix.c | 18 +----------------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 7e5a07ccd55a..6aac9a9c04ae 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3843,3 +3843,28 @@ pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, return (0); } + +int +pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nzero, int flags) +{ + struct pfioc_table io; + + if (size < 0 || !tbl || (size && !addr)) { + errno = EINVAL; + return (-1); + } + + bzero(&io, sizeof io); + io.pfrio_flags = flags; + io.pfrio_table = *tbl; + io.pfrio_buffer = addr; + io.pfrio_esize = sizeof(*addr); + io.pfrio_size = size; + if (ioctl(h->fd, DIOCRCLRASTATS, &io) == -1) + return (-1); + if (nzero) + *nzero = io.pfrio_nzero; + return (0); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 9576118fe146..b885497ab0e8 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -587,5 +587,7 @@ int pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, int pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, struct pfr_astats *addr, int *size, int flags); +int pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nzero, int flags); #endif diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 3ea127dd2451..4ae301756200 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -201,23 +201,7 @@ int pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, int *nzero, int flags) { - struct pfioc_table io; - - if (size < 0 || !tbl || (size && !addr)) { - errno = EINVAL; - return (-1); - } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_table = *tbl; - io.pfrio_buffer = addr; - io.pfrio_esize = sizeof(*addr); - io.pfrio_size = size; - if (ioctl(dev, DIOCRCLRASTATS, &io) == -1) - return (-1); - if (nzero) - *nzero = io.pfrio_nzero; - return (0); + return (pfctl_clr_astats(pfh, tbl, addr, size, nzero, flags)); } int From nobody Tue Dec 30 13:17:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXV14mTz6LtwX for ; Tue, 30 Dec 2025 13:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXT5N7Tz3TkW for ; Tue, 30 Dec 2025 13:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUw+a3pXs/Ct6pFqKW42mcVQ7zC7U42emv8hgh/vdxw=; b=tt2uYHw09PWwVy5FpYa3n7ZkicrWrSgqRyy1JekvKDZCRIse+zFgWTHJEUxJY215rXsvtw +Q81GoAGh5NHE0YBCeq/vydk3fuGPBl/xHA8AX4QSEuqp27i2dwJxTLKhKz9ZuWgWGmp3r 4Sdt/RnY9cpnz+2B+9vuIQFsrRQQoLzQsmXYfZClv74nxswSkHx5VFF9RbJoCypS30f/0S tSfZYZsCdm3XGGHz4SE0Zzxc5SLhjx2Q/hOzn2xxThX2aMoGQzEOny+dgLNtKJCzHLFvtT lwFIyI5eSC+tnvhwFAh6DHwAFUp1PbQsin6goYkN1IfKbM8zC0SApHuRb0uNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUw+a3pXs/Ct6pFqKW42mcVQ7zC7U42emv8hgh/vdxw=; b=VVfzi+WrFYgU0rEjuQetrK7zwpdE+xbQQIRXoQh5onGcVyI/NiI8/y8ZjxTZyi/hD+WpfG iIpes5xyeefBkYgCe7b+amZbe5Jtl2+QswUI30t1sqnllXCBBrVqedmX+LQOpe8pr7Wk1j iZkjd4hmE866QMVFVdUKyHNlW3jvzJjr6E1BIAKZVwwB6CqpPn0bf+/9FPS7gPxI9SQX4U D50aSsGxPlTgqBlBGRC2IVGVhedtI9VSgjUijuB0iukdPHUwcL49PvJ7PYRD7DestPuTw8 mTpcFQICRfom+hBx+YFjiP+wGBj44YzRlN4L02B3ddQAJgTtFrt0it/e8A9zfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100633; a=rsa-sha256; cv=none; b=gJhiSfevyG2N1AvVPqefdYR8iAM9T1P0nx97m1vvqim548zqMScr4nkkXQm2JT+/sdC2Tp iLFG84CFISHbleJ3+z4OhKd2pPhX1NhH+F1KGKqVw5SqWZNBW1tgomDbk7jtEzS/u/DCgN mL8bHcyC5kzaEhN4WLYWKfoAiNFiJMcikmbI+MjHYeLbmAIUf2/xpZknnUIqneTCPNvhTw RNh56xhQ40k4F0cVAtXwvM53xY30wqzS/O1zW7QXcdz1Chb0vYleVzBEkoQyJ/gcPOdPY4 kIMpqq0e1LSar5F4YJ2Wi9TlMSwImkZflXlh/QgYV1Jbp7oLbO0jMZQtA0QdYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXT4F7Gz12Nh for ; Tue, 30 Dec 2025 13:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d07b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 96c7e70c18a4 - main - pf: convert DIOCRCLRASTATS to netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c7e70c18a42e8cad9305db2a3b30328d76d84f Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:13 +0000 Message-Id: <6953d0d9.3d07b.555f9bcb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=96c7e70c18a42e8cad9305db2a3b30328d76d84f commit 96c7e70c18a42e8cad9305db2a3b30328d76d84f Author: Kristof Provost AuthorDate: 2025-12-29 16:50:08 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:53 +0000 pf: convert DIOCRCLRASTATS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 78 +++++++++++++++++++++++++++++++++++++----------- sbin/pfctl/pfctl_radix.c | 8 ++++- sys/netpfil/pf/pf_nl.c | 40 +++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 2 ++ 4 files changed, 109 insertions(+), 19 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 6aac9a9c04ae..f8c92a5cd319 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3757,7 +3757,8 @@ struct nl_astats { struct pfr_astats *a; size_t max; size_t count; - uint64_t total_count; + uint32_t total_count; + uint32_t zeroed; }; #define _OUT(_field) offsetof(struct pfr_astats, _field) @@ -3792,6 +3793,7 @@ snl_attr_get_pfr_astats(struct snl_state *ss, struct nlattr *nla, static struct snl_attr_parser ap_table_get_astats[] = { { .type = PF_TAS_ASTATS, .off = 0, .cb = snl_attr_get_pfr_astats }, { .type = PF_TAS_ASTATS_COUNT, .off = _OUT(total_count), .cb = snl_attr_get_uint32 }, + { .type = PF_TAS_ASTATS_ZEROED, .off = _OUT(zeroed), .cb = snl_attr_get_uint32 }, }; #undef _OUT SNL_DECLARE_PARSER(table_astats_parser, struct genlmsghdr, snl_f_p_empty, ap_table_get_astats); @@ -3844,27 +3846,67 @@ pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, return (0); } -int -pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, - struct pfr_addr *addr, int size, int *nzero, int flags) +static int +_pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addrs, int size, int *nzero, int flags) { - struct pfioc_table io; + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + struct nl_astats attrs; + int family_id; - if (size < 0 || !tbl || (size && !addr)) { - errno = EINVAL; - return (-1); + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_TABLE_CLEAR_ASTATS); + + snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); + snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); + for (int i = 0; i < size; i++) + snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&h->ss, hdr, &table_astats_parser, &attrs)) + continue; } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_table = *tbl; - io.pfrio_buffer = addr; - io.pfrio_esize = sizeof(*addr); - io.pfrio_size = size; - if (ioctl(h->fd, DIOCRCLRASTATS, &io) == -1) - return (-1); if (nzero) - *nzero = io.pfrio_nzero; - return (0); + *nzero = attrs.zeroed; + + return (e.error); +} + +int +pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addrs, int size, int *nzero, int flags) +{ + int ret; + int off = 0; + int partial_zeroed; + int chunk_size; + + do { + chunk_size = MIN(size - off, 256); + ret = _pfctl_clr_astats(h, tbl, &addrs[off], chunk_size, + &partial_zeroed, flags); + if (ret != 0) + break; + if (nzero) + *nzero += partial_zeroed; + off += chunk_size; + } while (off < size); + + return (ret); } diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 4ae301756200..e8d3a1b8dcc3 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -201,7 +201,13 @@ int pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, int *nzero, int flags) { - return (pfctl_clr_astats(pfh, tbl, addr, size, nzero, flags)); + int ret; + + ret = pfctl_clr_astats(pfh, tbl, addr, size, nzero, flags); + if (ret != 0) + errno = ret; + + return (ret); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 6bd858373bd2..0a8538607ed7 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2434,6 +2434,39 @@ out: free(pfrastats, M_PF); return (error); } +static int +pf_handle_table_clear_astats(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct nl_parsed_table_addrs attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + error = nl_parse_nlmsg(hdr, &table_addr_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_WLOCK(); + error = pfr_clr_astats(&attrs.table, &attrs.addrs[0], + attrs.addr_count, &attrs.nchange, + attrs.flags | PFR_FLAG_USERIOCTL); + PF_RULES_WUNLOCK(); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_TABLE_CLEAR_ASTATS; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_u32(nw, PF_TAS_ASTATS_ZEROED, attrs.nchange); + + if (!nlmsg_end(nw)) + return (ENOMEM); + + return (error); +} static const struct nlhdr_parser *all_parsers[] = { &state_parser, @@ -2708,6 +2741,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_TABLE_CLEAR_ASTATS, + .cmd_name = "TABLE_CLEAR_ASTATS", + .cmd_cb = pf_handle_table_clear_astats, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 5ca14758932a..216f3d13db32 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -72,6 +72,7 @@ enum { PFNL_CMD_TABLE_SET_ADDR = 34, PFNL_CMD_TABLE_GET_ADDR = 35, PFNL_CMD_TABLE_GET_ASTATS = 36, + PFNL_CMD_TABLE_CLEAR_ASTATS = 37, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -504,6 +505,7 @@ enum pf_table_astats_t { PF_TAS_ASTATS = 2, /* nested, pfr_astats_t */ PF_TAS_FLAGS = 3, /* u32 */ PF_TAS_ASTATS_COUNT = 4, /* u32 */ + PF_TAS_ASTATS_ZEROED = 5, /* u32 */ }; #ifdef _KERNEL From nobody Tue Dec 30 13:17:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXW12N5z6LvNk for ; Tue, 30 Dec 2025 13:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXV65rcz3TsX for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CthdihQa1SgzRxOWtJ6R0nJ8unGVJhMhOkofCt+UmI=; b=xyg2lQmocbkYFkGvUnx7hhiG1szsCHOxTUKZzpzI2gCDPszKqifESDT0b/jpQx/1W+yHEH tsut8j5/PSYLC0hpPLiE+IOXOddU+Qtpz/fT2/s+kF/z5DAVF1HuM7p0z1KoAsgjeU0r8m EfiwS5B7WajHBsgTag1Clwv1Fz/AiMn4CYUXThhxJoeIOud8MDL+RfyfCFnI5+VOeqaQdm yulHfinRZZpM7t8NAamMxB8hHMqKJuqhbGrcH5zgmZ+HODjpukn3LN4nlSg8bvHZYpnN1K yPZYdGxisAWjXg0WnpXvRG2S+kw9pPEL+FB8LCAY8jZ3Ditu4f6MXvwjffE5Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CthdihQa1SgzRxOWtJ6R0nJ8unGVJhMhOkofCt+UmI=; b=c0PdXE3mj1PKHjLRchAJHURB2ZpYjnEOpd+1eDC7sq8Z0ceO4g1jITI9mWSUIQz59FEyAL 0VWhO+11LPZcMAg09c12OZfOS8rHya+2YdoyG/u9bPedwd72iuzJI8ZrDE4TuI8MABna0/ zF9qdGwrIp26lh5IDvcGfd0BQR/a7UvcXlO+5ddIHyZjEfdX4trlT2OcUkSMXPU4nTcZLf poReGcgdVamNa9GpeEU8UiA1EH90frVR6BOjXrl9Jt0RV2ssrhYxjfLWfqc/5uKEmfANcK zYXMeB8DpgBhzz46La/8dkqMeXUzrrbVTy3GtvJoiR6mj5DJ69mLHV0fgCI4lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100634; a=rsa-sha256; cv=none; b=LvRfBdoVU87/jW/PKtSOt+d0hpL5nRM8SsjAM9nc/Mw7SHjNbFlLba1B2JwUYclsagoNMS bOAvJfYyDnPqG7krnvWSzGwEjw4+xVy4glB7MaipGAu1+YzvAaYMDPsLz1r5ClssNQR4W3 rKrGvSUFbsxYTmLSzXJU29sUbtHNIpUyBEUFL/TRHOM3dx+oBerf9NtwepKsYFjjTqJeAN oLbCf4PSp2tPFcwx4+gaMp1z0xHs1Vktsrwgr9q6SU5RfTRnp6TwT2MQi/eGVtcgZh3tJV VyGzOWhihLRxDQBvXGBGUGu8dGYnG0nNZdDkDPx3kEX669Rz5wqgfIwq5gZOBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXV51KDz123b for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c163 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2eec2bcca297 - main - pf tests: avoid cleanup failures on skipped tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2eec2bcca2972b58fb8e9acb65c208af423f2181 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:14 +0000 Message-Id: <6953d0da.3c163.726cd9e1@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2eec2bcca2972b58fb8e9acb65c208af423f2181 commit 2eec2bcca2972b58fb8e9acb65c208af423f2181 Author: Kristof Provost AuthorDate: 2025-12-30 10:30:15 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:53 +0000 pf tests: avoid cleanup failures on skipped tests If we skip the nat:binat_* tests (e.g. because pf.ko isn't loaded) the inetd_tester.pid file isn't created. We still run the cleanup function, which tries to use this file to clean up the test environment. This results in 'broken: Test case cleanup did not terminate successfully'. Avoid this by checking if the pid file exists before using it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/nat.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 3d953b495953..025471f75f97 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -804,8 +804,8 @@ binat_compat_body() binat_compat_cleanup() { + [ -f ${PWD}/inetd_tester.pid ] && kill $(cat ${PWD}/inetd_tester.pid) pft_cleanup - kill $(cat ${PWD}/inetd_tester.pid) } atf_test_case "binat_match" "cleanup" @@ -872,8 +872,8 @@ binat_match_body() binat_match_cleanup() { + [ -f ${PWD}/inetd_tester.pid ] && kill $(cat ${PWD}/inetd_tester.pid) pft_cleanup - kill $(cat ${PWD}/inetd_tester.pid) } atf_test_case "empty_pool" "cleanup" From nobody Tue Dec 30 16:10:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgdNT0NdYz6M8PR for ; Tue, 30 Dec 2025 16:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgdNS3nvrz4L4Z for ; Tue, 30 Dec 2025 16: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=1767111032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txR8dd3cK/rrSiX21HpB2XriyXPvr54j6aq/60z3sE8=; b=h+57l1XS3S4VtaytRKFTubU/BNN9aeODLk+jF4dpUO9wfSPB4vn0uwFb9wn3vy3mgEtFtP m1L3k1AlAMdgsm0GzHMoEeDGQBnKJ6I8CjJUe/Y/CsUBmhaytHujuK72WXLBnmvUixoT8H y8jE+uRhjq2IrdABo6SDl66S+kNGtGSr2qhvLSnwtWfXqHxwG/9JgPd+kyRaG8IgCIgw2p 5n0e5MpAqnAPEa2WkxeIHq3Tv/V/+G2IGYqTrWGiktX7hPHZPkQdY0j3AtmpCe9izfx5ZF vMPf64Bp1A5wtHK1wSa+AmHvtibB5Qq1SpgRm4LHOHq/fgsOQhZX3sDDD5tsxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767111032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txR8dd3cK/rrSiX21HpB2XriyXPvr54j6aq/60z3sE8=; b=dCdRk1FIC13bHGX2dwgL3DxUZw3v2WRWUfvfyVPzRy7yzMRotUNLlxqIOsTDo2xmJgu8eD 5u6KNfazLPAy3W4lu3PoCEu7SQ/4OEa0ac6s2/lDqPUIj5Fq+JafQu5sCwClGOJisGnUFB UR9t/UsZETclGO78Eq1yna45dXTVf4O7yfOzCpjQFMVSQuc31bX5WUBTPnt2DPCyb6Ac5x c3wamiDiKkc5m5V9kUsrKMeXlezbdPlrCeUnk0UZrpOFdb0Fbazsq9FZ3OdAvY6BsgJowb i6c/bgm0ZGF7qGmGqy96cV7OGP3fB82EyzBfmRFPkrdzDgZKiknP9hUFeRo8FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767111032; a=rsa-sha256; cv=none; b=l+3QIgbgxwL3JEgeIgS7AYSoDXZnd2mtySAdbHKXQm3nrtGsmLk7ro/vydQtv2+j+1fCMc NCiDV08gPzZN5oIJeckogcNSRomLTpyrvkvpsWOhSfnf9vEEMCjc4OB8wwTBcsz6oLq9Og 2WUau4+WoONIFsAIgKdGYKWUNbPj62lZOnteeHBNHqiQF0U4Dhx5FPyEOCB21sP2fL6lzB deiL8vjoyA4NmGh189VKg+Gh6zrEKozYpHhxYfWcRjy9o0+ms6sBzlWHVEPFAXR1uVbytz rPx292KPnwMJy25x4sShCEjhdQ10EEHgRl7tyRh3DoqoX1awJLBdRjzfKD/C4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgdNS3Cdlz16Vj for ; Tue, 30 Dec 2025 16:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ea2e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 16:10:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4a15a3528d72 - stable/15 - aw_rtc: bump settime() delays List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4a15a3528d72a6f7d09b6ed51ba618352e167d1d Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 16:10:32 +0000 Message-Id: <6953f978.ea2e.68cab02@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4a15a3528d72a6f7d09b6ed51ba618352e167d1d commit 4a15a3528d72a6f7d09b6ed51ba618352e167d1d Author: Mitchell Horne AuthorDate: 2025-12-15 15:29:21 +0000 Commit: Mitchell Horne CommitDate: 2025-12-30 16:07:29 +0000 aw_rtc: bump settime() delays There are delay loops, checking the BUSY status bit, before writing to the date or time registers. Each iteration contains a 1usec delay, for a maximum of 70 iterations. This is frequently not enough on the D1 platform, where the message is emitted: rtc0: could not set date, RTC busy Bump the loop delay to 10usecs each, and the maximum number of iterations to 150, for a maximum delay of 1.5msecs between each write of the register. In my testing this seems to be adequate. The loop variable is renamed for clarity/simplicity. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54180 (cherry picked from commit cae9ae66ad1b01e84597d03c436bc0579bd07fd4) --- sys/arm/allwinner/aw_rtc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c index 4af57ab879e8..d3a73d98d86a 100644 --- a/sys/arm/allwinner/aw_rtc.c +++ b/sys/arm/allwinner/aw_rtc.c @@ -87,7 +87,7 @@ #define HALF_OF_SEC_NS 500000000 #define RTC_RES_US 1000000 -#define RTC_TIMEOUT 70 +#define RTC_TIMEOUT 150 #define RTC_READ(sc, reg) bus_read_4((sc)->res, (reg)) #define RTC_WRITE(sc, reg, val) bus_write_4((sc)->res, (reg), (val)) @@ -321,7 +321,8 @@ aw_rtc_settime(device_t dev, struct timespec *ts) { struct aw_rtc_softc *sc = device_get_softc(dev); struct clocktime ct; - uint32_t clk, rdate, rtime; + uint32_t rdate, rtime; + u_int i; /* RTC resolution is 1 sec */ if (ts->tv_nsec >= HALF_OF_SEC_NS) @@ -335,12 +336,12 @@ aw_rtc_settime(device_t dev, struct timespec *ts) return (EINVAL); } - for (clk = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; clk++) { - if (clk > RTC_TIMEOUT) { + for (i = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; i++) { + if (i > RTC_TIMEOUT) { device_printf(dev, "could not set time, RTC busy\n"); return (EINVAL); } - DELAY(1); + DELAY(10); } /* reset time register to avoid unexpected date increment */ RTC_WRITE(sc, sc->conf->rtc_time, 0); @@ -352,21 +353,21 @@ aw_rtc_settime(device_t dev, struct timespec *ts) rtime = SET_SEC_VALUE(ct.sec) | SET_MIN_VALUE(ct.min) | SET_HOUR_VALUE(ct.hour); - for (clk = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; clk++) { - if (clk > RTC_TIMEOUT) { + for (i = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; i++) { + if (i > RTC_TIMEOUT) { device_printf(dev, "could not set date, RTC busy\n"); return (EINVAL); } - DELAY(1); + DELAY(10); } RTC_WRITE(sc, sc->conf->rtc_date, rdate); - for (clk = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; clk++) { - if (clk > RTC_TIMEOUT) { + for (i = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; i++) { + if (i > RTC_TIMEOUT) { device_printf(dev, "could not set time, RTC busy\n"); return (EINVAL); } - DELAY(1); + DELAY(10); } RTC_WRITE(sc, sc->conf->rtc_time, rtime); From nobody Tue Dec 30 23:28:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgq6J3PC8z6LgLT for ; Tue, 30 Dec 2025 23:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgq6J2vLhz3rB7 for ; Tue, 30 Dec 2025 23:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767137336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wkFtblDOfz2UgnJSAG7+k/v9OFAKEtvUiu+bqEBfv+0=; b=RoKOmonpDO8DX09WZh5OiuQ3qdcY4L2faNWr+sYcrMSjB8ydN78RfLR2F5AtVMTvVusNYC P+Pis4CpO0gbtgxA6oZpeg+Wfnjna0fkfVQ7junPgLqZhOtZUC4J2VFuXk1dxHUuEk+qc+ T38WuQrI0KSpzRRVWzgSHlL4CcmpLkZEHftP/rJxIrkwSbLvNCuWxKjg/g5wABi8MkAman iELBva+rnvHKFSklCH11KAOFh5CnGpw850lr0B1R7NyWgQ52Bs8bIenh2MQOYXeM4sQOU2 /IdNssSzq2A7Dr1eBEWyIrt0MCzvAx/VIZn0KmKGA12jEW4W5k8DW3w3E/jgyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767137336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wkFtblDOfz2UgnJSAG7+k/v9OFAKEtvUiu+bqEBfv+0=; b=wq76poUed/4ZkJjhlWZcuw0hFkiN228R+vuHTgS5A6eRUhzYxNMcfYfzN7htBPPQak7fO4 M+9uyDDMWA5sz/w6k3QwsoPL5C7uUbo8HMXl4PSkMxSlqMnhkaXx90iqcSdhJ0uV4lPknO XBiWpMG1EtQnCdNnHxvRdCxOIxO+qPVHs/dIymidRofIeRUmObXmTcsHhshJ4SuHxISXrn X0xnuBGW5gud7ZSGIDHHGjp8EEz2VDqrqaHVFhCZ+joVn1zpwGKQ/yEbIbXXJrX3mJlQn4 la+fxVnEY7c64O62c4+DO6u3XPUb9CN+ccUmrPkQLvIDuDoB0ilfTex7Lvr8Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767137336; a=rsa-sha256; cv=none; b=llC4Ro3TrCx1pGs54qZqKCWvpjdsY2pSjhF5TshJ8gnPEUYm6Ncd9TT4hYePHBnkbgr+0F PUMApuQTyiEFct2bwYEqD/uXe6xkWnHWX8s5YY38GDFt/+XNMvXplBJTx6p7xJEDpw7Dox c4oJCtGLS8nUO01MqqVSTzFBivpNiikGCdUw4TgTw3vLGso35C93maiuM1izFXHsJYJCJK HNlpKjOZYs/eG2dOr4AXXgsafZCRw60sAflrN4oEHzB5wRWNY88wspYtTPe94xTMq+zNdk 0Y1xp1qhLs5zb56HF1Zyo0HWOh4hSo73XMAf+srq+r4SuqRsVyfoj971agMqsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgq6J2Cbyz6Nc for ; Tue, 30 Dec 2025 23:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 23:28:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4fecc8e3fe94 - main - pfctl: remove duplicate "va" entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fecc8e3fe9408621429777b1028c9afb83c3925 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 23:28:51 +0000 Message-Id: <69546033.30b74.4116c0bb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4fecc8e3fe9408621429777b1028c9afb83c3925 commit 4fecc8e3fe9408621429777b1028c9afb83c3925 Author: Kristof Provost AuthorDate: 2025-12-30 21:23:58 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 22:09:15 +0000 pfctl: remove duplicate "va" entry It turns out we'd already added this a few years ago, so didn't need to add it again. Fixes: 190c1f3d9326 Reported by: Seth Hoffert Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 1 - 1 file changed, 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c52eb3f86c60..127e2c257d69 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7604,7 +7604,6 @@ map_tos(char *s, int *val) { "cs6", IPTOS_DSCP_CS6 }, { "cs7", IPTOS_DSCP_CS7 }, { "ef", IPTOS_DSCP_EF }, - { "va", IPTOS_DSCP_VA }, { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, { "lowdelay", IPTOS_LOWDELAY }, { "netcontrol", IPTOS_PREC_NETCONTROL }, From nobody Wed Dec 31 01:24:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgshC0SJwz6LqMl for ; Wed, 31 Dec 2025 01:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgshB5DK5z42vQ for ; Wed, 31 Dec 2025 01:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767144298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZMRYr80KUbRqBrbvRoni6VY+JKhUSYdVQXCpRXDlLMQ=; b=UTREjP1OjY5brQshbPi+fBlu8djzfYXMMk7vXkXZsq6zn7adg9ZG7hZNYMtDlC9xur0o9a j6ptUnOEDuDFd3KukLQO8lDmqMpTS2viQz47xkyH9BfAw12V8FuV2YsogafThRLDOKgehV GNhBeIHDPnrvszevqdZT1InVNeAVjKUZXjPQpKdfc77wVivac2ZJiyc2Zfv/24/3MvT2Af MwkBoAe9FdgbD3dodpQjqZfqxIJI7MFXe/SIoxLADZaMxwiY5l0jaEC9tUSPbOFqDXYc/q /vie4Td8eZIfc1OioLZ1FIqTwnFBaCJcZOjw9aButCD29EfJFVMUc2RlK6YREQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767144298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZMRYr80KUbRqBrbvRoni6VY+JKhUSYdVQXCpRXDlLMQ=; b=p1qcFq25NOQL7tKplo22N2vHkkXQ8xWqkr+ICMUScDu+9WxPf5pSuO3CT8lpKyvdMUqM6P MprmWol4csxiIlV6hr9WVi52efg13lyecsFdBWh8/UtIwZaZ6YY/TqlQpn6F3fvtzjTnx9 Gbtw9JwCw5G+VArpXr7PMYW+dpnyc/i/30c1szqIto6DauERtoSMVPlg83JZWu/ej9Httf Mf6V8ZIC4rg5Oq6v+RlEmWS6wdQwAcPEbsBbsTg/GitJkfFn1cFKD4P7U31murfdPKaseL 90vccTA1rnv1Ez7FEX3Ej1E1Z5WL13xesS6M4cy1PCjqjvXTbRqzPKU5ss/q8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767144298; a=rsa-sha256; cv=none; b=jzyEU1oBCObgnoagJZT5GGqgCb4T/vjnbm7WyAPpLoiXLaSu7z0sIt2aSmF/tKIptBs8hy wkoQXWP8Ih5xHxzGh0JEtlvGMcxBBLb4libx3IN743M5my9iYoBXFTUxxxResXj4B4dK04 +2048Bb+UQSmsUiQUwzbJA97jMgvG+Ie6Io5u3yjT3p76rMIwnJ2+8WNBH/UYI09LKgIFK hscVsBV8gtlf9HYNMheq8gjyfZtzGoGBkNgju8gctJQj1Hb5n1dfXeBbSXzhjnK+2Kevlu D5q0GthFKe6YJpvGnXshaTA00h1Ze52mI3gT8UjPHAYRUpNdPTtMDEPhCsTmmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgshB3z22z96f for ; Wed, 31 Dec 2025 01:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c71c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 01:24:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 785d429c2b93 - stable/15 - nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 785d429c2b930b6c68381cfadb5d4530a6360628 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 01:24:58 +0000 Message-Id: <69547b6a.3c71c.e36ba07@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=785d429c2b930b6c68381cfadb5d4530a6360628 commit 785d429c2b930b6c68381cfadb5d4530a6360628 Author: Rick Macklem AuthorDate: 2025-12-24 16:29:29 +0000 Commit: Rick Macklem CommitDate: 2025-12-31 01:23:27 +0000 nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup The nfsd can be configured to support NFSv3, NFSv4 or both of them. This patch adds a short paragraph to nfsd.8 to explain this. This is a content change. (cherry picked from commit 4f184fd35d81bbd85284d47d2a65aeece67e87d4) --- usr.sbin/nfsd/nfsd.8 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index 2e5724dbce33..79085d33230c 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 30, 2025 +.Dd December 23, 2025 .Dt NFSD 8 .Os .Sh NAME @@ -46,7 +46,7 @@ NFS server .Sh DESCRIPTION The .Nm -utility runs on a server machine to service NFS requests from client machines. +utility runs on a server machine to service NFSv4 and/or NFSv3 requests from client machines. At least one .Nm must be running for a machine to operate as a server. @@ -54,6 +54,62 @@ must be running for a machine to operate as a server. Unless otherwise specified, eight servers per CPU for UDP transport are started. .Pp +The +.Nm +server may be configured to serve NFSv3, NFSv4 or both of them. +When +.Bd +nfs_server_enable="YES" +.Ed +is set in +.Xr rc.conf 5 , +.Nm +is configured for NFSv3 only, by default. +To configure the +.Nm +to serve NFSv4, you must also: +.sp +.Bl -bullet -compact +.It +Add a +.Dq V4: +line to +.Xr exports 5 . +(This is needed as well as either the ZFS sharenfs property +or an exports line for each exported file system.) +.It +Either choose to do uids in +.Dq strings , +which is probably +the easiest unless you are doing +.Xr kerberos 7 +mounts or +run +.Xr nfsuserd 8 +.Pq choose one, not both of these . +Setting the sysctls MIBs +.Va vfs.nfs.enable_uidtostring +and +.Va vfs.nfsd.enable_stringtouid +to one and not running the nfsuserd chooses uids in +.Dq strings . +.It +Set +.Bd +nfsv4_server_enable="YES" +.Ed +in +.Xr rc.conf 5 +or set +.Bd +nfsv4_server_only="YES" +.Ed +in +.Xr rc.conf 5 +if you do not want NFSv3 to be served. +.El +.sp +.Pp When .Nm is run in an appropriately configured vnet jail, the server is restricted @@ -336,7 +392,9 @@ just do a .Xr pnfs 4 , .Xr pnfsserver 4 , .Xr exports 5 , +.Xr rc.conf 5 , .Xr stablerestart 5 , +.Xr kerberos 7 , .Xr gssd 8 , .Xr ipfw 8 , .Xr jail 8 , From nobody Wed Dec 31 01:33:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgssr10BXz6LqYf for ; Wed, 31 Dec 2025 01:33: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgssr0PfHz44Tr for ; Wed, 31 Dec 2025 01:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767144800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fVKqb8bHtpdPPTdgbHFT5tQxncNnS6lVCqGLDUCI84=; b=KRGCc3GyGm97yYmdb+Jjw+Y+8Af5FSDZFIGTTgaTxN+JsVTjkw9hxXJDbCN/8dGOqQjQqN FFM2HCuroFTKvzJrVvMCZ0Gx1I/FdC9TUyIaa6ogzZpQib4MrZ7LdCRh6uQE4M6M74Syx7 tRnZKFKtUK4q0UeGhhi8jM4/w6pYPLWfJNIClfqrhvoSXlJUz1r/vPZJNsR96wOpJcBcrg Emhn5xqhyFmAUC+dnHeg5/VgSw+AoXeUMlOnjfEQGbBrmWrRr5UGqb0LInCDCRZqT0l7Pk iQCvtetSlagkb+KwQde/PmsRhQyhoqljI2cTWSTrxpPs0HKVq7wZUpxMrIkW9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767144800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fVKqb8bHtpdPPTdgbHFT5tQxncNnS6lVCqGLDUCI84=; b=Cd6YmMz41ik/4Th7F/ymfJ8mpjiPMRBydV3HTpH/gu9eHPFiTLA8kbJTlIWRkQF9dZu4eO wmO13/STCUkMTJm5fPrbkay1RXY7Tx71yb170g4LJrN2tN/8S2zu0PTEw3G/WB9eRcMgwa YXqbo8yhJltrYGku0S2W5kXyZ+2PdaCK8ge+L/9CdBp9iFFTaaAW/oHOhpTodZYXmxzGn5 skpS4hgjzTT1JbnNIN75FLBnxBcpVlBcvFhN6cshkWyB5Qsu0ONE6Ptj95DM9jiP646H6c A69MY/nzPdLXPIEVwV1rxw89g9SAlrp0M68zR0eP5njXe00JNiE0Adpe6qnYFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767144800; a=rsa-sha256; cv=none; b=kk/D1Wo360b6OuwXDzzZDhrkQx65lRr9paFMrBkFRse1J1KP+uur44fV79eQ7vqhAb5+Q2 iwGM6tRrLXthAyJYgS1DLczM4yyiqLFC0/rPNckVN+Lxt0SyY7ZtVCTzgJ7ySzU0wbB5X0 RKQk2HSd36xCrp6pgGBSiR748ddDX7J5jGgsET++wzoWCJZB6443jEHaIDts/tgQzPYzJ2 iZWrL51+r/MWoOHCmqp0jK7WtiHUb4sSNUoBkUlB8rpQnSQiYWMIZbFQel0YL/h+LCKzui vsA79+9Y/89vmlKzSW5SmhTWGP7Vhuywc+clqabkohGY4PJmq0pqRiayedm7fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgssq6Zm6z97F for ; Wed, 31 Dec 2025 01:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c9d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 01:33:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: ab5ec8ccbcf0 - stable/14 - nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab5ec8ccbcf0f1b470690742e2049bb4534b4eae Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 01:33:19 +0000 Message-Id: <69547d5f.3c9d1.76585a07@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ab5ec8ccbcf0f1b470690742e2049bb4534b4eae commit ab5ec8ccbcf0f1b470690742e2049bb4534b4eae Author: Rick Macklem AuthorDate: 2025-12-24 16:29:29 +0000 Commit: Rick Macklem CommitDate: 2025-12-31 01:32:07 +0000 nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup The nfsd can be configured to support NFSv3, NFSv4 or both of them. This patch adds a short paragraph to nfsd.8 to explain this. This is a content change. (cherry picked from commit 4f184fd35d81bbd85284d47d2a65aeece67e87d4) --- usr.sbin/nfsd/nfsd.8 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index 46478f978f21..e4fd1b286f0c 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)nfsd.8 8.4 (Berkeley) 3/29/95 .\" -.Dd February 21, 2025 +.Dd December 23, 2025 .Dt NFSD 8 .Os .Sh NAME @@ -47,7 +47,7 @@ NFS server .Sh DESCRIPTION The .Nm -utility runs on a server machine to service NFS requests from client machines. +utility runs on a server machine to service NFSv4 and/or NFSv3 requests from client machines. At least one .Nm must be running for a machine to operate as a server. @@ -55,6 +55,62 @@ must be running for a machine to operate as a server. Unless otherwise specified, eight servers per CPU for UDP transport are started. .Pp +The +.Nm +server may be configured to serve NFSv3, NFSv4 or both of them. +When +.Bd +nfs_server_enable="YES" +.Ed +is set in +.Xr rc.conf 5 , +.Nm +is configured for NFSv3 only, by default. +To configure the +.Nm +to serve NFSv4, you must also: +.sp +.Bl -bullet -compact +.It +Add a +.Dq V4: +line to +.Xr exports 5 . +(This is needed as well as either the ZFS sharenfs property +or an exports line for each exported file system.) +.It +Either choose to do uids in +.Dq strings , +which is probably +the easiest unless you are doing +.Xr kerberos 7 +mounts or +run +.Xr nfsuserd 8 +.Pq choose one, not both of these . +Setting the sysctls MIBs +.Va vfs.nfs.enable_uidtostring +and +.Va vfs.nfsd.enable_stringtouid +to one and not running the nfsuserd chooses uids in +.Dq strings . +.It +Set +.Bd +nfsv4_server_enable="YES" +.Ed +in +.Xr rc.conf 5 +or set +.Bd +nfsv4_server_only="YES" +.Ed +in +.Xr rc.conf 5 +if you do not want NFSv3 to be served. +.El +.sp +.Pp When .Nm is run in an appropriately configured vnet jail, the server is restricted @@ -329,7 +385,9 @@ just do a .Xr pnfs 4 , .Xr pnfsserver 4 , .Xr exports 5 , +.Xr rc.conf 5 , .Xr stablerestart 5 , +.Xr kerberos 7 , .Xr gssd 8 , .Xr ipfw 8 , .Xr jail 8 , From nobody Wed Dec 31 02:44:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgvSD148gz6Lw2B for ; Wed, 31 Dec 2025 02:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgvSD0JdJz3DgZ for ; Wed, 31 Dec 2025 02:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767149084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bNKKLijqGsytxYnRnY8p695dS6r5HHaZmQCKC53yrbg=; b=JbSDUmC6JMyx86pxPqywqqjVUQQBZ13vt9dOoe/pfw6LTL158EmYWVh68tAE5zQb1Bx826 tP4QsNAzTHYpvUgbFHX73FgtpeABzByI2uwIjq2vmDXNRNCDGVFbG92QPlFy4ImJSbquqG wSdaSqa6xviZS3tMWlyJwSba0OJmZS1W4UWHkQJxkBpQNcwxy9vodqbwyqm+IjLUc0EGOv vLzGz8bFLEtZW544pXNFB10hH7J+X/XJi3DH6HWiRK1FGxj9Z0b6VZjOH1N0O1o7+hqz6I iWhQHvFfc7Cr06DbmEOg3Y4iWvRMcv9L/0TbrB8uue7t9v9r2UsKOIztZ5yHPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767149084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bNKKLijqGsytxYnRnY8p695dS6r5HHaZmQCKC53yrbg=; b=FGtYkCB5xAWvy3QiwGG8B0CMras64C4pF2h1KeVAWTeedlGftOVU3VsPJmKhfbVUin8jaM tcqi6KLeQPNvYMvmOgi9PoDx5kf8MY87zCRi+UGw5mv+b6m4VcrSaPvWn7b1ciyF9Oad7U PEVluhA4UYLReGRT8WeL+90EJtpIb9CVqWzWCKkzjhzykxemAZguiXVkhaDTFHnDYgQpp8 lOV7ikqygtvJUptbWZySIopj8nUXlxK5kpXo0MeZ++rMF9Qp0G10oHKeiCTCUcYCgrPPJW lk3XaezSk1DkmVLvn6mnDCMhjIdcrExZa5UZW6I1emReyrkpEMM4qUyamMiXdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767149084; a=rsa-sha256; cv=none; b=SWNAo0PinLb695Cj/QnAbNeF9cE+UWYuuRArvhVxZM2+jq3klFssXGgfX8cibKQ1aK5kZM ZeoCQSQyyUZvjrcZj+2SEmCP3XnHJKEaKrPD5LmeOFfcgr8m+FACpyew/E2hG0g5bXACCI rMltYbcFOP5Ka9YuXgZBranTXCwv3uwV7wbB3P7NkOH7CY+SeuGJp4Tv0sgB9jJKn/l8A7 PLZFPhqp1bJ+WVxk1oZsy3k1r1XqSx7nSdNAg+GaI9bL1u8jOFMMt3lSvbDXsdsQY6kMRJ qDH0ZUaHsLvjEPxUrawVhmBThDrm8FPq9I6G8nwaAjChP02JT8KxB4ldV9XUOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgvSC6HQ0zC15 for ; Wed, 31 Dec 2025 02:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ab8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 02:44:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: e8567de718a4 - main - nfscl: Fix handling of POSIX draft default ACLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8567de718a4a16edbf5490e1c36360563e16667 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 02:44:43 +0000 Message-Id: <69548e1b.44ab8.74afc39c@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e8567de718a4a16edbf5490e1c36360563e16667 commit e8567de718a4a16edbf5490e1c36360563e16667 Author: Rick Macklem AuthorDate: 2025-12-31 02:43:23 +0000 Commit: Rick Macklem CommitDate: 2025-12-31 02:43:23 +0000 nfscl: Fix handling of POSIX draft default ACLs A POSIX draft default ACL may not exist. As such, an ACL with zero ACEs needs to be allowed. This patch fixes acquisition of POSIX draft default ACLs when they do not exist on the directory. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfsclient/nfs_clvnops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 7484a5a7e082..1bd77ab27ced 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3779,7 +3779,8 @@ nfs_getacl(struct vop_getacl_args *ap) return (EINVAL); error = nfsrpc_getacl(ap->a_vp, ap->a_type, ap->a_cred, ap->a_td, ap->a_aclp); - if (error == 0 && ap->a_aclp->acl_cnt == 0) + if (error == 0 && ap->a_aclp->acl_cnt == 0 && + ap->a_type != ACL_TYPE_DEFAULT) return (EOPNOTSUPP); if (error > NFSERR_STALE) { (void) nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0); From nobody Wed Dec 31 03:29:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgwTd2mqMz6Lytp; Wed, 31 Dec 2025 03:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgwTd2DqVz3L0D; Wed, 31 Dec 2025 03:31:01 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767151861; 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=3yMFx4K+MNS0PyAcemIY5Dwi4KiLkd7wQoINr0OR02U=; b=GhA913Fl6VHwYcgqWVTm2MI5wZR+CGOCTD6OhMlCXRmp1PP4juUuoah0Vx2+7Kj7yvdg/w 0I9zreheTzr32pw8lMbwLcyqfdBWMWh2jNrHY6uG1nJjd4l9Zw87vhL0U14EIXCbb6LGLX gX7M1xveVkJydXbTbdn5TAOXO+VLMQOtK7W81Fp8k4TSBLmu420NCa6Tf+W5hW459DZmfh GGUJXSj+ZgVdh2XV1Oib4N59iVW0RQQJwlRkbEzn5BABgdKC0DP0oOW2m4dTT8DKvDREJ6 N+wOVfTqRmADGozBrNne7utimes28J+5wtY0zsYQjd7IFFtbdViJ82FUcKcmFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767151861; 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=3yMFx4K+MNS0PyAcemIY5Dwi4KiLkd7wQoINr0OR02U=; b=XmKh5Cr+06WPbCSWqTUSsgJhSS5cf3vyvbDT1PMJimzchCvTMkmg9wSGJbgxAnXTA2/yvA 2B4hRwAu0GSIOjIWFC9UO8JPiNT67pAdPC1EoY/bJ1Zg20FjjtWzGVtRiI0mAk5Z0GUoYC GINLHu+yIAj/HLs0TTCmjM0qw6Yi1ENzdyRFrokmhsc64iaap2fPdV/IlRwDskOZDsssxL aO+XwDBa6rRgmNMqeGd4131VcoBoddLDxOmK2hnDvoSKgepAe2HV3Latn2LPqncHznxnPv Ig8JE7K4daxakjsmpsjqXz9WLwaZKAdfNSzP9b+yuyp5c1JW4tQV7rfdC0ocrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767151861; a=rsa-sha256; cv=none; b=g/R3EEooFpS8Iz8C+OrbXYfdXAUKcg5oJRWIc4Clb2pAw/bUur+IMbMpR8xf6702r0b5HC cJO1QkK4A7ycQk+v0TyIbs1keIPK56tJuqo8PNXv65HC20mt1ub6lK6lHi1b1QI11ijh3y 79SXQgBn1faKdD4T4v+1lpOYkRjao3Pi8QUnD4ga2UaZY0hACo7gK5cQU1GCh/+REZnqsm Yk53bzb8mnNBpszfLGOcIi62sf+g6spq8YXieAfDDHN7KWixvmYDLVvux2PxfU698aQ7uX oYY2gSOY9eeGQ0NK5tJjTUKDO4kJvp0mjWVZiB3rLXRZEBFaRFQ0YiAA6t2L0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dgwTc5xfZzB6B; Wed, 31 Dec 2025 03:31:00 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 31 Dec 2025 03:29:56 +0000 From: Lexi Winter To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 424089a0fc82 - main - loader: Fix powerpc64le by working around slof bug in qemu/slof Message-ID: Mail-Followup-To: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6950c4c5.25792.96d1fae@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 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="CKlEfo+egKfo3OtD" Content-Disposition: inline In-Reply-To: <6950c4c5.25792.96d1fae@gitrepo.freebsd.org> --CKlEfo+egKfo3OtD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Warner Losh wrote in <6950c4c5.25792.96d1fae@gitrepo.freebsd.org>: > loader: Fix powerpc64le by working around slof bug in qemu/slof > =20 > MFC After: 3 days (maybe EN too) EN would be of limited use here since you can't boot or install on affected systems and we don't rebuild the install media for errata. that said, i'm not opposed to it if someone thinks it would be useful. --CKlEfo+egKfo3OtD Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaVSYtAAKCRD1nT63mIK/ YBFVAQD63+4k1B8kM05NVI5Q9Log/64MAzgn9xi7DCL1XFZCEwEAkYY0ImW4AEa/ OlJgidfWF9x+4SkOranCNKBDnnPhgQQ= =NPfy -----END PGP SIGNATURE----- --CKlEfo+egKfo3OtD-- From nobody Wed Dec 31 17:16:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dhGpY2DS2z6LyHW for ; Wed, 31 Dec 2025 17:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhGpY19FZz45sb for ; Wed, 31 Dec 2025 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767201413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU2Q20BzztMFYcYa/OuF+mti6uapzVnRNyEhaadixvw=; b=Pit4+mUH9Wvr+nfPVhWNrOwt11KldulFRF9flWqqC1tyV+AYmZXHtACGz9UafD3Dp06BNF uo4ZYEZRFCmDFMInXqenJiKJetumlwUp0fkMt/2z0PBcXULd1eOpsYRJVe0eYUAVsJS6X2 bOT5vYSpDtSb6LRn/bEcT5f3f4nCbfYmO+bVxhLYPX8ADeuFGOKnUUMdlqksTs/o/UpG5y MDKdz4zZVgxOG5l7POUkEqLvItrw9ZLTvBBM6hINOSzMIui6Qw/Upbh7MSTez5tJz/U3wB JXkhP9Eeyy5MlNKkEgttN+29LQ9hxXIrpw1Ii8AwetGSUVfI7PwsB6mOVce6Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767201413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU2Q20BzztMFYcYa/OuF+mti6uapzVnRNyEhaadixvw=; b=XzvCFP62SZyT7hTFSpHzR/itOPHz3dxfb0K+JIS5d7QWcASb+LsEh8VfdiaqFSJe5SZ9xq Wnr6xF1wynyRrUKIzWd2NQEtVSAojqtOfhKJGc50TgXMYrZed90FWOF1KPpqDS3KyboWML prxf0ow28opRoEMkZD/MHQV7+H/3j+ay7QXJ7zcpBRfSTduBwJYQ3CoO24qCVKFTd0a0cK s+ddPqCF5N3JYiOUQujT6Ma4EWhl5l4X+q+opAJBH7h42FtUvjztY3OUJUz9RD0p+5Xk+V NG1vyI0g4BkQusSX1a2LwEyo6+na7x22RE9hCR1u/AoJQhgcgoo0ASE5WFp0Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767201413; a=rsa-sha256; cv=none; b=teUFnoO1TBmHjSm2XWujIQyTpd2RB9mmp9fHcDMwcy0ge+98qrmGECT48TpToG+/0Vjx2h +pmEBAMpBLscczPE2A4Gk7Ondz1BQzFEbinF2dlMLhzszybzphpHM4MUsvfehSEVytAwCg tluqm9EVO/3PNiE5pk5lkPsljQoaxmkkjx8Z2+Wu2ulE9kyVRBSJzaUtJ34qELDUuoB3rs ad+qH6ODzNGPWC9BWXQ6mpXGInYsvQFGzrM2rzP+Rz/nk6Ce0kh4iIX7Jt+/nA2zEbJTOJ 8AcXh5uZd6/A3mHLamryzxERXiYsS5gmeWLEzxyhlFQeU/3Dmpt8cgQJV0gJ6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhGpY0jtgzvnD for ; Wed, 31 Dec 2025 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22037 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 17:16:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 39047538cf5d - main - Merge commit faa5141b9be4 from file git (by Christos Zoulas): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39047538cf5d8f26112f7b08b3c56967f70f7f94 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 17:16:53 +0000 Message-Id: <69555a85.22037.62b46f04@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=39047538cf5d8f26112f7b08b3c56967f70f7f94 commit 39047538cf5d8f26112f7b08b3c56967f70f7f94 Author: Jessica Clarke AuthorDate: 2025-12-31 17:14:55 +0000 Commit: Jessica Clarke CommitDate: 2025-12-31 17:14:55 +0000 Merge commit faa5141b9be4 from file git (by Christos Zoulas): PR/656: harry.sintonen: Fix bug in byte swapping that was caused by the change to make flags uint16_t and cont_level uint8_t. This fixes using a magic.mgc built with a different endianness than file(1) itself, e.g. when building powerpc64 on amd64. PR: 292079 Fixes: ae316d1d1cff ("MFV: file 5.46.") MFC after: 3 days --- contrib/file/src/apprentice.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/file/src/apprentice.c b/contrib/file/src/apprentice.c index 5289f8e87267..dde2dd1e0c2d 100644 --- a/contrib/file/src/apprentice.c +++ b/contrib/file/src/apprentice.c @@ -3646,15 +3646,14 @@ file_varint2uintmax_t(const unsigned char *us, int t, size_t *l) file_private void bs1(struct magic *m) { - m->cont_level = swap2(m->cont_level); + m->flag = swap2(m->flag); m->offset = swap4(CAST(uint32_t, m->offset)); m->in_offset = swap4(CAST(uint32_t, m->in_offset)); m->lineno = swap4(CAST(uint32_t, m->lineno)); if (IS_STRING(m->type)) { m->str_range = swap4(m->str_range); m->str_flags = swap4(m->str_flags); - } - else { + } else { m->value.q = swap8(m->value.q); m->num_mask = swap8(m->num_mask); } From nobody Wed Dec 31 17:36:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dhHFf5nBRz6M0Qd for ; Wed, 31 Dec 2025 17:36: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhHFf573Xz47fm for ; Wed, 31 Dec 2025 17:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767202614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brgdRvBMUQyzxQbrIVBAiosow27vQO2r2I0pdq90QFc=; b=BsMQK+G7UMjGEsKB5kTyV6DHmqtn3LUn6rh3l6AoEzExcHYi1kEJP8H5ooObfSaGyJDJTf 3fen9j/b80FQT3QjFVXkaXnQaaVeH6E/KY2oLwhcS6o5RHCv8Ff9gKQ3UBePcKZMKBnjaG 5ZbfatWH5/Le9nScf2CYj9rH+/yud6zn3vn5IkWmxvxYYWX+uRqqifomstjV9fILmq51+1 ApMZiIPY3qL8s2PLcvBVhzq7o42IXBjh+6evOaarf9/b+u38r4DhBr/mP0IwWyVOoczMwJ wK1ttWPY9vQCkJ+8FUqnbonIUeV5Jqrcp3i8HJCg3tU6s0dQZRY7k5UHF0e1eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767202614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brgdRvBMUQyzxQbrIVBAiosow27vQO2r2I0pdq90QFc=; b=y22Jyy1YbIE4LRzJqNB10R+ES4E3NQUJ4qp48bFeb7BiPh4IKF5Ub9UzUa09yUH40OqOkR 4Sx/K6FtQ+BoDKlKvWjWEoY07UaKpD/1Bywakk1/42KFOjGXb6rDTIrmu5QaQpIepY1/vx MYdx3pjYuc+9mRAp4i4exT2CmGdzM3KKBogb6Z5mbTjjyhlyQ9g6Nm76FThi+/kz37GS7/ +6Lj9PJQnJuZ6YYzOl3ferlLmkrHsG+a4y4LP6tjGEgp6bO7oX2ON49Ftjrg0pmvzOyuiX +dYQPJqNTLmJdwE+BRTeBDbE460SJTMLpNlEgOVjPOQ7SMpcsIcgAhJoK0yx3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767202614; a=rsa-sha256; cv=none; b=cI/y9Vec/yEoR6Jhs+oeZBLyu61xgd1ueofckQ1RldyH6lKZekqzp4++5sU1EVOj3NuXkb n8lSyp4zPSMVxr0H8663287r72GpsoJ6QaJOuzUCkdqpMkOn/aCE+Icn+GOGvlT9thGSrk zF2dQAHwtnUqUNKUz3mXF+RemSsG4HFR2/r0hiMSC58wG2i/ibKpGmfEQzVRb6gmQVecgM UVggwpSdGopRDeN2968rYYvcm9ozDnNiU1dryg2rWHJUbPjE6KDvK+gjTfjXD8gsHzIEAj dCsMMnk/c5spY6nn3Mmz5aNBE8RPpB2D84c8gl3sEL4L8L9ZvcJK4HR93r2XgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhHFf43Q7zwLq for ; Wed, 31 Dec 2025 17:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 17:36:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 2c0e9a76c1ce - main - Makefile.inc1: Make NO_INSTALLKERNEL less of a hack List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c0e9a76c1cee8766245a0b5bdad73e995b790c6 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 17:36:54 +0000 Message-Id: <69555f36.22863.80e0842@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2c0e9a76c1cee8766245a0b5bdad73e995b790c6 commit 2c0e9a76c1cee8766245a0b5bdad73e995b790c6 Author: Jessica Clarke AuthorDate: 2025-12-31 17:36:10 +0000 Commit: Jessica Clarke CommitDate: 2025-12-31 17:36:10 +0000 Makefile.inc1: Make NO_INSTALLKERNEL less of a hack Rather than adding a dummy entry which requires everyone to know to skip it, introduce a new INSTALLEXTRAKERNELS which contains the set of kernels to install as kernel.KERNCONF. Reviewed by: ivy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54291 --- Makefile.inc1 | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9518d4034afc..c0bf42c3d008 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1753,10 +1753,6 @@ KERNCONF?= ${GENERIC_KERNCONF} BUILDKERNELS= INSTALLKERNEL= -.if defined(NO_INSTALLKERNEL) -# All of the BUILDKERNELS loops start at index 1. -BUILDKERNELS+= dummy -.endif .for _kernel in ${KERNCONF} .if !defined(_MKSHOWCONFIG) && exists(${KERNCONFDIR}/${_kernel}) BUILDKERNELS+= ${_kernel} @@ -1798,12 +1794,12 @@ _BUILDKERNEL_START!= date '+%s' # Builds all kernels defined by BUILDKERNELS. # buildkernel: .MAKE .PHONY -.if empty(BUILDKERNELS:Ndummy) +.if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif @echo -.for _kernel in ${BUILDKERNELS:Ndummy} +.for _kernel in ${BUILDKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -1865,6 +1861,16 @@ NO_INSTALLEXTRAKERNELS?= yes NO_INSTALLEXTRAKERNELS?= no .endif +.if ${NO_INSTALLEXTRAKERNELS} != "yes" +.if defined(NO_INSTALLKERNEL) +INSTALLEXTRAKERNELS= ${BUILDKERNELS} +.else +# First kernel is installed separately by INSTALLKERNEL, typically to +# /boot/kernel, rather than to a config-suffixed directory. +INSTALLEXTRAKERNELS= ${BUILDKERNELS:[2..-1]} +.endif +.endif + # # installkernel, etc. # @@ -1891,8 +1897,8 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" @@ -1929,8 +1935,8 @@ distributekernel distributekernel.debug: .PHONY ${METALOG_SORT_CMD} >> ${DESTDIR}/${DISTDIR}/kernel.meta .endif .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} rm -f ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta ${_+_}cd ${KRNLOBJDIR}/${_kernel}; \ ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \ @@ -1961,8 +1967,8 @@ packagekernel: .PHONY @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ ${TAR_CMD} cvf - --exclude '*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ @@ -2330,8 +2336,8 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap create-kernel-packages: .PHONY .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -. for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} . if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) . if ${MK_DEBUG_FILES} != "no" _debug=-dbg From nobody Thu Jan 1 00:29: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 4dhSQB4rr4z6MT7g for ; Thu, 01 Jan 2026 00:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhSQB49R5z3chp for ; Thu, 01 Jan 2026 00:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767227394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rMVb7TuI6Sagd9Ku/RQMFlQ49/J/9iTxmCcNnJKWMs=; b=xjWKhC1HjPqHHlO5VpYrJ3rZSH2zltogjzZj+jwtwSOsj+gQ16XbDAkwDm8UYXDYke4RXZ UzypVeqjm3rcUT6pzjpZcLD8HLIun1BK+Bcw1gWBZ15gFuW9Se8DpwfbEUbNafs7dbH9Vc 31F4A83EBZ/gRC8ZZOmowyRcQph1F7x1kFrDIUxkJnD6wFvx0C5r+TVp+R8BfOAMLD9FXz ow+0HzP7J/sDt+dA01jY3TeQp50cmoUZDlp+GROTap2ZgzxNF0ItJFr7/Jtsj/94zhmRiM ReyRi5ThWIfAUFS6jiL6O4x21NJSiCABfUUtnQw5xFwgdKEKD8w5/jpNtOf8dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767227394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rMVb7TuI6Sagd9Ku/RQMFlQ49/J/9iTxmCcNnJKWMs=; b=VAV23sK8oVuQrtEPo++8j8mvubw0vX1M3tzZjo0KATBTcDuebMipOP/xaEziYJydpySaGN cwkycJ9QHO5tFsKIIHgEZiz+bviSjjrKM09I3A62cu/K43DTtS3XzZ7KRu2y/yPEoq0UqN FdkyavkPAAJ7BOt0x1jp6XNYHohVfsUHtWmQaJ5XhZuC4euHggIRPBPP45RQCYu481ujCV DhWyMdM1O8GjTBMWMzfIUfvdt+RvFK6x1JIyVtvFPBYy6z7Nc9R23tmjW175FwSC4AXZNu jvCOGvdnSXiDk0Ye5jkmMwJ63umZX6NkVV6jGRCxMPKcDgaMJXDPu4WxsqhXuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767227394; a=rsa-sha256; cv=none; b=QHiKkKj/ubJRb7PYTHYr5+nYkVhGmJdAa3Muho54rkFBokOHKyztVaUzcy5yqcHV4ZSBov VQSuDzi3AEcrT+D8ROJlXhRbh1ayvqCksoJ5wOiQ+QfJkA3ZFxFaeaIs0iTagREgVm2Bei 0PSMl7NxNPJnsKLXkwo52grjJnjrv+AUvvBOOcjsgOdkccNxOh++ljx6I9HP7XUpnvsA74 eZNc5OfypE7PonJbBUOhFxoNQqf7ycUArOT3eQfhaBrBJkB6SoLzfOR1F2TCZ/xT2p1frI HHqK3R7OFmf8ji7jOC2oNPvpPfjgkNJMQl2E05tUHAOm5u6Tt/du/wQm+tnPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhSQB3YPbz17yT for ; Thu, 01 Jan 2026 00:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34f1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 00:29:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 8f41677ea496 - main - copyright: Happy New Year 2026! List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f41677ea4963254a3a190ede7cea16f2486cb1d Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 00:29:54 +0000 Message-Id: <6955c002.34f1d.3ddeac75@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8f41677ea4963254a3a190ede7cea16f2486cb1d commit 8f41677ea4963254a3a190ede7cea16f2486cb1d Author: Xin LI AuthorDate: 2026-01-01 00:29:23 +0000 Commit: Xin LI CommitDate: 2026-01-01 00:29:23 +0000 copyright: Happy New Year 2026! We are now one quarter into the 21st century. --- COPYRIGHT | 2 +- sys/sys/copyright.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 9f8b3d4c01d6..f7134c977fa6 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2025 The FreeBSD Project. +Copyright (c) 1992-2026 The FreeBSD Project. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h index 8c89adf7f885..1d660dd60646 100644 --- a/sys/sys/copyright.h +++ b/sys/sys/copyright.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (C) 1992-2025 The FreeBSD Project. All rights reserved. + * Copyright (C) 1992-2026 The FreeBSD Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,7 +35,7 @@ /* FreeBSD */ #define COPYRIGHT_FreeBSD \ - "Copyright (c) 1992-2025 The FreeBSD Project.\n" + "Copyright (c) 1992-2026 The FreeBSD Project.\n" /* Foundation */ #define TRADEMARK_Foundation \ From nobody Thu Jan 1 10:41: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 4dhk0W30d7z6M0Lp for ; Thu, 01 Jan 2026 10:42: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhk0Q29QKz3gBG for ; Thu, 01 Jan 2026 10:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767264118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTODxNZYgZKvC8rVAprQ4S9kSuWcri3RvU5uKLKb2uQ=; b=i62Xxh6FaAI71WQpqTQHipzmZ5EN/tVFT3bI+JfyMd39sKkpr/6Avp252MZ+98/vVUE/JD tY2z58THZ7Bka3n7xkACgsfmabhSYF8alBgnETKSAMWE4I47qmuTEDD0bAxgOwq27If2CP 4/5s+oxusbrKTXm6k6aX1yrlNvRpmlzTyHtL7lUBxCcS2FHBYGdn4P+2ro653O3YZUEKyn o0T3/WnZNqXheVKZNibkwfG9OQY42wTeWGTH/ihP2srcIFqD7sJk1fRM/WYBPEPQy6ebRn Gz0owTdbEav1/XeY8pvocpnNbPrWz+Frbb94cdZbhcOZ5BzXILwhZOfQa5ZUVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767264118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTODxNZYgZKvC8rVAprQ4S9kSuWcri3RvU5uKLKb2uQ=; b=SHqgxswv8pHR1YZINp3XjGuG7xR9mk01FzmNystlT4H2On/BdEPE3F3LPQ3GTZRaQXR2VA PHMOfH8AhLbcIoNc4KdiLB6sleK0QOVn/WjC5X2ImQmAnFYCPX49bJRuC3cP9nts8WLlXh byfMiLUXhaa3kIjvS0CdSrC9DBfwmz8fti6cNbOFg2XjRVdszHTvpRwMy2iLFDctk/nQHz 4zvOL2R12QKPw7qVhQ1k0t92Jj+OEzSypJcoYvcXuq2JLlQGPnybvFT7XDxzQI5QhdqvtM h3ssZ/A9Qo8+eqYJv2QL3OYL5zQBdg/MnnWuR8xDPzXyolR/uycayFaeu4Nltg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767264118; a=rsa-sha256; cv=none; b=i8mhogzmDBebFeaPMAk2ylWhzJghPKS+x8h7T3h7A3dtpOmG19O0SbGxITD2fg2pv+KvBY hn8vuLt0v2N1NOaqwbt0VaG9cYhkGt5MWzn19/ApuIAjmmP2pXHuGkQP37uJyBMlz6/wX7 Z45G6RRNz9AKDyEgXnOeePQB8SBg5AfUhD+BQ8VJvZUKf53a1ooD29mZH7FaeX1jFYh4m8 vcQabuvSQE/Zd5JC8uovARipgZkNwV/JLFjLQ/nv8JXnubg9JW+7kmLFWK1bOFf42f16sT UhgwQkCSsv4wwaJdUTm4RWjjPYi8k0+QJoRn6sjCYHSgYxxCMW82/m9GQodR0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhk0Q1hZpzD5p for ; Thu, 01 Jan 2026 10:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 10:41:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 1839dd31cab9 - stable/14 - linprocfs.5: Synchronize style and format with 15-STABLE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1839dd31cab9a02acc2a1065bb0a63488a69ba0b Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 10:41:58 +0000 Message-Id: <69564f76.20d69.2df94dae@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=1839dd31cab9a02acc2a1065bb0a63488a69ba0b commit 1839dd31cab9a02acc2a1065bb0a63488a69ba0b Author: Michael Osipov AuthorDate: 2025-12-29 20:49:49 +0000 Commit: Michael Osipov CommitDate: 2026-01-01 10:41:38 +0000 linprocfs.5: Synchronize style and format with 15-STABLE This is a logical backport of 1d193b1808098328d3ad16b436a329b258935e0c including the changes happended after that. Reviewed by: fernape Differential Revision: https://reviews.freebsd.org/D54408 --- share/man/man5/linprocfs.5 | 89 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5 index 568d4dcd9d14..bcd8587eb76c 100644 --- a/share/man/man5/linprocfs.5 +++ b/share/man/man5/linprocfs.5 @@ -1,7 +1,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd November 13, 2019 +.Dd December 26, 2025 .Dt LINPROCFS 5 .Os .Sh NAME @@ -26,17 +26,53 @@ There is also a special node called .Pa self which always refers to the process making the lookup request. .Pp -Each node is a directory containing several files: -.Bl -tag -width status +Each process node is a directory containing several files: +.Bl -tag -width oom_score_adj +.It Pa auxv +The auxiliary vector passed to the program. +.It Pa cmdline +The command line used to execute the process. +.It Pa cwd +A symbolic link pointing to the current work directory of the process. +.It Pa environ +The list of environment variables and values of the process. +Every variable and pair value is separated from the next by a NULL byte. .It Pa exe A reference to the vnode from which the process text was read. This can be used to gain access to the process' symbol table, or to start another copy of the process. +.It Pa limits +The soft and hard limits for the process along with the units used. +.It Pa maps +Memory map of the process. .It Pa mem The complete virtual memory image of the process. Only those addresses which exist in the process can be accessed. Reads and writes to this file modify the process. Writes to the text segment remain private to the process. +.It Pa mountinfo +Information about mount points. +.It Pa mounts +Similar to the above. +.It Pa oom_score_adj +Score adjustment for the Out Of Memory killer. +.It Pa root +Symbolic link to the root directory for this process. +.It Pa stat +Process statistics. +It includes user, nice, system, idle, iowait, irq, softirq, +steal, guest and guest_nice. +.It Pa statm +Process size statistics. +It includes total program size, resident set size, number of resident shared +pages (unused), text size, library size (unused), data + stack and dirty pages +(unused). +.It Pa status +Process statistics in human readable form. +It includes process name, state, PID, +etc. +.It Pa task +Dummy directory to avoid problems in specific software such as Chromium. .El .Pp Each node is owned by the process's user, and belongs to that user's @@ -46,19 +82,55 @@ node, which belongs to the .Li kmem group. .Sh FILES -.Bl -tag -width /compat/linux/proc/self/XXXXXXX -compact +.Bl -tag -width /compat/linux/proc/filesystems -compact .It Pa /compat/linux/proc -The normal mount point for the +The normal mount point for .Nm . +.It Pa /compat/linux/proc/cmdline +Contains the path of the kernel image used to boot the system. .It Pa /compat/linux/proc/cpuinfo CPU vendor and model information in human-readable form. +.It Pa /compat/linux/proc/devices +List of character and block devices. +The latter is usually empty on +.Fx . +.It Pa /compat/linux/proc/filesystems +List of supported filesystems. +For pseudo filesystems, the first column contains +.Em nodev . .It Pa /compat/linux/proc/meminfo System memory information in human-readable form. -.It Pa /compat/linux/proc/pid +.It Pa /compat/linux/proc/modules +Loaded kernel modules. +Empty for now. +.It Pa /compat/linux/proc/mounts +Devices corresponding mount points. +.It Pa /compat/linux/proc/mtab +Same as above. +.It Pa /compat/linux/proc/partitions +Partition information including major and minor numbers, number of blocks and +name. +The rest of the fields are set to zero. +.It Pa /compat/linux/proc/stat +System statistics. +For each cpu it includes at most user time, nice time, system +time and idle time, iowait (time waiting for I/O to complete), times serving +irqs and softirq, steal, guest and guest_nice times that represent times spent +in different modes in a virtualized environment. +The last columns are set to zero. +This file also contains brief statistics for disks, context switches and +more. +.It Pa /compat/linux/proc/swap +Information about the swap device if any. +.It Pa /compat/linux/proc/uptime +Time since the last boot and time spent in idle state. +.It Pa /compat/linux/proc/version +Version of the emulated linux system. +.It Pa /compat/linux/proc/ Ns Ao Ar pid Ac A directory containing process information for process -.Pa pid . +.Ar pid . .It Pa /compat/linux/proc/self -A directory containing process information for the current process. +A symlink to a directory containing process information for the current process. .It Pa /compat/linux/proc/self/exe The executable image for the current process. .It Pa /compat/linux/proc/self/mem @@ -74,6 +146,7 @@ file system on .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , +.Xr auxv 3 , .Xr linux 4 , .Xr procfs 5 , .Xr pseudofs 9 From nobody Thu Jan 1 12:38: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 4dhmb94P6yz6M7CH for ; Thu, 01 Jan 2026 12:38: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhmb91v30z3rKC for ; Thu, 01 Jan 2026 12:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767271125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IkHCxqpydSSP6z0j1rfTTC31v1FWRTpQ7L+WiiGljyQ=; b=qu8tjeHv9sN9/9GGnhLe6Xyn0HMqCE/+SNJimL7swtX+8uP5i4SIFYuAva83uAsgz+qfcO X8ojA2AFkLTJ3X9HsXkvfVZoJ6aL5fTeg4co4GE9V50LNAFf9npkUbniBqKxiLoZDx3pjN 2Qlpx7BC8PhOqMIOau6Po/apOugeePIJFMN1rFWT+Pr9PwrK4u8XdB5Kws9IiKaN05G6ze LwPNpnShzxqwCq0iGThpOQYiAImT5xjM32VwqHSctzJm+G6S/RLOfru2MT/PwwAogjl+xz /arsiw8zWxcmvvBYi1ZkWiXwenfomNPklYXA/dh2mPjK00+1gOvkvxm1rWFVqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767271125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IkHCxqpydSSP6z0j1rfTTC31v1FWRTpQ7L+WiiGljyQ=; b=MGvLYIG0u1YXPJhFw7txcSGlR57Ez48zvLdSr1/ChFN/aN4iv+IvR4ffM5qnyw4W6gQQPJ U3SY0KWVThaDdXGijd//UR3X3Njm1N1t8pazsuZsvbBy51f4W+qPrzfBb8t10VtAhu78zR b+4FhlirPU7uEN5WuB/Ss7RV8hlFJ1/oOGY04KfkYpFroJJSCHD0Ltmdfwjxj/XuQ+ABxz FQjtDoAregcN57vRoK9QCsAmNeP8dvv+k6uDvgLKcohcgL5ocZxZ9moUuW3tMj1MbsTv6C aLmSKqUVK8TayERtfs2twQRJQt3Ydu30mHZeWvfMVWoxSPz/uWHq9Y/ATLJXnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767271125; a=rsa-sha256; cv=none; b=D7cXpMHbsINIyoo14fGN3w9pFRZxQkD/Rs+URkHCIugQccL/uZl6xvbvafHwYKCoyd3/O7 JtQ7FlN9Vm7jxxbUiSilNJbr3dDvWEVhvhsEGj9GIH4caNl8IOz+xy6ZZHkCYimFtr5aOI brapXVu6JjXd4sbyOtQu04653gffkNxhXYXXB6wPzJkFloT9FgzxPFlLM9Ghg1ZkYbXfPl xD+CNKj9CQEZ8dTIlPMTTPOLsR0zZ5kSGrfnFDXFCYfmmCzPir7tLkD3U5u6VJBkws71fM mbGAZPJfWuQ0CP5fvMshS35dAJmThKifEYrC8Bc3Z6WiQbMlNoMVTLb7b4y6vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhmb91ShRzY2j for ; Thu, 01 Jan 2026 12:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 344bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 12:38:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 3f41c92c6b27 - stable/13 - linprocfs.5: Synchronize style and format with 15-STABLE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f41c92c6b27c8e1110dec8d52d16bd3a16a9cb0 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 12:38:45 +0000 Message-Id: <69566ad5.344bb.481931df@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=3f41c92c6b27c8e1110dec8d52d16bd3a16a9cb0 commit 3f41c92c6b27c8e1110dec8d52d16bd3a16a9cb0 Author: Michael Osipov AuthorDate: 2025-12-29 20:49:49 +0000 Commit: Michael Osipov CommitDate: 2026-01-01 12:38:18 +0000 linprocfs.5: Synchronize style and format with 15-STABLE This is a logical backport of 1d193b1808098328d3ad16b436a329b258935e0c including the changes happended after that. Reviewed by: fernape Differential Revision: https://reviews.freebsd.org/D54411 --- share/man/man5/linprocfs.5 | 89 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5 index 568d4dcd9d14..bcd8587eb76c 100644 --- a/share/man/man5/linprocfs.5 +++ b/share/man/man5/linprocfs.5 @@ -1,7 +1,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd November 13, 2019 +.Dd December 26, 2025 .Dt LINPROCFS 5 .Os .Sh NAME @@ -26,17 +26,53 @@ There is also a special node called .Pa self which always refers to the process making the lookup request. .Pp -Each node is a directory containing several files: -.Bl -tag -width status +Each process node is a directory containing several files: +.Bl -tag -width oom_score_adj +.It Pa auxv +The auxiliary vector passed to the program. +.It Pa cmdline +The command line used to execute the process. +.It Pa cwd +A symbolic link pointing to the current work directory of the process. +.It Pa environ +The list of environment variables and values of the process. +Every variable and pair value is separated from the next by a NULL byte. .It Pa exe A reference to the vnode from which the process text was read. This can be used to gain access to the process' symbol table, or to start another copy of the process. +.It Pa limits +The soft and hard limits for the process along with the units used. +.It Pa maps +Memory map of the process. .It Pa mem The complete virtual memory image of the process. Only those addresses which exist in the process can be accessed. Reads and writes to this file modify the process. Writes to the text segment remain private to the process. +.It Pa mountinfo +Information about mount points. +.It Pa mounts +Similar to the above. +.It Pa oom_score_adj +Score adjustment for the Out Of Memory killer. +.It Pa root +Symbolic link to the root directory for this process. +.It Pa stat +Process statistics. +It includes user, nice, system, idle, iowait, irq, softirq, +steal, guest and guest_nice. +.It Pa statm +Process size statistics. +It includes total program size, resident set size, number of resident shared +pages (unused), text size, library size (unused), data + stack and dirty pages +(unused). +.It Pa status +Process statistics in human readable form. +It includes process name, state, PID, +etc. +.It Pa task +Dummy directory to avoid problems in specific software such as Chromium. .El .Pp Each node is owned by the process's user, and belongs to that user's @@ -46,19 +82,55 @@ node, which belongs to the .Li kmem group. .Sh FILES -.Bl -tag -width /compat/linux/proc/self/XXXXXXX -compact +.Bl -tag -width /compat/linux/proc/filesystems -compact .It Pa /compat/linux/proc -The normal mount point for the +The normal mount point for .Nm . +.It Pa /compat/linux/proc/cmdline +Contains the path of the kernel image used to boot the system. .It Pa /compat/linux/proc/cpuinfo CPU vendor and model information in human-readable form. +.It Pa /compat/linux/proc/devices +List of character and block devices. +The latter is usually empty on +.Fx . +.It Pa /compat/linux/proc/filesystems +List of supported filesystems. +For pseudo filesystems, the first column contains +.Em nodev . .It Pa /compat/linux/proc/meminfo System memory information in human-readable form. -.It Pa /compat/linux/proc/pid +.It Pa /compat/linux/proc/modules +Loaded kernel modules. +Empty for now. +.It Pa /compat/linux/proc/mounts +Devices corresponding mount points. +.It Pa /compat/linux/proc/mtab +Same as above. +.It Pa /compat/linux/proc/partitions +Partition information including major and minor numbers, number of blocks and +name. +The rest of the fields are set to zero. +.It Pa /compat/linux/proc/stat +System statistics. +For each cpu it includes at most user time, nice time, system +time and idle time, iowait (time waiting for I/O to complete), times serving +irqs and softirq, steal, guest and guest_nice times that represent times spent +in different modes in a virtualized environment. +The last columns are set to zero. +This file also contains brief statistics for disks, context switches and +more. +.It Pa /compat/linux/proc/swap +Information about the swap device if any. +.It Pa /compat/linux/proc/uptime +Time since the last boot and time spent in idle state. +.It Pa /compat/linux/proc/version +Version of the emulated linux system. +.It Pa /compat/linux/proc/ Ns Ao Ar pid Ac A directory containing process information for process -.Pa pid . +.Ar pid . .It Pa /compat/linux/proc/self -A directory containing process information for the current process. +A symlink to a directory containing process information for the current process. .It Pa /compat/linux/proc/self/exe The executable image for the current process. .It Pa /compat/linux/proc/self/mem @@ -74,6 +146,7 @@ file system on .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , +.Xr auxv 3 , .Xr linux 4 , .Xr procfs 5 , .Xr pseudofs 9 From nobody Thu Jan 1 17:59:16 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 4dhvj13Ypyz6MVfg for ; Thu, 01 Jan 2026 17:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvj11B1yz3X4W for ; Thu, 01 Jan 2026 17:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJda3lribrxMZko/fXw3bo5VhPvHTaHokHj/p6naN6s=; b=V/DEzwp7H7EukkPp5t5C64UwTsqizOj9MCIlnIQ5Oxw7Yx5efM2xjMANveBvnd+iwvZCC+ DjytQfATywN9wy9TQFNv2baCl9rtGNnFo0qo9ohxip2nt1x3bwyVBjOACmT76DDE+M9alc p8jx342qDbKIzRpAsshSlEQ2Cq1Naz8lICgsprVM6zUuz5Sw8HpMKyk1ryJJcLHuDos/VD Lo/AO5Oy3caIZUcfmokrhHQuQClve+O6zAupU3jTGSPCZMofBA4SHqTQQAjhgn2Xj07vCz 6J/BEmWSsRiFkMY0rbwHXw6lRcL6U6nYAm/CD03LMSRHqh9onZRiLb3TGJhWFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJda3lribrxMZko/fXw3bo5VhPvHTaHokHj/p6naN6s=; b=uwyNBZHKvt4p1rJ2OQbASvQUyd5VbLopf1KPFV05Jrsgac4otHvGSj16kWk5RT3gmiN3H2 dac2L6+Va3sonKBpzagsBSV6pGoGSYeGyK7QxtKLvwfHvjQfwb8b1QGlLV0KH69rKya61O /9BXvQg4ENGWOthBJ74cARYeZHUA9GH8bKGOR2ZhJrF/9BHAMUlmHaO4GO6pTksHA6HKzo FdHj4oKDFv2TFZsAM6FpeX86FjGgB1dUWBsSZiHarDllfANoTcqqsTFcMwarQEtw/xq4Lg 2hsyg4U8ui1wjD1Cha00HsdgHTKsQsGn32gm6PDf2bgrHbKSfWHEUoFqPKo7wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290357; a=rsa-sha256; cv=none; b=hAcXAQTzQdUIpyX1HUNniSCev5c/Wun7pWH39OHnsBG9krhLOflpi9HhSe95JySe56CDDG wz9r+6DM5YRfq6JgHYQVGJcG0qGqAAJKLLst4vvu1XiUIgUbmzxO9HkQ6ZD43ha7WTYYxO G4+veJIHe2jwafF8B+WlqIdV4zNgwm/kz9/Whp626zQeaYQKd5RFDEsasOlPrhhthHVrnH sTkYGHqjkRcruhvSOeJ33peu+saK0JOzkA2bavVp63QNgCVSx5HcJF6hALk0PQjredQ69+ mhCiR0yVeX8z80JMjrTGceNPn8mOljU1FU7XtihvcU/3rhTlRO5TtBX/IDLkDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvj06nBpzjqY for ; Thu, 01 Jan 2026 17:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34b1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 17:59:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 68d6abd97143 - main - periodic/801.trim-zfs: Fix daily-trim-zfs-flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68d6abd9714384a41028dc0d5086b4930366bbea Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 17:59:16 +0000 Message-Id: <6956b5f4.34b1b.3d046ab@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=68d6abd9714384a41028dc0d5086b4930366bbea commit 68d6abd9714384a41028dc0d5086b4930366bbea Author: Alexander Ziaee AuthorDate: 2026-01-01 17:53:31 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 17:57:15 +0000 periodic/801.trim-zfs: Fix daily-trim-zfs-flags This variable was named incorrectly, resulting in any specified flags being silently ignored. PR: 292074 MFC after: 3 days Reported by: CrazyMihey@Ya.Ru Fixes: 493908c4b45c (Add a daily zfs trim script) --- usr.sbin/periodic/etc/daily/801.trim-zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/periodic/etc/daily/801.trim-zfs b/usr.sbin/periodic/etc/daily/801.trim-zfs index 17d2ce217c10..9eed9788d016 100755 --- a/usr.sbin/periodic/etc/daily/801.trim-zfs +++ b/usr.sbin/periodic/etc/daily/801.trim-zfs @@ -44,7 +44,7 @@ case "$daily_trim_zfs_enable" in if ! zpool status "${pool}" | grep -q '(trimming)'; then echo " starting trim of pool '${pool}'" - zpool trim ${daily_zfs_trim_flags} "${pool}" + zpool trim ${daily_trim_zfs_flags} "${pool}" else echo " trim of pool '${pool}' already in progress, skipping" fi From nobody Thu Jan 1 18:05: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 4dhvrQ6Zz1z6MW3d for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrQ4Nt1z3YHJ for ; Thu, 01 Jan 2026 18:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wz8UACxAhwSP6EgtqyGKa3xHWXU7l+XBJ9mA4Pug0Y0=; b=bmZf0Qr76b4X2MDEud9w0lwjAawqRqs2lx6RQ+frvrtCp2RMOx+NyC/9SmrRkk708cHGuq cGElpIpEi/A6KN7HiD/8q7hkWJ7oOUutwTf0CDqM64Xjojg8ydddeiGt3VBtMQbpLmniaB mMXEAtqtHGwbx0DfrM5isMqtBxboP3awR82Kx2pVfk32aR7ECD8fYQl9XUiWoO9BW9w6uT 3swqw3/OSc6MsP+BkiFNe9pcO7GYzgH7qa2/3Lw0Gke9AAIgrFU43/3lBkFdUpPu0zChoT TfIcItNlCQMIdLEb9TjhHXK9PZ9HKS7isu48g2uQRDLlSxZxS+KG2veskRPnhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wz8UACxAhwSP6EgtqyGKa3xHWXU7l+XBJ9mA4Pug0Y0=; b=XFaklkHfxU4p7xYvSZcm/QL2niwH4PAaNPzSJH4/YI92C4pvw8vyl4evEObYkvsGEFCvCo uyNL39JSdy1SXpKQzqiRQJkJyKD+CgBRXPbK+8CXrh93O6k5MT8wMf9auxQDU6Om7x57er w9RUSp5XwysrUk0JyIlfS8MnwgyRg8YzJ5KOoxS93GSvlGQuL7J4VTcW2If/OmVGSf+i3e YgZ35mGUgbrgL+sRTpi8AstTnojFtJ+UVnlBh+sbAVKyfv8H9BqKmm0JE24Y5pnGzlm/Fm UKtOvLjjW+xcSKpGy8WjzMsGiE1AA9RMVUsv+X+kasdrIzUU+dCFLfXiWtCnOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290742; a=rsa-sha256; cv=none; b=TysTlAbKuhfiZ0ZHhk2oVLlZrFiiJlPWUcjM8aSyHMIQNVyANbuWB6zIub+eqjcL3W0Ncz zY0sBZ4LRHaI1sH/AMxFzovZO97AspSwxadTa5LHw6995VLcfpDNFUl4BI0ByBrQd5t0le wJbASIE2JBbSoie3YcDafAxe55uP2dELc9hwVSxKT5NPsx7SN+4Cdqjr9TNw/oAFEEouQ4 Ezq9XWBU9qj+W671bv4u6Bg3+CfurL13X5DlLuic7hr/c2BmLnuMEV53F5IkiSSWwi2ILS woe1pl44GWNpXYhyAvpCFqlYxvLxlZGtephXbxxkv9119004WZKs9H1KdAYCBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrQ3CC0zkB5 for ; Thu, 01 Jan 2026 18:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35784 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: fd72ad29c558 - stable/15 - freebsd-base.7: Rewrite table into a tagged list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fd72ad29c558ad97b701949a976ce77170ee5c06 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:42 +0000 Message-Id: <6956b776.35784.7859f650@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=fd72ad29c558ad97b701949a976ce77170ee5c06 commit fd72ad29c558ad97b701949a976ce77170ee5c06 Author: Alexander Ziaee AuthorDate: 2025-12-02 17:21:08 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:03 +0000 freebsd-base.7: Rewrite table into a tagged list The table is not playing nicely with https://man.freebsd.org/freebsd-base MFC after: 3 days Reviewed by: pauamma@gundo.com Differential Revision: https://reviews.freebsd.org/D54036 (cherry picked from commit 39b2ca9ec99eded0b248082dcec6c843f40330a8) --- share/man/man7/freebsd-base.7 | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index f84cc7239a1d..07cd7ab5656c 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -67,15 +67,24 @@ package. For the package .Sy FreeBSD-foo , the following subpackages may be available: -.Bl -column "FreeBSD-foo-dev-lib32" "Description" -.It Sy "Package name" Ta Sy "Description" -.It FreeBSD-foo Ta Base files for the package (typically executables) -.It FreeBSD-foo-lib Ta Native runtime libraries -.It FreeBSD-foo-lib32 Ta 32-bit compatibility runtime libraries -.It FreeBSD-foo-dev Ta Development files (headers and static libraries) -.It FreeBSD-foo-dev-lib32 Ta 32-bit development files -.It FreeBSD-foo-dbg Ta Debugging symbols -.It FreeBSD-foo-man Ta Manual pages. +.Pp +.Bl -tag -width "FreeBSD-foo-dev-lib32" -compact +.It Sy "Package name" +.Sy "Description" +.It FreeBSD-foo +Base files for the package (typically executables) +.It FreeBSD-foo-lib +Native runtime libraries +.It FreeBSD-foo-lib32 +32-bit compatibility runtime libraries +.It FreeBSD-foo-dev +Development files (headers and static libraries) +.It FreeBSD-foo-dev-lib32 +32-bit development files +.It FreeBSD-foo-dbg +Debugging symbols +.It FreeBSD-foo-man +Manual pages. Manual pages are only packaged separately if the .Sy WITH_MANSPLITPKG .Xr src.conf 5 From nobody Thu Jan 1 18:05: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 4dhvrR67Q4z6MW93 for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrR3fwRz3Y1d for ; Thu, 01 Jan 2026 18:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290743; 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=T74pYH2hiNtuv2FEgxJ6W82SPkWLzY5VqVRBvxA8xhQ=; b=HxtD4S9n9+bVaEhCiGj24PUwVtebP7KPy9TjByq4ltjxLiJnA3sYglYnkqDQKdEbrB1Bhp BfpP5GpE95YTFNDdGrEKaN457btVxwu2VbJdA+LPSyqW33apjGJxT3mjWDf5iPOt8XIm3Q uSQnu+WnQAGNoVecFoBf1+c05BkW91ttEv0GTYhbxNRuSOzJnQnlpeHHgk6GioayZaBeKi Q8jUVeSvGnz2tp+MswLJJQXWinDcxjus5hdce2kt5nbQZrliV/VFAt8q+iJqcTyIYFa0Iy at7ycjzkGCLrtCoEN33piQq7ew7Z7ebY5xpJtJvD71U0hqJmO4echOqBlSLvcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290743; 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=T74pYH2hiNtuv2FEgxJ6W82SPkWLzY5VqVRBvxA8xhQ=; b=cZ/nKqWeVF3P112/+kJYipctCf4LYkSoKGKf3xA/x9ZE1iOScyyY5fPkjaDtjtVFgudTQV wjEu/2FWBXeA5s9jNWumziAPJMNRQRzl/Gs1sdeN81NDIy/Ao1ok2i2NSVV0Uo1XPJayhj 6/PSCLcZg9yhcFOuV3Or9Spn8DPWSdCmRFWYm4HU/JoCqfDp3kkqS8x4uvO+btGwS8ER+g Z7J6qxfqN6kZfeQ7d80XsjmqZtg7v1r0hrEjQZNUKOq9/+1fnXA8ui0SBivgwYgxuZQs38 mWDAdyvSwanSLOyO1DgwsU3u7r4sgg/F/IxSzw1bqzYNLu+HzSy8snkqDW83rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290743; a=rsa-sha256; cv=none; b=IHL26KDIvBEjBEhZNVqZOvKn1g80RuOQSBVIAYoiXItFzK+410jMTUKeK0XQowNSIMjP5D zA0tvBtaK8S0PocEwfpvUK5L11GoUoL2Dnlbto7cOQarYSnMJal0sUGckAW19hMs9bT8X7 bYW0nr8RZKimeWk4iNM4Pw8T32lIuZYQ16g1CWw0usAI3ki1uKyAp9DBrSeaBpN+DIyQZ/ Z7l+9mRpodEuOrN6XsdkeiwTETeAwfJYyCygszgR0Ynv/UEocKJIC03eiAbQ6yAWAR6rAq VxmLF+LbWs9ValzEgNGihULJmNSy9vvSiAtBx+L03J/GvdqIk8ILOrBpJMJrag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrR31dmzk8l for ; Thu, 01 Jan 2026 18:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35788 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pau Amma From: Alexander Ziaee Subject: git: 1e34e2f9fd76 - stable/15 - vidcontrol.1: Video buffer dump is syscons only List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1e34e2f9fd76da0595652f6befd55c7a5c0815cd Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:43 +0000 Message-Id: <6956b777.35788.4fd36373@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1e34e2f9fd76da0595652f6befd55c7a5c0815cd commit 1e34e2f9fd76da0595652f6befd55c7a5c0815cd Author: Pau Amma AuthorDate: 2025-12-04 03:28:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:03 +0000 vidcontrol.1: Video buffer dump is syscons only Fixes: 1f4442f71fa3 (be explicit that -p and -P are sc(4) only) MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53878 (cherry picked from commit 9ec8196f68bac015965164f7f1a65c619bab4e85) --- usr.sbin/vidcontrol/vidcontrol.1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1 index 91804facce8e..a32b5a10f57c 100644 --- a/usr.sbin/vidcontrol/vidcontrol.1 +++ b/usr.sbin/vidcontrol/vidcontrol.1 @@ -12,7 +12,7 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.Dd July 7, 2024 +.Dd November 22, 2025 .Dt VIDCONTROL 1 .Os .Sh NAME @@ -502,9 +502,6 @@ The .Nm utility uses the .Xr syscons 4 -.\" is it supported on vt(4)??? -or -.Xr vt 4 .Dv CONS_SCRSHOT .Xr ioctl 2 to capture the current contents of the video buffer. From nobody Thu Jan 1 18:05: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 4dhvrT0YH8z6MW1b for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrS3v8Mz3Y3b for ; Thu, 01 Jan 2026 18:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290744; 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=azzhaSQojO6YikFdhyu3w5toUse1cZTXlcryScN/1Cw=; b=Osqc2Fxpgrf7bp2LxwKqb4KT3e86vA6Z3RQKaNjqqcXLDfrxG1V+FEUOEz1GW6mpR1phyt HmSTTzQiytmg6CpomlZpGNO1lsZsTGtLm4IxwyeF+LpjXeMsbm+JtMW9zuWsvmDqwwf6bZ YpqFCrzcy60R7OEubDdpDt0xc4H8bsq2NOq2HxkTWenn3J2uZHgM7PEcFTjLCD3HwxKz0Z XCq65no8EhsNILaRTPQc+BqpcZwYpv5LvMKplDmmtxftwsVHweLb3nl6hX44frwhMlDWb+ UpNXBSOOEzvcjKGXkua+/3b2yFkudjCmQxCmpQgmm19APOrpF24EgV0Th0oZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290744; 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=azzhaSQojO6YikFdhyu3w5toUse1cZTXlcryScN/1Cw=; b=Nn5IUKflqH0aAAWbV0Aqbgxdy5RUgRCAy6X5fi2Cd/pMP8XOFnv2drF3kFI60DfyABGpix i8i3OqbK6vQSdLPGaqpLBCa8xnSVxnfoSWPC3fI5vJ2hL1lD346i1IZmmUqMugE8lpAFQg KN3fGdFr0aUH8dTo9BB2IhH136dgQoDyos4zsX7Gu1GUZL+Y6jdL8+8WhJeWPbROfz+JzM TJeA1eBOSP3yMcNIiKvhWPf2SdlzbTFU8r4e33bQiLY2GACKaNBKS3cBTTzLbmSeJ+rqA5 KiV1IlGVt4rcMseAkrS0kyYklYu2soPTP8zQaQc21fZUhsTH0bbAaodKXRFxdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290744; a=rsa-sha256; cv=none; b=Tlnh0WGTZfSuaoeDmaSDoUYFQvSyXW9UcGeHMTtnEjZNyEnNST8MjEWVtjbWSUT8bwmbYT TfPUKzUjx791DIGiuj6yoNR3PPHUMjpoPXuKkFlnkcX+Lq9302yVq/l2ZA3tIqmUn+cVlm 2rAuJPZ0rKoofM1jjMjF3+FclcxZPPBCcrubKP7ZNdgwiPLMiL8OyfEuhTMFe+N/Ky4ddq 8HlkG4UxsvIc7fCW+QhRtfj7DdJa/GUNpbaskZ23cHe3SIw+Ye0clbPWHgZ1pf+Osm5c4b /3DPY6Tb0SJ07xpcm2yjVTNYBwUZzL+xU6uyv5wKfmuTYqub/qGwGVYZo6VmgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrS3QXnzkGg for ; Thu, 01 Jan 2026 18:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34629 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Seth Hoffert From: Alexander Ziaee Subject: git: da136429133b - stable/15 - man typos: Fix pf.conf.5 and jail.2 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 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: da136429133bc3b4a8a3205cb791029fe72c3f3b Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:44 +0000 Message-Id: <6956b778.34629.59e7ccb3@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=da136429133bc3b4a8a3205cb791029fe72c3f3b commit da136429133bc3b4a8a3205cb791029fe72c3f3b Author: Seth Hoffert AuthorDate: 2025-12-08 15:53:58 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:03 +0000 man typos: Fix pf.conf.5 and jail.2 typos MFC after: 3 days Signed-off-by: Seth Hoffert Closes: https://github.com/freebsd/freebsd-src/pull/1919 (cherry picked from commit 0140dc4a68ac25c70300ed2a418e7ca441638bdb) --- lib/libsys/jail.2 | 2 +- share/man/man5/pf.conf.5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/jail.2 b/lib/libsys/jail.2 index ee4e5b03d38e..4c8530ca7733 100644 --- a/lib/libsys/jail.2 +++ b/lib/libsys/jail.2 @@ -334,7 +334,7 @@ descriptor jail. The system calls .Fn jail_attach_jd and -.Fn jail_aremove_jd +.Fn jail_remove_jd work the same as .Fn jail_attach and diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 3b2588f51498..4a049fda08ae 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -1416,7 +1416,7 @@ translated to 198.51.100.100. .Pp The current implementation will only extract IPv4 addresses from the IPv6 addresses with a prefix length of /96 and greater. -.It Ar binat +.It Ar binat-to A .Ar binat-to rule specifies a bidirectional mapping between an external IP netblock From nobody Thu Jan 1 18:05: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 4dhvrV0P63z6MW7Q for ; Thu, 01 Jan 2026 18:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrT4fQjz3YF3 for ; Thu, 01 Jan 2026 18:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b4z5r7ynRxD7/CjT33gGWSseyIR0v9V/2ZVxgne3fUE=; b=vAxqePjy5qtTq/tNzemrULBbfLXhqmCQ980Vpp99vvBQwKkYCqQs7Pww5ynVqHTk65cNvM 96jNgwLxvMnJxjIU8cynR0ES14gCEXEJ8B7K2jnidoBEzgTfo9aIXRlLA1yMoEpxqHqCoA cQ31VVBPPEAnu4iLAMIvCb3Y2Z9czlcfe3DjST3e7pvyk6AP5XEn2dvKiwlevQJ5l7P+ma nDMe9Q5kzufc3PH/e29r0rkkgCIK+vsPvXrBTZXtx083lRAxZc4Kpsq9g/ng+ve2hFsySJ 0vDTujvg9+l46AnqKAnhqhPJ3xmTZN71Vh1USUwURCFAPJSkDmlN3mhPtC34MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b4z5r7ynRxD7/CjT33gGWSseyIR0v9V/2ZVxgne3fUE=; b=XCEpdYq4O8ouxL6vlzHhNFq9Mwf+YadlM4hWpmQL3vIPpblXyBvCYrtF/l7GzAP/06vs+t 7i4bfz4t/3WphsOrfU0uIWTkrklYfVE86LSnV9ZzklzReLMrK64K0sPmPmF8P10ixYpuyJ a0wDo1HJfKAA6dGKVCVdwEPCmwTgYplq4Jc3yx18ZXjzOXbEgv1202Suq7vxR0FPKnjV0p 21+e+34TIh0Sls35J1torRcPwIq47dO6+9qtLmHtvchpzrZv7FxF/NC+qNGTZdr83KqX1n ycdOUaa6clvQpTIqQ4/pwe20w8j19P7lXGvGBVwI3eS3NVsyblHNVKcXpttvbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290745; a=rsa-sha256; cv=none; b=tECnsG1+CGzsCfdW/ThBGx0ZJtJSDZ3U91f0QPJvLocRJ6luWIejk2EBoao0pA6Kha3rkk +XKjKZmZOeywuJZKayLbxa2Sjc6N3FV6a2UuVrG4Bjsz5zmHZtesCE3MHzZVmqKyGkx51a EKIFexGsWYIGGj7YMVT7Ela10LMbB6IkJJLI4b3SjpZ/m8TEvo3fwem4qdDtmeDAkEkRUK xCRdmLcHAvjwaXi4pM/GZWtrvTe23CLVxjlpDcRkwkgofgLTHuiV5JlhbxZ0d5INqL8FmB QLaau13kTCfgkuWIZkMIuhPjUbdqb6IXzTqQ/huMONj74QyZnq8OELgMbJdDyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrT49ZNzkB7 for ; Thu, 01 Jan 2026 18:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35686 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 2ecb2990813c - stable/15 - bnxt.4: Adjust for recent HARDWARE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2ecb2990813caf98ded178f15008233a2bf5052d Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:45 +0000 Message-Id: <6956b779.35686.31a8c6b7@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2ecb2990813caf98ded178f15008233a2bf5052d commit 2ecb2990813caf98ded178f15008233a2bf5052d Author: Alexander Ziaee AuthorDate: 2025-12-11 01:58:28 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:04 +0000 bnxt.4: Adjust for recent HARDWARE + Adjust document description matching another terabit driver + Add BCM576XX family to DESCRIPTION, switch to XX notation + Add some model names, additional models, and improvements to HARDWARE MFC after: 3 days Reviewed by: sumit.saxena_broadcom.com (previous) Differential Revision: https://reviews.freebsd.org/D54028 (cherry picked from commit 473bc5778c3e5136831c08d525d673059ef0aaa2) --- share/man/man4/bnxt.4 | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/share/man/man4/bnxt.4 b/share/man/man4/bnxt.4 index 0900a11cecea..5e3ee27426d5 100644 --- a/share/man/man4/bnxt.4 +++ b/share/man/man4/bnxt.4 @@ -23,12 +23,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd December 10, 2025 .Dt BNXT 4 .Os .Sh NAME .Nm bnxt -.Nd "Broadcom NetXtreme-C/NetXtreme-E Family Ethernet driver" +.Nd Broadcom NetXtreme family 10Gb to 400Gb Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -47,17 +47,16 @@ if_bnxt_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for various NICs based on the Broadcom BCM57301/2/4, -BCM57402/4/6, and BCM57502/4/8 Ethernet controller chips. +driver provides support for PCIe NICs based on the Broadcom BCM573XX, +BCM574XX, BCM575XX, and BCM576XX Ethernet controllers. .Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE The .Nm -driver provides support for various NICs based on the Broadcom NetXtreme-C and -NetXtreme-E families of Gigabit Ethernet controller chips, including the -following: +driver supports the following +Broadcom 10Gb to 400Gb Ethernet controllers: .Pp .Bl -bullet -compact .It @@ -103,11 +102,25 @@ Broadcom BCM57417 NetXtreme-E Ethernet Partition .It Broadcom BCM57454 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet .It -Broadcom BCM57502 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet +Broadcom BCM57502 NetXtreme-E 10Gb/25Gb/50Gb Ethernet .It -Broadcom BCM57504 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet +Broadcom N425 BCM57504 NetXtreme-E 10Gb/25Gb Ethernet .It -Broadcom BCM57508 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet +Broadcom P425 BCM57504 NetXtreme-E 10Gb/25Gb Ethernet +.It +Broadcom N1100 BCM57504 NetXtreme-E 10Gb/25Gb/50Gb/100Gb Ethernet +.It +Broadcom N2100 BCM57508 Thor 10Gb/25Gb/50Gb/100Gb Ethernet +.It +Broadcom P2100 BCM57508 Thor 10Gb/25Gb/50Gb/100Gb Ethernet +.It +Broadcom N2200 BCM57608 Thor 2 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet +.It +Broadcom P2200 BCM57608 Thor 2 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet +.It +Broadcom N1400 BCM57608 Thor 2 25Gb/50Gb/100Gb/200Gb/400Gb Ethernet +.It +Broadcom P1400 BCM57608 Thor 2 25Gb/50Gb/100Gb/200Gb/400Gb Ethernet .El .Sh SYSCTL VARIABLES These variables must be set before loading the driver, either via From nobody Thu Jan 1 18:05: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 4dhvrV6TYMz6MW1d for ; Thu, 01 Jan 2026 18:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrV5TCgz3YFL for ; Thu, 01 Jan 2026 18:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qpc2LUh1I1AJT3ti9mmYpz/r7RXTXCvHqUlJRX+IIk4=; b=QU3frFioehgi6679pBoie32C0QBBzzI2zmu+Kb1E+SkcCSPOtCjuB2JAvL7iFs6d4NRsyy aajKYeTU7hjNrjuXr0057cOJC6t/MlFBzmMC0nxOz50Z6AhQZ5YEHEoMsB6r7uADV630y1 BxUJgoJn1mjuP+QHqAoLrlRs1HHIhg8gQjhyezluZ4B8X51m+wZeVduZGntxT+azqo75h/ JJSdCjRgmx0H+Gc4YkQw+s7agq75KMe8l62rXdm0jM7RQmNnOukHC+/uzaPkiNO2tll4lj MvbeAjqzuCVNYaIs2BMzg6iSZLAdUOVXuSHKkqb7MegnZRQC7qBM92p/cdeuPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qpc2LUh1I1AJT3ti9mmYpz/r7RXTXCvHqUlJRX+IIk4=; b=MllRm2K8xVvcFHZw/3XD5xsk1Yl1VZ09fpBININycsXv20ZLGsg9bS16KXmgL3Vp6kcn6n kA37k2zTFgUjiR/DbeHrY63DFPkSKMZqfctJbhjsl3PchUTBk1H+WbPhYfvFQ0A6JYjhru 34AKUEkIV4EpXpHkVdwnjfhbzqu6gpegfJaozuSkl5kmsZvmwbi/LEWpNLu2lI3sf6DpDt d308fmWcjsLWx1kERY3Rj9qgcZ1fHaGOTtFZeT7v1GMmLRAPQaLwQFm+SyncO2qPnoC6vI yhMcLZaWZleCTsgHPhEVf918asD0xj+R3s4FRmgjl7PdVBZnSm9PEtNpKg6++Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290746; a=rsa-sha256; cv=none; b=GVOitgkw8+jB8cGytoeDQlgNHhYobxpn9QqH3Bb7zLoT7QqNpKzDJfGFLjEmcWreCEtBeF UWql2uJdiYKGoEuT9QWbtIlqPwdJPT7g2+5YnOtz6mQhVKzkA4m5wyBIVY5iSm5JP31aUZ QcqHktbT2i6ZmexwdJyclYukXx1Vm3T6XUxJPXn7UZEoLgcwx+TpmAyiZz4Cj/yziaQPba BGWt5d/udSk9yuhbnpnkC2ezvqxCjFUR2QQx6nCI57HVuJ8SL5Zj5pxH5JxIRt8n8B8NIJ O0YF6o3nBuPMdPX5fyyDbxBBDZcdiXTX22qdrLXYUNTm+hvxkZW4Z2iD3EwxjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrV4zlGzkGj for ; Thu, 01 Jan 2026 18:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3560a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 49358373aa8a - stable/15 - examples/mdoc: Remove document description quotes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 49358373aa8a42f47b256656afdc2f831e2429fa Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:46 +0000 Message-Id: <6956b77a.3560a.10c4fae5@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=49358373aa8a42f47b256656afdc2f831e2429fa commit 49358373aa8a42f47b256656afdc2f831e2429fa Author: Alexander Ziaee AuthorDate: 2025-12-17 17:15:53 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:04 +0000 examples/mdoc: Remove document description quotes Quotes in roff do not work the way quotes in shell do, remove them from the examples to hopefully lead less people astray. MFC after: 3 days (cherry picked from commit 067b62bd5834484c927038aff28d36da6c5d6cca) --- share/examples/mdoc/example.1 | 2 +- share/examples/mdoc/example.3 | 2 +- share/examples/mdoc/example.4 | 2 +- share/examples/mdoc/example.9 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1 index daffb8bc0422..8305cf45944c 100644 --- a/share/examples/mdoc/example.1 +++ b/share/examples/mdoc/example.1 @@ -10,7 +10,7 @@ .Os .Sh NAME .Nm example -.Nd "example command manual page" +.Nd example command manual page .Sh SYNOPSIS .Nm .Op Fl abc diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3 index 22c398e0491c..a1e47b34064b 100644 --- a/share/examples/mdoc/example.3 +++ b/share/examples/mdoc/example.3 @@ -10,7 +10,7 @@ .Os .Sh NAME .Nm example -.Nd "example library function manual page" +.Nd example library function manual page .Sh LIBRARY .\" Note: list of available libraries is available in mdoc(7) .Lb libc diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4 index e627f81af530..0b9e856b01ed 100644 --- a/share/examples/mdoc/example.4 +++ b/share/examples/mdoc/example.4 @@ -10,7 +10,7 @@ .Os .Sh NAME .Nm example -.Nd "example device driver manual page" +.Nd example device driver manual page .Sh SYNOPSIS To compile the driver into the kernel, place the following lines in the diff --git a/share/examples/mdoc/example.9 b/share/examples/mdoc/example.9 index f105f7465f2c..3e56aa4ad89c 100644 --- a/share/examples/mdoc/example.9 +++ b/share/examples/mdoc/example.9 @@ -10,7 +10,7 @@ .Os .Sh NAME .Nm example -.Nd "example kernel interface manual page" +.Nd example kernel interface manual page .Sh SYNOPSIS .In sys/example.h .Ft int From nobody Thu Jan 1 18:05: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 4dhvrX1CbNz6MVmt for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrW6HcCz3YQc for ; Thu, 01 Jan 2026 18:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290747; 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=ldWY578P3zGVZak1BYH5MlLRlM8eYH+KJJB37aQ76vE=; b=yZC0Zr8IAbu6QXw/Zfpg0FrZ67YT179uF6oETG1oNra4a1oesBxykKL1qyVWEFAvaTjjTX L6wVT/M94iPo9wwyXLZZrM0oKM0x23SedxGqIq4H0KCAYj5i2AzxtQiZyB3wEBRAT4Zm0h YyKBYnRpKGMdqnrYxmHqljfSBPPMINK+s6ZTvEqYuLwP8AqSHmTBMpT4aiLHTipmR8BSbp SRClMreXsQs7lex5VwHC69Sp0HikK2lKSY+sRIFTPdIHHNbi8rTHw82R9GVtrrLg637J3Z 4Lfc23Ksj4snlSNiQ3WDMbaKpUKQ5wKYhb4GaJ6WmpPc40Bjihq7aoBkTrolKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290747; 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=ldWY578P3zGVZak1BYH5MlLRlM8eYH+KJJB37aQ76vE=; b=oqfJb3lOeQKlDgqWbCA9z2ICpeDsd4DOkadkdEjjCRva6qs3Tu8Ckc3/8nOXOGrdxqnpXa f3+vWGxUa3U4hfZ7e4XJRFqD4yc5WSWT4VE+HRVgHG9iO1LPBXzCQkROEWIVJ4/mDMxQlk X6cmd34a5/0dqRIKOohwcytE6Kf70/0amGvRQoIuLJtF57M5E0oWmucEKtJhgDoOfPPeK3 M6nkTPKeJ4wMIuNpBj371UKY0fGElUYAXucu6SkRoto5BYu9OUjPxcdQChizAwuAltX58v Chv4a3ei2JZjaF2a36tZVvYBDPnj7GBPx+D8jnSd4qmFUTBCvwSfN3HZYQjA8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290747; a=rsa-sha256; cv=none; b=dhM/9I3F1E+pTDZ+IM17HDHEjQcAHLt8eGmeM7j+A79rfxwGA9VJiBor/Iq9YS1lZmGWer BhqpMkNHLiFTsCZAmBzfJ5auxT53PiCmXdLkGLApIsVC3zt6K/76pEIrqiNTAMTkTQhWpP J2rfWWnYYwJh79M36uwjrPhY2rtSWuJyvE38psb+apJHow2Eaiz5J99QAilOP0Ps9TmZ4A H0/hkvawZLXqQDG84TIm0/zDtfkUNTgzcJydCy8SF7yQqmD3LsY2yRAMZZwzjg+swDwqgH P0J6ozlXZr9MSOOLtyMMOk2IlN6cjww1Mw8yWAL3cZI3OOe/86PeIrnXhWLnVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrW5lJCzkB8 for ; Thu, 01 Jan 2026 18:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3638b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rob Nichols From: Alexander Ziaee Subject: git: f9bb95414c26 - stable/15 - jail.conf.5: Fix mandoc 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 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: f9bb95414c265f90be10e793102a5d3423645d78 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:47 +0000 Message-Id: <6956b77b.3638b.1930685f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f9bb95414c265f90be10e793102a5d3423645d78 commit f9bb95414c265f90be10e793102a5d3423645d78 Author: Rob Nichols AuthorDate: 2025-12-16 03:26:26 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:04 +0000 jail.conf.5: Fix mandoc typos MFC after: 3 days Reviewed by: ziaee Signed-off-by: Rob Nichols Closes: https://github.com/freebsd/freebsd-src/pull/1928 (cherry picked from commit d1d88b6e8c31b1e472d66471ff1e666e5310709e) --- usr.sbin/jail/jail.conf.5 | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 627c38b0f8b6..7cc7a7cf9fca 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -44,13 +44,11 @@ A parameter assignment consists of a single word, the parameter name, an equals sign, a value enclosed in double quotes, and a terminating semicolon. .Pp The syntax of a jail definition is as follows: -.Bd -unfilled -. Ar jailname Cm \&{ -.Bd -unfilled -offset indent -compact -.Ar parameter Cm = Qq Ar value ; -\&... -.Ed -.Cm \&} +.Bd -literal -offset indent +jailname { + parameter = "value"; + ... +} .Ed .Pp This is used by @@ -234,11 +232,11 @@ bar { } # Include configurations from standard locations. -\[char46]include "/etc/jail.conf.d/*.conf"; -\[char46]include "/etc/jail.*.conf"; -\[char46]include "/usr/local/etc/jail[.]conf"; -\[char46]include "/usr/local/etc/jail.conf.d/*.conf"; -\[char46]include "/usr/local/etc/jail.*.conf"; +\&.include "/etc/jail.conf.d/*.conf"; +\&.include "/etc/jail.*.conf"; +\&.include "/usr/local/etc/jail[.]conf"; +\&.include "/usr/local/etc/jail.conf.d/*.conf"; +\&.include "/usr/local/etc/jail.*.conf"; .Ed .Sh SEE ALSO .Xr jail 2 , From nobody Thu Jan 1 18:05: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 4dhvrY30Fnz6MVmx for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrY00VMz3YJR for ; Thu, 01 Jan 2026 18:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290749; 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=2xF7c2/FEuvoTGpn1+Z2O2bFssPLvlQssHli9oh5kls=; b=Bk5rMROHtg+IzDDkTfbYlavsebj6fuSM9D8RlDRxS65oRTUNIeNQHUPubXnbENjZVS9102 fL3lNz1m3sE3bRdGsAoPnqHcCo/92WTLCJa4yINbPi/NHtW0lZEauRpk7BSgUWysM4aJIf NrkhHWL1DiGMkGWSUfYNxOzuGIFHgdBNkllnZ4KcU4/Y9Fb05oqhcVEiV5bVDzqErCect/ E1egXkVROBKKuiOeW12OQDvT9Uh/BHlj/Dq3MKvQuieIiOe4KCf3kT93zVlO3r6dqlCJ+d V/yjtXMWgBM9bRvN5+SWuSiQKzGHNrGy2lzxozvgCjhDrYUvq6IjqFuRQmk9GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290749; 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=2xF7c2/FEuvoTGpn1+Z2O2bFssPLvlQssHli9oh5kls=; b=nfK6hMUZvxX/ngrJp2Y6Gsk5OpWYwqpNhyGJoDTeK0bP6nZA7iBXHP9P5VvsmHQxW3KtuZ MLoW3nKUpCJ15sS9V18aMi5SK98rZCsny501AHQf3kSR71gKb7LdprNLUlV9c868avLYu/ efT89fhJXKxqyHwIk2IAy+3rMm0uMHZR25OhxvgnmTb47WE88Csqi0bMpqSGu8lcfEGYPp nLg4JjG1Tjs3e6RxPlopFfKhMQqtah5p8uRfuE4ShNjmkx+PsW4PO21oxbPqSJ5k4AldVC slThz35wuuZEOKBuMDUd7vms377ujYuNrNOtpuKKwk70qzK5wp0Xsx+B8ehH2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290749; a=rsa-sha256; cv=none; b=u7SpviYQvo8imCoRkm0xNeaOwthk8o9y7HGCeL+ydp6GgOc+jUPsAxRMb/KTQIlLP+EXiz R85MUSir09/xyJCfTqt8lmm2W6tbbbiBvoFjGfxtBBX/2b5IED9up1R8KaQWU73GKctwjE SOBMGJe7B4aECNH5KxDbhOeg5PZOh5/m+fs2Q3D+CxCEcwZOVLAkoEnvqOrdcjhKkJDJYD chbQRLSHdJuOZ3ZfZsAPEWZCsog5d4RWgl8VtuvnFMZq1lGydp3onEi9a4zvReCARJA9dy na/nrgF9kxt0PAYcwZUBHoRAoDAehNFF/evTOjx2jLBEZ7qb2eO4TnkncTiIIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrX6YmvzkBB for ; Thu, 01 Jan 2026 18:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36346 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rick Parrish From: Alexander Ziaee Subject: git: 992f994bb71e - stable/15 - librt/mq_getfd_np.3: Initial manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 992f994bb71ec61e893457bfc2ffc02dfd8c0b50 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:48 +0000 Message-Id: <6956b77c.36346.5072db67@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=992f994bb71ec61e893457bfc2ffc02dfd8c0b50 commit 992f994bb71ec61e893457bfc2ffc02dfd8c0b50 Author: Rick Parrish AuthorDate: 2025-12-18 22:12:32 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:04 +0000 librt/mq_getfd_np.3: Initial manual page The mq_getfd_np function appeared in FreeBSD 11 with no documentation. This function dereferences the mqd_t as a pointer to an int. Relnotes: yes MFC after: 3 days Reviewed by: kib (previous), markj, ziaee Differential Revision: https://reviews.freebsd.org/D43947 (cherry picked from commit ca2413d216197fd55f9363d6f65c641ff1aa3ec5) --- lib/librt/Makefile | 2 ++ lib/librt/mq_getfd_np.3 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/lib/librt/Makefile b/lib/librt/Makefile index c755bb123c73..1189636d0416 100644 --- a/lib/librt/Makefile +++ b/lib/librt/Makefile @@ -24,4 +24,6 @@ SYMBOL_MAPS=${.CURDIR}/Symbol.map HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +MAN= mq_getfd_np.3 + .include diff --git a/lib/librt/mq_getfd_np.3 b/lib/librt/mq_getfd_np.3 new file mode 100644 index 000000000000..44c29fbdbf73 --- /dev/null +++ b/lib/librt/mq_getfd_np.3 @@ -0,0 +1,57 @@ +.\" +.\" Copyright (c) 2024 Rick Parrish +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd December 18, 2025 +.Dt MQ_GETFD_NP 3 +.Os +.Sh NAME +.Nm mq_getfd_np +.Nd get a file descriptor for an open message queue descriptor +.Sh SYNOPSIS +.Lb librt +.In mqueue.h +.Ft int +.Fn mq_getfd_np "mqd_t mqd" +.Sh DESCRIPTION +The +.Nm +function retrieves the underlying file descriptor +from the given message queue descriptor returned from +.Xr mq_open 2 . +The file descriptor is used by other functions +to refer to that message queue. +The +.Fa mqd +argument must be an open message queue descriptor. +.Sh IMPLEMENTATION NOTES +.Fx +implements retrieval or alteration of message queue attributes +based on the file descriptor. +The open file descriptor is copied into a child after +.Xr fork 2 . +The +.Xr fstat 2 , +.Xr fchmod 2 , +and +.Xr fchown 2 +system calls are supported for the file descriptor. +.Pp +The file descriptor is safe to use so long as +the message queue descriptor remains open. +.Sh RETURN VALUES +Upon successful completion, the function returns a file descriptor. +.Sh ERRORS +The +.Nm +function does not return any errors. +.Sh SEE ALSO +.Xr mq_close 2 , +.Xr mq_open 2 , +.Xr mqueuefs 4 +.Sh HISTORY +Support for the +.Nm +function first appeared in +.Fx 11.0 . From nobody Thu Jan 1 18:05: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 4dhvrZ3dWzz6MVkc for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrZ0vz5z3YYX for ; Thu, 01 Jan 2026 18:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iTtmu6/wTngtAuQwwaCFJgSVwWYnzlYQtB6qGrRBwvM=; b=dxOZhArAFX0OjM+BGjmLlgZtF6MaJ8SE7MpbjghK3QFxR1z2H7JcQSNWhOKF2rr2PcAN1+ zUEo+CSgjuCASozo7078uiZBtdrsuUK5BzyIykZxSAVHf6dExRhSrbx0Rw+JOiY/KCeGMC FziYyKpWOJASpnaZCItjor95rTiLFP7wuVHWvINj+25CI9ACWwpHcRg91xY0+l41ZZZlvB tYkb/IF3cafjt5xDNbpdp0ln9rkFhZNzSuBKiuRxZ++5qEwB1nOsZPwkC4XGElD50mz/xu aC7a6hLMcfRMjDr13KI3KQEzTJ+NU34eeam6E9efOWByTVKkCGJcu/hKE40FCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iTtmu6/wTngtAuQwwaCFJgSVwWYnzlYQtB6qGrRBwvM=; b=QZwUcb3ddIBGB8JnuZOP3so7aXXaHnML8Gva1U//sFLau82WZ7owEjrMWz7rCJBh1x0gBF cxib93MXgRWssdeyEy8jcbtaBF0FEPtC8KYEgkPjoar8XAUkUSqQdaoaY4oCmL2mapkAXn 7LxDP5a7zPuoW5pjUOayvsekxW0f9eiqJwEmcto6JhePRfNlxNpyMWkN7x+MbXMgmhS/WC vllVHRFFwO9/myxAQPEE6jQqsLBibvFxubhY20HDYgpkkDUble1UyDVDpF65zcEdgt8ixo MKiRgy09KBuxaJpAW6lPNGVOK3sJfWUGT645WljyHIXaePccsp/6OULgSEgrdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290750; a=rsa-sha256; cv=none; b=O9b6Ho14+c7JwBolfB6ceoUwEx+DUy7NhdUmvXDZI3M7dO+q36FbG9gGI6NRV1RKExCJBs snnG+ZhfQAsxM5yLVoBHL4rRPUP4JrdiFKgexUnt5jgHgOvICmTFHjHr5O1wy9xgVaJCUX 4b0psUbo4Qa7Cm4eJ4ylcwKLcJOovtm937P3XRn2K4aq6jQ4Tp43Y57+pi4BFSV7z+f1XP 5iktHfL0a7hkajLWP/NKOuBCd8NLqan9SyXyQwPTnJcIT8O4iLhO6M2TzjSlKBcYeBl9zv Kw0zLxFsl8DnjVZaIYDkbLaQnmExpBPbELt0HaoJEkXov3IiHxFLc1FzTV93eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrZ0Rsmzk8q for ; Thu, 01 Jan 2026 18:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3634b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: baef11e8e9b3 - stable/15 - camcontrol.8: Descriptions before examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: baef11e8e9b327dbe634edc01fef332a59ba9790 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:50 +0000 Message-Id: <6956b77e.3634b.7b2cd9c8@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=baef11e8e9b327dbe634edc01fef332a59ba9790 commit baef11e8e9b327dbe634edc01fef332a59ba9790 Author: Alexander Ziaee AuthorDate: 2025-12-23 13:36:49 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:05 +0000 camcontrol.8: Descriptions before examples This page has a lot of examples, so having them in the previous order can be confusing. Rewrite to the normal order where the descriptions come before the command, followed by a colon, which is still clear even jumping to the middle of the section. PR: 291759 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54285 (cherry picked from commit fbc321b9cdceecd3c97742868da5d500423cf484) --- sbin/camcontrol/camcontrol.8 | 349 ++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 201 deletions(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index bdda1828abf5..4963615fe6f6 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2684,303 +2684,250 @@ is the transport layer device. are the CAM application passthrough devices. .El .Sh EXAMPLES -.Dl camcontrol eject -n cd -u 1 -v -.Pp Eject the CD from cd1, and print SCSI sense information if the command -fails. +fails: .Pp -.Dl camcontrol tur da0 +.Dl camcontrol eject -n cd -u 1 -v .Pp Send the SCSI test unit ready command to da0. The .Nm -utility will report whether the disk is ready, but will not display sense -information if the command fails since the +utility will report whether the disk is ready, +but will not display sense information if the command fails since the .Fl v -switch was not specified. -.Bd -literal -offset indent -camcontrol tur da1 -E -C 4 -t 50 -Q head -v -.Ed +switch was not specified: +.Pp +.Dl camcontrol tur da0 .Pp Send a test unit ready command to da1. Enable kernel error recovery. Specify a retry count of 4, and a timeout of 50 seconds. -Enable sense -printing (with the -.Fl v -flag) if the command fails. -Since error recovery is turned on, the -disk will be spun up if it is not currently spinning. -The -.Tn SCSI -task attribute for the command will be set to Head of Queue. +Enable sense printing +.Pq with the Fl v flag +if the command fails. +Since error recovery is turned on, +the disk will be spun up if it is not currently spinning. +The SCSI task attribute for the command will be set to Head of Queue. The .Nm -utility will report whether the disk is ready. -.Bd -literal -offset indent -camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e - -i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1" -.Ed +utility will report whether the disk is ready: +.Pp +.Dl camcontrol tur da1 -E -C 4 -t 50 -Q head -v .Pp Issue a READ BUFFER command (0x3C) to cd1. Display the buffer size of cd1, and display the first 10 bytes from the cache on cd1. -Display SCSI sense -information if the command fails. +Display SCSI sense information if the command fails: .Bd -literal -offset indent -camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e - -o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8 +camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e + -i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1" .Ed .Pp Issue a WRITE BUFFER (0x3B) command to cd1. Write out 10 bytes of data, not including the (reserved) 4 byte header. -Print out sense information if -the command fails. -Be very careful with this command, improper use may -cause data corruption. +Print out sense information if the command fails. +Be very careful with this command, +improper use may cause data corruption: .Bd -literal -offset indent -camcontrol modepage da3 -m 1 -e -P 3 +camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e + -o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8 .Ed .Pp -Edit mode page 1 (the Read-Write Error Recover page) for da3, and save the -settings on the drive. +Edit mode page 1 (the Read-Write Error Recover page) for da3, +and save the settings on the drive. Mode page 1 contains a disk drive's auto read and -write reallocation settings, among other things. +write reallocation settings, among other things: +.Bd -literal -offset indent +camcontrol modepage da3 -m 1 -e -P 3 +.Ed +.Pp +Rescan all SCSI buses in the system for devices that have been added, +removed or changed: .Pp .Dl camcontrol rescan all .Pp -Rescan all SCSI buses in the system for devices that have been added, -removed or changed. +Rescan SCSI bus 0 for devices that have been added, removed or changed: .Pp .Dl camcontrol rescan 0 .Pp -Rescan SCSI bus 0 for devices that have been added, removed or changed. +Rescan SCSI bus 0, target 1, lun 0 to see if it has been added, removed, +or changed: .Pp .Dl camcontrol rescan 0:1:0 .Pp -Rescan SCSI bus 0, target 1, lun 0 to see if it has been added, removed, or -changed. +Set the number of concurrent transactions for da5 to 24: .Pp .Dl camcontrol tags da5 -N 24 .Pp -Set the number of concurrent transactions for da5 to 24. -.Bd -literal -offset indent -camcontrol negotiate -n da -u 4 -T disable -.Ed +Disable tagged queueing for da4: .Pp -Disable tagged queueing for da4. -.Bd -literal -offset indent -camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a -.Ed +.Dl camcontrol negotiate -n da -u 4 -T disable .Pp Negotiate a sync rate of 20MHz and an offset of 15 with da3. -Then send a -Test Unit Ready command to make the settings take effect. -.Bd -literal -offset indent -camcontrol smpcmd ses0 -v -r 4 "40 0 00 0" -R 1020 "s9 i1" -.Ed +Then send a Test Unit Ready command to make the settings take effect: .Pp -Send the SMP REPORT GENERAL command to ses0, and display the number of PHYs -it contains. -Display SMP errors if the command fails. -.Bd -literal -offset indent -camcontrol security ada0 -.Ed +.Dl camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a .Pp -Report security support and settings for ada0 -.Bd -literal -offset indent -camcontrol security ada0 -U user -s MyPass -.Ed +Send the SMP REPORT GENERAL command to ses0, +and display the number of PHYs it contains, +displaying SMP errors if the command fails: .Pp -Enable security on device ada0 with the password MyPass -.Bd -literal -offset indent -camcontrol security ada0 -U user -e MyPass -.Ed +.Dl camcontrol smpcmd ses0 -v -r 4 "40 0 00 0" -R 1020 "s9 i1" .Pp -Secure erase ada0 which has had security enabled with user password MyPass +Report security support and settings for ada0: .Pp -.Em WARNING! WARNING! WARNING! +.Dl camcontrol security ada0 +.Pp +Enable security on device ada0 with the password MyPass: +.Pp +.Dl camcontrol security ada0 -U user -s MyPass +.Pp +Secure erase the security enabled ada0 with user password MyPass. .Pp -This will +.Em WARNING ! WARNING ! WARNING ! +.Pp +The following command will .Em ERASE ALL data from the device, so backup your data before using! .Pp -This command can be used against an SSD drive to restoring it to -factory default write performance. -.Bd -literal -offset indent -camcontrol hpa ada0 -.Ed +This will restore a solid state drive +.Pq SSD +to factory default write performance: .Pp -Report HPA support and settings for ada0 (also reported via -identify). -.Bd -literal -offset indent -camcontrol hpa ada0 -s 10240 -.Ed +.Dl camcontrol security ada0 -U user -e MyPass .Pp -Enables HPA on ada0 setting the maximum reported sectors to 10240. +Report HPA support and settings for ada0 (also reported via identify): .Pp -.Em WARNING! WARNING! WARNING! +.Dl camcontrol hpa ada0 +.Pp +Enable HPA on ada0 setting the maximum reported sectors to 10240. +.Pp +.Em WARNING ! WARNING ! WARNING ! .Pp -This will +The following command will .Em PREVENT ACCESS -to all data on the device beyond this limit until HPA is disabled by setting -HPA to native max sectors of the device, which can only be done after a -power-on or hardware reset! +to all data on the device beyond this limit until HPA is disabled +by setting HPA to native max sectors of the device, +which can only be done after a power-on or hardware reset! .Pp .Em DO NOT -use this on a device which has an active filesystem! -.Bd -literal -offset indent -camcontrol persist da0 -v -i read_keys -.Ed +use this on a device which has an active filesystem: .Pp -This will read any persistent reservation keys registered with da0, and -display any errors encountered when sending the PERSISTENT RESERVE IN -.Tn SCSI -command. -.Bd -literal -offset indent -camcontrol persist da0 -v -o register -a -K 0x12345678 -.Ed +.Dl camcontrol hpa ada0 -s 10240 .Pp -This will register the persistent reservation key 0x12345678 with da0, -apply that registration to all ports on da0, and display any errors that -occur when sending the PERSISTENT RESERVE OUT command. -.Bd -literal -offset indent -camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac -.Ed +This will read any persistent reservation keys registered with da0, +and display any errors encountered when sending the +PERSISTENT RESERVE IN SCSI command: .Pp -This will reserve da0 for the exlusive use of the initiator issuing the -command. +.Dl camcontrol persist da0 -v -i read_keys +.Pp +Register the persistent reservation key 0x12345678 with da0, +apply that registration to all ports on da0, +and display any errors that +occur when sending the PERSISTENT RESERVE OUT command: +.Pp +.Dl camcontrol persist da0 -v -o register -a -K 0x12345678 +.Pp +Reserve da0 for the exclusive use of the initiator issuing the command. The scope of the reservation is the entire LUN. -Any errors sending the PERSISTENT RESERVE OUT command will be displayed. -.Bd -literal -offset indent -camcontrol persist da0 -v -i read_full -.Ed +Any errors sending the PERSISTENT RESERVE OUT command will be displayed: .Pp -This will display the full status of all reservations on da0 and print out -status if there are any errors. -.Bd -literal -offset indent -camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac -.Ed +.Dl camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac +.Pp +Display the full status of all reservations on da0 +and print out status if there are any errors: +.Pp +.Dl camcontrol persist da0 -v -i read_full .Pp This will release a reservation on da0 of the type ex_ac -(Exclusive Access). +.Pq Exclusive Access . The Reservation Key for this registration is 0x12345678. -Any errors that occur will be displayed. +Any errors that occur will be displayed: +.Pp +.Dl camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac +.Pp +Register the key 0x12345678 with da0, +specifying that it applies to the SAS initiators +with SAS addresses 0x1234567812345678 and 0x8765432187654321: .Bd -literal -offset indent camcontrol persist da0 -v -o register -K 0x12345678 -S \e -I sas,0x1234567812345678 -I sas,0x8765432187654321 .Ed .Pp -This will register the key 0x12345678 with da0, specifying that it applies -to the SAS initiators with SAS addresses 0x1234567812345678 and -0x8765432187654321. -.Bd -literal -offset indent -camcontrol persist da0 -v -o register_move -k 0x87654321 \e - -K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678 -.Ed -.Pp -This will move the registration from the current initiator, whose -Registration Key is 0x87654321, to the Fibre Channel initiator with the +Move the registration from the current initiator, +whose Registration Key is 0x87654321, +to the Fibre Channel initiator with the Fiber Channel World Wide Node Name 0x1234567812345678. A new registration key, 0x12345678, will be registered for the initiator -with the Fibre Channel World Wide Node Name 0x1234567812345678, and the -current initiator will be unregistered from the target. +with the Fibre Channel World Wide Node Name 0x1234567812345678, +and the current initiator will be unregistered from the target. The reservation will be moved to relative target port 2 on the target device. -The registration will persist across power losses. +The registration will persist across power losses: .Bd -literal -offset indent -camcontrol attrib sa0 -v -i attr_values -p 1 +camcontrol persist da0 -v -o register_move -k 0x87654321 \e + -K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678 .Ed .Pp -This will read and decode the attribute values from partition 1 on the tape -in tape drive sa0, and will display any -.Tn SCSI -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rz -P summary -.Ed +Read and decode the attribute values from partition 1 on the tape +in tape drive sa0, and will display any SCSI errors that result: .Pp -This will request the SMR zone list from disk da0, and print out a -summary of the zone parameters, and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rz -o reset -.Ed +.Dl camcontrol attrib sa0 -v -i attr_values -p 1 .Pp -This will request the list of SMR zones that should have their write -pointer reset from the disk da0, and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rwp -l 0x2c80000 -.Ed +Request the SMR zone list from disk da0, and print out a summary +of the zone parameters, and display any SCSI or ATA errors that result: .Pp -This will issue the Reset Write Pointer command to disk da0 for the zone -that starts at LBA 0x2c80000 and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s -.Ed +.Dl camcontrol zone da0 -v -c rz -P summary .Pp -Set the timer for the Idle_a power condition on drive -.Pa ada0 -to 60.1 seconds, enable that particular power condition, and save the timer -value and the enabled state of the power condition. -.Bd -literal -offset indent -camcontrol epc da4 -c goto -p Standby_z -H -.Ed +Request the list of SMR zones that should have their write pointer reset +from the disk da0, and display any SCSI or ATA errors that result: +.Pp +.Dl camcontrol zone da0 -v -c rz -o reset +.Pp +Issue the Reset Write Pointer command to disk da0 for the zone that +starts at LBA 0x2c80000 and display any SCSI or ATA errors that result: +.Pp +.Dl camcontrol zone da0 -v -c rwp -l 0x2c80000 +.Pp +Set the timer for the Idle_a power condition on drive ada0 to +60.1 seconds, enable that particular power condition, +and save the timer value and the enabled state of the power condition: +.Pp +.Dl camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s .Pp -Tell drive -.Pa da4 -to go to the Standby_z power state (which is -the drive's lowest power state) and hold in that state until it is -explicitly released by another +Tell drive da4 to go to the Standby_z power state +.Pq the drive's lowest power state +and hold in that state until it is explicitly released by another .Cm goto -command. -.Bd -literal -offset indent -camcontrol epc da2 -c status -P -.Ed +command: +.Pp +.Dl camcontrol epc da4 -c goto -p Standby_z -H .Pp -Report only the power state of -drive -.Pa da2 . +Report only the power state of drive da2. Some drives will power up in response to the commands sent by the .Pa status subcommand, and the .Fl P option causes .Nm -to only send the -.Tn ATA -CHECK POWER MODE command, which should not trigger a change in the drive's -power state. -.Bd -literal -offset indent -camcontrol epc ada0 -c list -.Ed +to only send the ATA CHECK POWER MODE command, +which should not trigger a change in the drive's power state: +.Pp +.Dl camcontrol epc da2 -c status -P .Pp -Display the ATA Power Conditions log (Log Address 0x08) for -drive -.Pa ada0 . +Display the ATA Power Conditions log (Log Address 0x08) for drive ada0: +.Pp +.Dl camcontrol epc ada0 -c list +.Pp +Set the timestamp of drive sa0 using a +.Xr strptime 3 +format string followed by a time string +that was created using this format string: .Bd -literal -offset indent camcontrol timestamp sa0 -s -f "%a, %d %b %Y %T %z" \e -T "Wed, 26 Oct 2016 21:43:57 -0600" .Ed -.Pp -Set the timestamp of drive -.Pa sa0 -using a -.Xr strptime 3 -format string followed by a time string -that was created using this format string. .Sh SEE ALSO .Xr cam 3 , .Xr cam_cdbparse 3 , From nobody Thu Jan 1 18:05: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 4dhvrb4qmqz6MW1t for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrb1W6gz3YR9 for ; Thu, 01 Jan 2026 18:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrjmQXAxrFrdEl+K2UbjCQV/LWlt94wXvXu3OUtu6nQ=; b=ZTz605mAkZib77M4k6Bwak6HLfJPSm6poLeYxXsj0YRTcXw5Z28jQrda/zGy6aOhGhMyXj uKm/mCOO8qKkp0yQFIS57TBLsmEULPoYb/9p4aoSHQ56zIX0j9xvvshDF74p8zb2yM5trL sXGETG190J/LdWzdWocvbUa/ZP1BLvcnNfbRA10199cI6L5pjxeT33iQMxDwA4fOOxEJkx weVDiuFUZniL/S7y0uDLoHt2rVV5UMPdmmO9qo6fWT/k7sgLM9m3+7LZZ9TQcSfMDYrxDy EC/Oa1LQ2QWZMB3z4xd/SvrhjwbSlVkagnlDd2SJpaqiFZiGzaeucH5YOJXbbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrjmQXAxrFrdEl+K2UbjCQV/LWlt94wXvXu3OUtu6nQ=; b=sYMS6tMow+IEdS+U94KhvpgWaJJAwC/dzAYJH5FaQCvKy8JxVMVYbQbcEhtJNSfBwYz/nf 6e3TdBR+1hK2agB3OZ/mDCEpZbjOFaB28n2FJ/w3HRKsMbbyN9MdikkU873d5YQ6FiVG6r qJRfXPSIp0JgheGW32h6pPwrG1uZt8RIbY47X5VLJx1CoqVGSj1NEp+8jYq/4sND1USRvg e5aLRZQSFuc3mOmFWAFQ3CIHFI2aEvAdg4g+GrpQ3TB3qoqdgzuxsKWKQg7sYo2WevTYQl XyApJvjpBk/kO390HKcoaZrDq9CCYt3e4LVy8jwCU/RJ6YW9QvmxHJJYb77/dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290751; a=rsa-sha256; cv=none; b=J4dIGjjCnowpTpVBhxThm8CGJC8BQwSKT2vrGu/b3ArEzCwX2XXyP8Mq0mMstCcYNvi6zm Tc039y0XGyTfBaYAhK+b94hXNde4Y/+MLOhHtjKofhcojLdLCdP16pj5h/c95JUEz5Seem d+a7GI8LLe67LrwqYgInX8Y0y6awNp7AeBYoqP1rspJS9z1P2YhCmGOyIAgUjLEz06d2z1 i48x7BwHZ3oUCXGeNUUiMeemkYwRBW3PflfmwSERQXZVTzaMMR3yFt5bVmcdq539tzzNIW 7KDq+tWPXvvGRMXJywMqTqmlqLFqtBOxvN+RgIXnzJPI1OlzhVGfGe10oHW/zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrb0pstzkDQ for ; Thu, 01 Jan 2026 18:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35bdb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: fe26fc694080 - stable/15 - cdce.4: Minor polish List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fe26fc694080089409ae813b478bac86239a0785 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:51 +0000 Message-Id: <6956b77f.35bdb.67e216c6@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=fe26fc694080089409ae813b478bac86239a0785 commit fe26fc694080089409ae813b478bac86239a0785 Author: Alexander Ziaee AuthorDate: 2025-12-23 13:52:13 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:05 +0000 cdce.4: Minor polish + Tag spdx license identifier + Fix "e.g.,"s to quiet linter + Remove useless Nd quoting + Put example in EXAMPLES MFC after: 3 days (cherry picked from commit 03752041e41b57af622f3649929789575a48258e) --- share/man/man4/cdce.4 | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 8c5dbb36d197..266d87bca079 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2004 Daniel Hartmeier .\" All rights reserved. .\" @@ -27,12 +30,12 @@ .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" -.Dd May 26, 2025 +.Dd December 23, 2025 .Dt CDCE 4 .Os .Sh NAME .Nm cdce -.Nd "USB Communication Device Class Ethernet (CDC ECM/NCM) driver" +.Nd USB Communication Device Class Ethernet (ECM/NCM) driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -46,7 +49,7 @@ kernel configuration file: .Cd "device cdce" .Ed .Pp -Mobile Devices (eg. Huawei E3372, E5573 and others) +Mobile Devices (e.g., Huawei E3372, E5573 and others) may need additionally the u3g command port: .Bd -ragged -offset indent .Cd "device ucom" @@ -83,17 +86,6 @@ received and transmitted over separate USB bulk transfer endpoints. The .Nm driver does not support different media types or options. -.Pp -Mobile -.Nm -Network Devices may need a connect command sequence via u3g -serial command port before they activate the NCM/ECM/ACM network -interface. -For example: -.Dl echo 'AT^NDISUP=1,1,"internet"' > /dev/cuaU[0].0 -where -.Dq internet -is your providers apn name. .Sh HARDWARE The .Nm @@ -113,8 +105,21 @@ Sharp Zaurus PDA .It Terayon TJ-715 DOCSIS Cable Modem .It -Huawei 3G/4G LTE (eg. E3372, E5573) and other mobile network devices +Huawei 3G/4G LTE (e.g., E3372, E5573) and other mobile network devices .El +.Sh EXAMPLES +Mobile +.Nm +Network Devices may need a connect command sequence via the +.Xr u3g 4 +serial command port before activating the NCM/ECM/ACM network interface. +For example: +.Pp +.Dl echo 'AT^NDISUP=1,1,"internet"' > /dev/cuaU[0].0 +.Pp +Wwhere +.Dq internet +is your providers apn name. .Sh DIAGNOSTICS .Bl -diag .It "cdce%d: no union descriptor" From nobody Thu Jan 1 18:05: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 4dhvrc4XgVz6MW1w for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrc1ndhz3YRJ for ; Thu, 01 Jan 2026 18:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCuUKwHWHSL8By8048h6sa868NLPWkdNVB/koi9cP50=; b=vQFLmyBFXxgYT4wFyF5kmWH5gMCPI1Js1aJaNDYZ4NJkWJDmbSCqXNIC5Pr1RNUVgPXNmP 3DQtaopMwpxzPl9Ou2q0MxuJP9Dd2xx45/5j+CHeUnOe1jqGCP9VOyh87RPJvKCZJdrVxx 4tktACmUEiS4jMclVGPqA4ubVkJiPBqvlOjkx7PbOJ6AaT4VmX0mQZdXW3rLvNyBY778Qw OEqSrO9L5FvpKKCTfChzvZ9vJ99Gnb8HtN38VQVuc924TViODuAb8GPlI2XMjVBH/U1n+6 mLuTMDmrtg/k9bzT4mhbBTwJMZ69TEMi7f7vMozloQx5HuaUU6BH9gH926/Tpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCuUKwHWHSL8By8048h6sa868NLPWkdNVB/koi9cP50=; b=T/S9hJ+oHrp1Wg4GzBgOT+Kbjk832rlaUa60zqiaj7gUVkuFtz6u/HdlmlOlUKyaFUHYQQ U/XiOjVXfSahNiWUHl7jfHsysSilbxM1/zaaXiM+NlJgLbL44DwTZlb0PFtrPlONF6ix/T gI14kkKhNajXb/d0D8rb8cKDkkBtXIXoR1Jv31wNOCJn7pw1GevciiPCIn7dyLgjV1DPMi 9kv8NdSUWTF/ghtDd14zwHWBxrrmeOLyQ0YqMGo6YTiQ8ai4BwvSYhx4skg2Uh245rm+64 PubAK4HTywMh9PYsxxd1aiOeeiIW9i8k1203vgp5Ckl9Cc7cBX0LnJdI+SBhhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290752; a=rsa-sha256; cv=none; b=L0AqnBXp6PO311Sca06PEdNGURM4Gbt8ec+oo5RuRO5cv1VaXm0/HO5iX2yoprG5cRtxGh MWmONmbjka0fAKCOgm0KYnCnsxH/DOdMqtarFNGiv6wLhr92+LgsekVx9aOj0IjlhDznkx DB/Vz9dNxEuJLUC7odSzQ/pazCYXv4fp6tR/fF+GF4VG8nBqY1aqhdO7epXnZigWz4s3U2 tEtqtqBsHrQVLEMqVAMP9v4mThA2kqqbFrbKNunvysVdRY+eac73RdBrsyhfs/UK5fxPPY sm36Wwy5DVNkSzAN4C1V28cE2577wOYgu6q1NHWSukMvH61UlCcsRvrrIkdFHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrc1HzRzjg1 for ; Thu, 01 Jan 2026 18:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3568a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: b59376c36de8 - stable/15 - udl.4: Consolidate HARDWARE 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 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: b59376c36de868c9846f0d6b8163b9b05b191b42 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:52 +0000 Message-Id: <6956b780.3568a.435ebfb2@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b59376c36de868c9846f0d6b8163b9b05b191b42 commit b59376c36de868c9846f0d6b8163b9b05b191b42 Author: Alexander Ziaee AuthorDate: 2025-12-23 14:35:37 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:05 +0000 udl.4: Consolidate HARDWARE and add HISTORY Some of the information needed for the HARDWARE section was the entire DESCRIPTION section, so merge the two. While here, add the HISTORY of this driver, add "driver" to the document description matching other drivers, and tag the SPDX license identifier for mechanical parsing. MFC after: 3 days (cherry picked from commit 97fa62708f67ce189bde22c98d9102da026b448c) --- share/man/man4/udl.4 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/share/man/man4/udl.4 b/share/man/man4/udl.4 index b2cfeba2489c..c9a1a1c40045 100644 --- a/share/man/man4/udl.4 +++ b/share/man/man4/udl.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: ISC +.\" .\" $OpenBSD: udl.4,v 1.20 2012/09/18 17:11:41 jasper Exp $ .\" .\" Copyright (c) 2009 Marcus Glocker @@ -14,12 +17,12 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd September 9, 2023 +.Dd December 23, 2025 .Dt UDL 4 .Os .Sh NAME .Nm udl -.Nd DisplayLink DL-120 / DL-160 USB display devices +.Nd DisplayLink DL-120 / DL-160 USB display device driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -35,13 +38,11 @@ module at boot time, place the following line in .Bd -literal -offset indent udl_load="YES" .Ed -.Sh DESCRIPTION +.Sh HARDWARE The .Nm -driver supports USB display devices based on the DisplayLink DL-120 / DL-160 -graphic chip. -.Sh HARDWARE -The following devices should work: +driver supports USB display devices +based on the DisplayLink DL-120 / DL-160 graphic chip, including: .Pp .Bl -tag -width Ds -offset indent -compact .It Century Corp. Japan Plus One LCD-8000U @@ -66,3 +67,10 @@ The following devices should work: .El .Sh SEE ALSO .Xr usb 4 +.Sh HISTORY +The +.Nm +driver appeared in +.Ox 4.6 +and +.Fx 11.0 . From nobody Thu Jan 1 18:05: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 4dhvrf4kFNz6MWDN for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrf3hQgz3YRW for ; Thu, 01 Jan 2026 18:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bS6nsYiCep9/yDx7PjBiDRz5adEn1mSlPiUq/CnXGEY=; b=C22MGeU/l/82/exACbm7ICqvO7siDsKWryzKCk0gf4U6QxbuOgeAOnDZXHyM+arTZNPb2x APFGwSrpTiX1kaj4/kej7ss1yoVizP0kp42WBtt1ms7S8qDkhOHJyl3Igg562dpBXMURTo Se1q19A0+aXeDYS56wtI40iH4XLtOBFd/3gKbWJPwsuappjfXvRGYu2y3QfHQSV4BOe95u il0pt7KBaIrrA5HMfyuC+BLvgmwk9686N4TTR8R4Lf5Y6OBRChWRMMP+bqmIe1P6frpCl6 DzOmMYaHmmMTvIJeGC57izFJuqwZAYdR7vsGSNM7O/p8N4KFQ14AM0GV8dcFgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bS6nsYiCep9/yDx7PjBiDRz5adEn1mSlPiUq/CnXGEY=; b=gvO/NwbTtbeI/r9cFl2uRmTWd9tM4HRBNTfOTEC4eNc6jY9gLkfAez1QETJT/YjKvCZtPV baUs3eW1/RnOJjOXgCLAr7S+Ccx6nSvIULXWpt7bBdEck+KjOHlWhxKs1Q1AV4J01RmUSB vZTZdCVeaDSEMkdB9Ul3EmLhQX6GoL5K06ue4SdM2W2256VeA1PsBfL4y+Cz/10PTFflHk kYzm4N/at3yFbYQqC9+y+wHA6EIgKJQjUI0ITZshoA5aE2mEZev1rh3jsoGvw2tU4me7UN h/qPpNMIbs8fypzqeohEIGL3wr0Ienp0LqjNTdsvw+pNsLFGD9exddqzTKobTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290754; a=rsa-sha256; cv=none; b=x/j2JTgHZPcEwCfoZRRLhgnL+9Fn94ajycl2jFip1YS2MDMpnPlPtQoPEHzM7JqRnV334n FBN16FEDuv6g36Fb4oed3orAx8ax1z2n1N+gpEkHdwT+cVd1bq/UhLdwDK1qV12/zbh+V+ YbtEuKlqC9GmFW0HxrN0dO10CAGXtXKdQlEtJgor2E64Bvuivw4YJPyHFa76pDPfyVVMHP NPwbDZq2hoyLgDcU4bXztpisgqbQ2UdeUiamPvId8dhScA4iu+MMygWDjPGbkcurokaPfV gX8HwXyVp5fczV2+6atdaJsl6bFui2Am2/qqRWuk4uXIcdQCIacGQuuQUG5xFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrf3BNQzkBC for ; Thu, 01 Jan 2026 18:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 81cb5026ead7 - stable/15 - genet.4: Only for AArch64 + tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 81cb5026ead75de67751dea926ff732852304b09 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:54 +0000 Message-Id: <6956b782.35e21.7e981f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=81cb5026ead75de67751dea926ff732852304b09 commit 81cb5026ead75de67751dea926ff732852304b09 Author: Alexander Ziaee AuthorDate: 2025-12-29 17:16:37 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:06 +0000 genet.4: Only for AArch64 + tag spdx MFC after: 3 days (cherry picked from commit c4bd487da73a28887f86750a5dc5832303592c5a) --- share/man/man4/genet.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/man/man4/genet.4 b/share/man/man4/genet.4 index 665aaff49507..1de92294ee9d 100644 --- a/share/man/man4/genet.4 +++ b/share/man/man4/genet.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2021 Michael J. Karels .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd December 8, 2021 -.Dt GENET 4 +.Dt GENET 4 aarch64 .Os .Sh NAME .Nm genet From nobody Thu Jan 1 18:05: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 4dhvrd6nKWz6MVkg for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrd3KSVz3YLS for ; Thu, 01 Jan 2026 18:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yO7wWuve9TKm39SJZfB1+9S3il+R4uhizton9oBXnAU=; b=H3k6SQnzd0ZlYuBeWH2caYnEBWmj9FgE1HkQfVIP4ykI3F86bM1wCsCgSP3ybbXnrFqkG9 CCr6GYPCVDe6TlSlQSkpIuzNcvb3JweZdpPTsKFM0mXmDz9ei5DJAZi73tka2thh9glt50 dy2PGbBDWUCRBbqskrCVgQ3gT9oy0Bhp40tlRo7d8L1FO3dxLZX/K2Fljpd5oUGW08/Id1 1xUUej8CLyW5MHtCgwiuDiqEjT8HOTy9bU2CRnJsccGBV521eZuc2tRNDrXmwOu7Vi7NqF GkOvwd1Mmm2cWyV+YpavmAb2hmHO7SO2yJHU89EMuULhUH0eFDWw0QT4PHLUkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yO7wWuve9TKm39SJZfB1+9S3il+R4uhizton9oBXnAU=; b=XV/e9m5HBiMgwu/DBXwZatI9zkJ9fiVM57tKnYzeAdY46dpSVBoR66QX1Nsbm4knpUyp0B YPrP4YzE2eu8cpo4/n4Fn59/atMELsQgUa2cOOGPsRgCvge4Q6RiEn8+axgHmjjfXqMY5a Nz7SWudkvHDxM1uMce4cXSlHj8WfMuZsrd3LXGfkSeC/UdOmELwAjouD2G6jbYZc5aRSdl eNu77ZWt3a/xU4qNW0QSsfuED8fZwpvWQHbJaxq+mCTQAxpRAFROW1h/ULQdI7vxMj6Y1v /bvdthCxDre1FhHoB2oT8ZJ8KMPNCpK3jm4AjfPr/mAyH/BngfcFAer2WJE9sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290753; a=rsa-sha256; cv=none; b=mk3mmkmUPj+Fc2sO4Ozp1cNm4oJIuQkl/+SbaeIW3uHOfBZfXXRxzC5xFG4OA0pj84zIXa zCZ+JVzei/OmLrA3/btv5+Th2rSxOw0T9s/4uNKfNGg/oYptdt0MDnLZDN6J1GMZJWMG5/ 0aflYAaViZAD8CBXolazo9sjjZfuLQ9AvajFeNXHazj76xiXUYMVDYk//LFh1D03Cv0z2+ 4eCzW1TMe/r+FTwbYg9Ggk2Ks9cN2KBklLwPhYetgenbwtyn7IcgIYq5lcV7bVB0H3tAcF C/rZutaeB5adtxqwWTbirF23BE25FxvBet2aNogT1Spdq39CqjIOMV1viwYRkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrd2DFhzjKk for ; Thu, 01 Jan 2026 18:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35ac5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 2feb2cf98f7b - stable/15 - udl.4: Tweak HARDWARE for hardware release note List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2feb2cf98f7bfbd3c8ced0181aa958f2e598c15e Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:53 +0000 Message-Id: <6956b781.35ac5.74abd3c6@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2feb2cf98f7bfbd3c8ced0181aa958f2e598c15e commit 2feb2cf98f7bfbd3c8ced0181aa958f2e598c15e Author: Alexander Ziaee AuthorDate: 2025-12-23 14:56:09 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:05 +0000 udl.4: Tweak HARDWARE for hardware release note Fixes: 97fa62708f67 (udl.4: Consolidate HARDWARE and add HISTORY) (cherry picked from commit 3c83b5d340f641259ea24e8af623e340eb8a21cc) --- share/man/man4/udl.4 | 61 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/share/man/man4/udl.4 b/share/man/man4/udl.4 index c9a1a1c40045..eab17302d5a4 100644 --- a/share/man/man4/udl.4 +++ b/share/man/man4/udl.4 @@ -42,28 +42,47 @@ udl_load="YES" The .Nm driver supports USB display devices -based on the DisplayLink DL-120 / DL-160 graphic chip, including: +based on the DisplayLink DL-120 and DL-160 graphic chips, including: .Pp -.Bl -tag -width Ds -offset indent -compact -.It Century Corp. Japan Plus One LCD-8000U -.It Century Corp. Japan Plus One LCD-4300U -.It DisplayLink USB to DVI -.It ForwardVideo EasyCAP008 USB to DVI -.It HP USB 2.0 Docking Station (FQ834) -.It HP USB Graphics Adapter (NL571) -.It IOGEAR USB 2.0 External DVI (GUC2020) -.It Koenig CMP-USBVGA10 and CMP-USBVGA11 -.It Lenovo 45K5296 USB to DVI -.It Lenovo ThinkVision LT1421 -.It Lilliput UM-70 -.It Nanovision MiMo UM-710 and UM-740 -.It Rextron VCUD60 USB to DVI -.It Samsung LD220 -.It StarTech CONV-USB2DVI -.It Sunweit USB to DVI -.It Unitek Y-2240 USB to DVI -.It VideoHome NBdock1920 -.It i-tec USB 2.0 Docking Station (USBDVIDOCK) +.Bl -bullet -compact +.It +Century Corp. Japan Plus One LCD-8000U +.It +Century Corp. Japan Plus One LCD-4300U +.It +DisplayLink USB to DVI +.It +ForwardVideo EasyCAP008 USB to DVI +.It +HP USB 2.0 Docking Station (FQ834) +.It +HP USB Graphics Adapter (NL571) +.It +IOGEAR USB 2.0 External DVI (GUC2020) +.It +Koenig CMP-USBVGA10 and CMP-USBVGA11 +.It +Lenovo 45K5296 USB to DVI +.It +Lenovo ThinkVision LT1421 +.It +Lilliput UM-70 +.It +Nanovision MiMo UM-710 and UM-740 +.It +Rextron VCUD60 USB to DVI +.It +Samsung LD220 +.It +StarTech CONV-USB2DVI +.It +Sunweit USB to DVI +.It +Unitek Y-2240 USB to DVI +.It +VideoHome NBdock1920 +.It +i-tec USB 2.0 Docking Station (USBDVIDOCK) .El .Sh SEE ALSO .Xr usb 4 From nobody Thu Jan 1 18: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 4dhvrg6xRyz6MWFF for ; Thu, 01 Jan 2026 18:05: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrg4Vq5z3YX2 for ; Thu, 01 Jan 2026 18:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VH5e8t03XFIedShixhQa0wK85Lm5K4mhFtPjrw3okOs=; b=JtgA/f2W4poqw8v69azdtbBWiq3QpnhlKwtLPGcagfkxVWiggsRdie0YkKRNjQLq5ZkPrY +htzI+Cg+6OZJDimK1Gk9tXM17/LJAoJ/4s/m9HLsVZ1IL9EMcDzpEDOjWtPX2dOjhCV5n LePFtKEHWR5S6C6CBS4BA3sWQTMc1OXpgbDWkXoxZdLzAaTIjfDi5bQB0u5RHgGHaOWElu udQKWYFXUoXL8LdUD6t5PAT0Xf0diYaCptAY41g2NDJfLekzQWoUfhNJmVERq0eUfj0PPt 3l6BX6KmBIYXUwL5rw/QhGdEDT1YofKnHTqGjd90MZ0bOc1zR6cnmmQKw4Of0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VH5e8t03XFIedShixhQa0wK85Lm5K4mhFtPjrw3okOs=; b=mjsHWMZU4Yx+7+gBMiJthQlsnP1St6lnVWuVFERLx6t6MdTbLeLny+nDxJCVMpr+T3MqN8 JAHbGWX22wMrI95DfTxGwKkcHhfGR1xR8QxkTb0BpMF/gHVp8GWysBK09DI9/Rh595hfb5 ru/AVOuWTKTS+qzzjCrR+wGFZm8ckPvSI9czVcPiDZFPigxdGi+k2MTH7N9MPc+PvsjG9B 1XzXZvESBtjdP4+Xc3bbsca+V1Fa5mX4rBFyDVmJ8eYWbT3nIv9krNJIASyfZLNMsH3a1E xSvfDHg064GVxXWxxZ1NtwS13bKA+w1Vu0qARUIyY99HBrSmX/lUisVgH+MQmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290755; a=rsa-sha256; cv=none; b=XIauoXdyqTNBdU+qW+OrDevnME1Q56hSQeF1A30A3CBvZR0Unz1GyPR+sdXa6WGLkXG8D0 bcpodH2jOn89r7urVzDfQ+R+lLai5ZQ+t5PLnsf5hUnScJCA3ysIrKEvbJijSCd4qu9/1R 7/Lt0pghBJN2rZWaEXt/kW9AkvyGkQCOFYCenYcXvZuFvE1TbC9SPhSLSfeTcfix3lIdLC MGbvOOdrbr4TSo6BimpUQCXoSOwbBBFDiMoQceHIPJWtZMCj6KmIID4LFBRx6b6we56LUM j0cbgkxsC8Fm56krvpNaNJfprr5vCO082kRB0rQh/N+l43Yz3FO/3KKdThoxxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrg3ykFzjg2 for ; Thu, 01 Jan 2026 18:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35494 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: a15b0cb6e8ec - stable/15 - cpuctl.4: Formatting nits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a15b0cb6e8ec9bbde88138ceeebae6fe3d757845 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:55 +0000 Message-Id: <6956b783.35494.652c384f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=a15b0cb6e8ec9bbde88138ceeebae6fe3d757845 commit a15b0cb6e8ec9bbde88138ceeebae6fe3d757845 Author: Alexander Ziaee AuthorDate: 2025-12-29 17:17:09 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:06 +0000 cpuctl.4: Formatting nits + Align ioctl list + Pad code examples + Tag spdx license identifier MFC after: 3 days (cherry picked from commit c6bd2aa8353c6c34dbff487132a7f7372752d0ad) --- share/man/man4/cpuctl.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4 index fc42cf14f254..5846fc4129f8 100644 --- a/share/man/man4/cpuctl.4 +++ b/share/man/man4/cpuctl.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2006-2008 Stanislav Sedov .\" All rights reserved. .\" @@ -63,7 +66,7 @@ All of the supported operations are invoked using the .Xr ioctl 2 system call. Currently, the following ioctls are defined: -.Bl -tag -width CPUCTL_CPUID_COUNT +.Bl -tag -width indent .It Dv CPUCTL_RDMSR Fa cpuctl_msr_args_t *args .It Dv CPUCTL_WRMSR Fa cpuctl_msr_args_t *args Read/write CPU machine specific register. @@ -92,6 +95,7 @@ typedef struct { uint32_t data[4]; } cpuctl_cpuid_args_t; .Ed +.Pp It is equivalent to the .Dv CPUCTL_CPUID_COUNT request with @@ -107,6 +111,7 @@ typedef struct { uint32_t data[4]; } cpuctl_cpuid_count_args_t; .Ed +.Pp The .Va level field indicates the CPUID level to retrieve, From nobody Thu Jan 1 18: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 4dhvrj01rDz6MWFJ for ; Thu, 01 Jan 2026 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrh57stz3YVW for ; Thu, 01 Jan 2026 18:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290756; 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=OfVwirHBwnYMWCPUX9p6m5VwuDJDb2YA2N60HA8gdAw=; b=cPyc4iAU/cWFxcB6IcYtQD3obpzLnkc7lz7kS1xwsZwnPZ8nkrz4A8ahI4HQsizUYHy248 B9hjK45nD/PBkLtGlZDf8ttlUKMnold8f46VAuCFzeJdPxvX6vClItslH2pQiMNa78Znpt tv09SYbfVwDfzZDMeZ1L0JmOA/TAsQSGG6yAV3MG3Fg2hfGade7nGaXZ4tXK/y2s2tD9qm Hv8T4oMSnBq31QH1Lyv2oZ6dFq7nXEsoJmWepu81WTP7/JEuttvzckbbx3Toswyb7C4bR7 gVndMlsDcATvySbB1+w7NnApngX4FX1P408ZuzyRj6fCQptgTFAntLJBm4upsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290756; 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=OfVwirHBwnYMWCPUX9p6m5VwuDJDb2YA2N60HA8gdAw=; b=RhxluaM+/1v1Y8RYPPzoVtSm2wcbncy5C/DejAA+cYyeZEt2lqr1z29fQLyIT/NzyC9V46 R/4u3y5eOWZ/4AgALrmWxFfXI6ANQTKwfmT5A6cGZzeHaYdAp7NhFDg6yEiSYcDCfLUyYA bfOuXHSDPg6jyTRxmFmDQJHG0hjSQRyOpEscmuhKxJCt05IlIuKxoyiKWXTh6KrWUbugdN /9ExkVGR7cZbVgVjZYEkxNL22sEBsKXuSe1lhfyboldOrHFYOHA0w1ZuGywDTh1/4WMSC3 /RvInE+4jKhSB4SeRxUtYataSwgJdKwcKvmrw7389SMw6RlwNs8nWFA2WsBitA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290756; a=rsa-sha256; cv=none; b=X+YqktizvljDaaoeh+oDwdcpENv2+ytCKu4psz/HIqysr68302vAM3cE9Wuw9ZGkEcXKNI j7/yIqde9e3MhxdtAYz5x7dTP/Hp2v2IH8R5WR5K81MO9qevRh7ZqS2lmIUEPabQ6qT0mQ rO8evFe8GEr2KPYD1wXYJ+Mad0HkW9NHTsEmBSIUTmn5hOr+iKqySeBXw8YnXpaHK0PwLJ KeExp6XE3xAUI/YKgjBwUSTyZ6HtxO7IIQAP5a/b3A0NDHnOFCzW+dEmHqFPOD6T2KU0oz 0vCrn7QnCkdkAnOjjz5Ywgmv1bWIM0R2gvbyYbADvDZqZ5P/vsOtr1C9dum9cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrh4hDczjkt for ; Thu, 01 Jan 2026 18:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 343b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: bd6289c06471 - stable/15 - ioctl.2: Mention EACCES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd6289c06471871dd83285ab9b50c49bc5f74652 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:56 +0000 Message-Id: <6956b784.343b3.5ff85f9e@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bd6289c06471871dd83285ab9b50c49bc5f74652 commit bd6289c06471871dd83285ab9b50c49bc5f74652 Author: Felix Johnson AuthorDate: 2025-12-29 19:21:26 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:06 +0000 ioctl.2: Mention EACCES ioctls can fail with EACCES, see sys/kern/tty.c PR: 239504 MFC after: 3 days Reviewed by: ziaee Reported by: Brennan Vincent Differential Revision: https://reviews.freebsd.org/D49072 (cherry picked from commit e2afbc45258f2fa4bdcf126e959ac660e76fc802) --- lib/libsys/ioctl.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libsys/ioctl.2 b/lib/libsys/ioctl.2 index e96c5c48d097..5784f43ef98b 100644 --- a/lib/libsys/ioctl.2 +++ b/lib/libsys/ioctl.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 11, 2013 +.Dd December 29, 2025 .Dt IOCTL 2 .Os .Sh NAME @@ -110,6 +110,9 @@ The system call will fail if: .Bl -tag -width Er +.It Bq Er EACCES +The process does not have permission to call this +.Nm . .It Bq Er EBADF The .Fa fd From nobody Thu Jan 1 18:05: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 4dhvrk0Rwvz6MW4T for ; Thu, 01 Jan 2026 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvrj5yKkz3Ydr for ; Thu, 01 Jan 2026 18: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=1767290757; 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=PnqPvftK4z4R9GVBqtmSxXhn8YiUQ5LrF+WSobk7FaA=; b=eWrNH6TNT8yJRPTrHPcKovNZ4apLQKeNIIRHT2phWcH5ghXczAWSlIFFL/kbsQPzF19U1A 13T1JZEeFAv1oRBs6ngd1wHvAc6XST+pYossbZqx7jCuxpZzZeZjkPn2EOdJHPVCVoJqiE fjx/c3BqjvsDafNl1mixkQPwvGBRoqcDSIZQogpaYWtrqdd1laI6HQujepyhj7vIGO0B0o z4m7qcYgzejqHC6jpMqEdr5CvWu21m+dLAxjUI4d++VkBiZaH7LXBgEcjAJ5b+dYtCQE1D Fyyc+kykE553T0MCpR1G30sFLwOIFVLqEFThZFNJPFEgMVy14Bx4fT+MUgT4Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290757; 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=PnqPvftK4z4R9GVBqtmSxXhn8YiUQ5LrF+WSobk7FaA=; b=SfknfoeoFqGWb3meNpwMU9sK9nas3lYuyH/InVOI1bWYHpp2UxiN0dxre6hoVLuGQ5omUh DcsHHF8HSpwIDMQk+p4YsSHosB9jho3I5UCuko0Ygt0WQpX2vvvD7lqgU8GwMuy90h5mKL chyaoPylcAhnToM3MM+CfXEqJVa6pv3PMwk1EmO+y86hrVX2G/qvbhHvBoC2eLTrLGpyb4 wayC9Bwn6yo+9dUMKBVKiEo3GPdWpX8S6PAbCnaBqhrSTSXX84sGnobgQJzWIZD2GH3x1g 0uYn8XPRRpmlExAwvEYrLIF1abhjma1H2aJSinaj9zODNc47ysOoe6l8w2dgBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290757; a=rsa-sha256; cv=none; b=aFzYGhs0hxzOwdivt5VHcTxrRCNUDHLQ6wzZY+THDVvvrVdMNmeCnxsLF0bfPA85TV4Mq5 HCeLBlGygr8EkIhOgWaMSm2H4escIadVr73SSKKCBUCi6oov3tJfzHrX0XBXkEbpVHRIIc HWRqtDpJ1P3JCQTUT2Z1hISrRLEPv10fAgZHdd70iup+3Xd+LGF9eNl/Bn5NDb2VXHHNrB zX84L/YKo6TVAbHN83Xj6FPzs3UoUOJ6vWxRlMxLiejHcjM4OSrcUzIQWbKihLO3n/Y+Se c1rduVYWRphm7rHp6atZ/0oaH7a600IiokXQguxvzvb1c8K7uyNh7G/oGac6JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvrj5Vmxzjkv for ; Thu, 01 Jan 2026 18:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36390 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:05:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yan-Hao Wang From: Alexander Ziaee Subject: git: 12d6beaf89a6 - stable/15 - kyua manuals: Correct --results-file short form List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12d6beaf89a6b8d3e97153d564188ebea9274e4b Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:05:57 +0000 Message-Id: <6956b785.36390.5efac184@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=12d6beaf89a6b8d3e97153d564188ebea9274e4b commit 12d6beaf89a6b8d3e97153d564188ebea9274e4b Author: Yan-Hao Wang AuthorDate: 2025-12-29 20:13:16 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:05:06 +0000 kyua manuals: Correct --results-file short form PR: 290647 Ref: kyua/cli/common.cpp#104 MFC after: 3 days Reviewed by: ziaee Closes: https://github.com/freebsd/kyua/issues/267 (cherry picked from commit bbaa7d628175ee484e31a054fb3cf7b7866cad13) --- contrib/kyua/doc/kyua-db-exec.1.in | 2 +- contrib/kyua/doc/kyua-db-migrate.1.in | 2 +- contrib/kyua/doc/kyua-report-html.1.in | 2 +- contrib/kyua/doc/kyua-report-junit.1.in | 2 +- contrib/kyua/doc/kyua-report.1.in | 2 +- contrib/kyua/doc/kyua-test.1.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/kyua/doc/kyua-db-exec.1.in b/contrib/kyua/doc/kyua-db-exec.1.in index 04f34c7b54e7..2e3bada4f849 100644 --- a/contrib/kyua/doc/kyua-db-exec.1.in +++ b/contrib/kyua/doc/kyua-db-exec.1.in @@ -62,7 +62,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -no-headers Avoids printing the headers of the table in the output of the command. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-db-migrate.1.in b/contrib/kyua/doc/kyua-db-migrate.1.in index 67e46de46fec..4a1852aafd36 100644 --- a/contrib/kyua/doc/kyua-db-migrate.1.in +++ b/contrib/kyua/doc/kyua-db-migrate.1.in @@ -47,7 +47,7 @@ database lives. .Pp The following subcommand options are recognized: .Bl -tag -width XX -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-report-html.1.in b/contrib/kyua/doc/kyua-report-html.1.in index 1f9f55b69a3f..3ff044ca8d30 100644 --- a/contrib/kyua/doc/kyua-report-html.1.in +++ b/contrib/kyua/doc/kyua-report-html.1.in @@ -64,7 +64,7 @@ The directory must not exist unless the option is provided. The default is .Pa ./html . -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-report-junit.1.in b/contrib/kyua/doc/kyua-report-junit.1.in index f1ad3a2e7f29..508ea30a3f6e 100644 --- a/contrib/kyua/doc/kyua-report-junit.1.in +++ b/contrib/kyua/doc/kyua-report-junit.1.in @@ -50,7 +50,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -output Ar directory Specifies the file into which to store the JUnit report. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Caveats diff --git a/contrib/kyua/doc/kyua-report.1.in b/contrib/kyua/doc/kyua-report.1.in index 8e2485f9c4ac..a3e4d75456cf 100644 --- a/contrib/kyua/doc/kyua-report.1.in +++ b/contrib/kyua/doc/kyua-report.1.in @@ -70,7 +70,7 @@ and .Pa /dev/stderr can be used to specify the standard output and the standard error, respectively. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-test.1.in b/contrib/kyua/doc/kyua-test.1.in index 8cd5f34ae6af..07db6cf461c2 100644 --- a/contrib/kyua/doc/kyua-test.1.in +++ b/contrib/kyua/doc/kyua-test.1.in @@ -69,7 +69,7 @@ Specifies the Kyuafile to process. Defaults to a .Pa Kyuafile file in the current directory. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-write.mdoc .El .Pp From nobody Thu Jan 1 18:10: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 4dhvxW03y1z6MWdk for ; Thu, 01 Jan 2026 18:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvxS1fWHz3gHd for ; Thu, 01 Jan 2026 18:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767291004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mC0DqrGwLHnX93Eka6FHyy00b6/FOdXoyStLRTr7wEA=; b=nEpbTFjhVKGE4ePlMRFl1hTEVsfnX8JTKZNP7YHBNR+P5eYRl8ganl5cNDUhrxA9gR6UjO gIHp81px4zUEKWMnWnOs3Cvm1zTdyw1UxmNt1N8XVc1NvDmUe5ZmeOAqgGQIR3MWjHjyK0 DN9F/8FGfggmkx7KI4xeRNtxcFkwcVFIjgy/UKyjBHaXu9/N77xeCQbqmCQ8khEsik8I8C I1uF5KUQLIeu/DZNJclBDaWin8IrqvtFYeiDhzlBHKcSGStx0YbdsHMfbnTqHfeNLB7vUM WJ5HSsyLbFtNqY6BKtyh2UWrqML0rv+nKCeBvryE/hzcwYWesZHMgvTbSShlkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767291004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mC0DqrGwLHnX93Eka6FHyy00b6/FOdXoyStLRTr7wEA=; b=uKswvCJ/icXCNSy8sgjSVFXwpiwX9jQSWvkmlmkhXDBYSm6YM4J+lJ3KzP9FKXgl3zYJLv 6e8KWV9w2aJRGtj93+w9zDHrDyrye2lkXL9GFv43aSHL9+FayV7NdFz78rD4DYJLPPg08U Vb4nHTY+DbXL67zoALTAD/TRRFGaDYEQpAuwekRFahjKiU+nMSY6XEtvratLiC/KvHjBam DuSXM5+w9QRiHFYuhOqDJSwQpMvC6NQVuhL92JtEZY52zhVlAmzEF6HiZZYpIQfhvGTAaW S50vNmz/wbAbM1WOquF+ZpI9rWiD5en730b+Qb2r5+ruBw8pddS37fZ0IJLsag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767291004; a=rsa-sha256; cv=none; b=l/L1ERo3N4QrM7X+KYBBIIR47jpkhTQ9sf5dypXnqUuTHVvOEfHDjPSFAhMP3W4+0hxYxM lw7kJv4Py/qszo6zpV7bQ/KuXP5Ta9m9jhGP5/E5A7AdKLDz0l1UHNwfqoO9kR6mn1atqK 8Xe0Qq9MpP+dnS38OKDU1TabfLedAojDxLdUX6bvTmH6ZW2qmw5eUHxhTtjqjfmVmmPblw MXIN2QXI2+aXo26cGs11lOnE0ZY/mk+6YkyJQTIHt68MIDomM49E2NIh9D2vBIc+050TL5 Orym8stu5gTJqqK3de+juqKG5XAjZ5rLqr5AyFdUSdC1RrUhNUVKX3gt4qYEbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvxS0lFSzkDX for ; Thu, 01 Jan 2026 18:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 353c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:10:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: cdb05de1ecce - stable/15 - example.3: Show updated library macro usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cdb05de1eccecd9e7e2fbe2328e48418f1b9c943 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:10:04 +0000 Message-Id: <6956b87c.353c3.46197ff@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=cdb05de1eccecd9e7e2fbe2328e48418f1b9c943 commit cdb05de1eccecd9e7e2fbe2328e48418f1b9c943 Author: Alexander Ziaee AuthorDate: 2025-12-17 17:27:39 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:08:51 +0000 example.3: Show updated library macro usage The LIBRARY section has been deprecated by upstream. Show the updated usage of the Lb macro in SYNOPSIS. Fixes: 4c07abdbacf49 (mandoc: Vendor import of upstream at 2025-06-13) (cherry picked from commit 3527e7e9f7b2f1737706378b99af778921849e9d) --- share/examples/mdoc/example.3 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3 index a1e47b34064b..44fb1c76798c 100644 --- a/share/examples/mdoc/example.3 +++ b/share/examples/mdoc/example.3 @@ -5,16 +5,15 @@ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. -.Dd July 30, 2004 +.Dd December 17, 2025 .Dt EXAMPLE 3 .Os .Sh NAME .Nm example .Nd example library function manual page .Sh LIBRARY -.\" Note: list of available libraries is available in mdoc(7) -.Lb libc .Sh SYNOPSIS +.Lb libc .In example.h .Ft int .Fn example "char *ptr" "int mode" From nobody Thu Jan 1 18:10: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 4dhvxW39hWz6MWYK for ; Thu, 01 Jan 2026 18:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvxW0Xp1z3g9R for ; Thu, 01 Jan 2026 18:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767291007; 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=ac468rCKROToLFrN035K4FMVadeR1yBVsi96H3O6RtI=; b=i101i9DkIlueEMSFizJJVn7QyvbHrCujPlMTVNpbP5+YXZBi/6+orNWcaoImy2Whlz0/37 5Vv8SuEVwuHALpaAKH98YqUWwc09c9BGSzntYDSU7uQxBrge6NuMpKa77yc/vG8kMq7i4s I+u3fcU5jMAHhZKBqade5tXvi6gkPdJPjjKfhSiytECF8BmGpgM7UEoQhB7RgP4O9zmWRL CvACd3xl+v1PqXxjlFyrB30OXeNA8H+dYhZJqXasAcrV4dLNVihq5MSbEfkORhCxKWSEnZ 37zPpEZDxhZhUNPObPSsfkXFnkRBn0IlMJ6zZXIrlhMKZzv7vz2k6wFgt7sdbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767291007; 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=ac468rCKROToLFrN035K4FMVadeR1yBVsi96H3O6RtI=; b=oI7BAly0hsBEP1JFcayfaJoitR6uRAGLEoSiH8k/WXQjOTXx/TZgV0UGGBfMYYUOMWXrDE VkRKXF1VrzS6gSUkVPAfIDsC6LbGh0DVnjw61xVH+0mjMq65ZPjVIr/ONu2SvGWbcYdhcc kVAr+xnw9IJDYVWQ/6zQexNl3CE3pkKDuINEvGuvLniAAJB+YBaITzg+cyqo50n3XYwPfr fTK3U0F2wIpT7aLh+0Yh0Md8nyP+3z09EM5mFz35OKKbyGE7jqVf7FIh13ALrGN5bWI4RC K32NiMWbFcCErnbnFDyPbDf5zjApXo6h6tMP5ayjN0F8eDaEs+tl/APNAA0HSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767291007; a=rsa-sha256; cv=none; b=WLdMoevMdStOnrV6VpayWQ/dflLf2npAeWFodHwzZOA7dpSkKei4ce1P6q2R25B/1sTAYR Y+YaubVA9seprIcPv76jKNd310CNjZBGwBq6Bs+KS1ZrOUiOuKX0IJWRW7QqdOAlttF1xA GB4Jg04OiBfvR8+rfCStuylKcZe6T2ekzf4LPUUAuVMbrGdE8Xw7OwoqY5HlOCOiXNRwK9 LfPNZEXUwc/rAY3bk3AKk9AsXt/3i5G5dwsuZB6Pckv5sVGGu0Vvi48pcQJFqUMojbJnVw S1Q/ee4R3u0Va2edlUwP89n9QtMulv3eAjtbdhtEE0/pjcMBsj+Bs2cbpm2fPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvxT0ZRbzkGy for ; Thu, 01 Jan 2026 18:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34b62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:10:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: b2b49011988f - stable/15 - libpathconv: Document library in the man pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b2b49011988fe6ea6033fcbcab76d833f10ad762 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:10:05 +0000 Message-Id: <6956b87d.34b62.6eee31b@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b49011988fe6ea6033fcbcab76d833f10ad762 commit b2b49011988fe6ea6033fcbcab76d833f10ad762 Author: Artem Bunichev AuthorDate: 2025-12-16 17:42:46 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:09:48 +0000 libpathconv: Document library in the man pages Reviewed by: ziaee, imp Differential Revision: https://reviews.freebsd.org/D54213 (cherry picked from commit 2c75ac14d7e9d1d57d70bbf26716868607f0d1fe) --- lib/libpathconv/abs2rel.3 | 3 ++- lib/libpathconv/rel2abs.3 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libpathconv/abs2rel.3 b/lib/libpathconv/abs2rel.3 index 9240ef1662e2..d8e39ef3b8b9 100644 --- a/lib/libpathconv/abs2rel.3 +++ b/lib/libpathconv/abs2rel.3 @@ -23,13 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 7, 2022 +.Dd December 13, 2025 .Dt ABS2REL 3 .Os .Sh NAME .Nm abs2rel .Nd make a relative path name from an absolute path name .Sh SYNOPSIS +.Lb libpathconv .Ft "char *" .Fn abs2rel "const char *path" "const char *base" "char *result" "size_t size" .Sh DESCRIPTION diff --git a/lib/libpathconv/rel2abs.3 b/lib/libpathconv/rel2abs.3 index 1f607fd739e1..3d8f544fc3b3 100644 --- a/lib/libpathconv/rel2abs.3 +++ b/lib/libpathconv/rel2abs.3 @@ -23,13 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 7, 2022 +.Dd December 13, 2025 .Dt REL2ABS 3 .Os .Sh NAME .Nm rel2abs .Nd make an absolute path name from a relative path name .Sh SYNOPSIS +.Lb libpathconv .Ft "char *" .Fn rel2abs "const char *path" "const char *base" "char *result" "size_t size" .Sh DESCRIPTION From nobody Thu Jan 1 18:25: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 4dhwHX4BgDz6MX9C for ; Thu, 01 Jan 2026 18:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhwHX1Cxnz3hr4 for ; Thu, 01 Jan 2026 18:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767291944; 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=0sqDp22yVedztJ27n1g71vFGRbo7O7IFnO0bkiVc2L8=; b=D5Unhbg8PSpApP6Zwv5bX6dtyhWh8IqtEOHfRDmQehAkWgYvszWsOEA09dEoZO0WKIc/Yq 37fvQlV6VFVuimO71cVPbrK1nAnIJSRGevFh0vkkK+CeXmq2MSbIPMJjDXkaKVhjhA13uB mO8a5lPxNgbL89exUiGZxJdeaSM5uYjgmOCfrlCv3QBtD1xW0tPO8MhfvWwpT2wWC93m4h c79WGJ8PYOs5alWRjHJOkM2NpxKzXatPA9XsqNyznUq+eL0rzo9cv3P6Nu/UJ/D87y0ybT 5Sb2TNuq6c3YsZzNSoh8OhiMhVo+KhRtFpNsZGjfVeeOEU6i8fA48Li8Wq/s3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767291944; 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=0sqDp22yVedztJ27n1g71vFGRbo7O7IFnO0bkiVc2L8=; b=QQjxtEWKLdhcYJEbP3EcTOAu+g67MljpdbQfVKLtKIc2BeRzIOH1/FsqkWOpRtNBycz4WI pjuoNAzYu2/9cT3ExWwKkOfJJdgY/XUORKbTH4cV93+BHnt2b3Wc3qOrbG4RjEWCzuwufX I1EBmKu7hK7m66noQgZk1xo+fFpv0ZGQsPBp1Nlst9Swzfo6xE5is5sr+g19yAWPylsvKV JKkiC2PVNqOXiCAwJzrYiJTjNFHs/jzfleenfNbS5lviqsierNfEfsa7/GZJKY/t6VuDcO RoGIzJvOBiIE+lQ11kkdNhgjKdegGlvOpC7HlU7RZEZm217TqZNfiYnyYfJGgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767291944; a=rsa-sha256; cv=none; b=WUjdU4gJWPPKA8hy33dlCwKQKPB8kqty/Qgw30/Qr0rPm3QiBUH/xEL1mZCB9Pq8AlncJJ AQWOvjhS+6F+WLCqc7WupWXHdogNnE5zd3r/EOiI1C68ppg9tnO+jYaFIFKMWPHBIjY0PN vavn7x4Yde0VaMN8IUHcCLVwD9qH9XBGjE1Eu9JmdVrI5ZlQHDXPvt4wfTZYShHYITjK8h lroCF6lINOORRwONmy+S67gW1rcV2AcIzYw/5d5i2vR0W5Uca6CgOJVPXZioDMriYz81Wc wlLJCs19Eh2la6VzPe/B3JHckhjskw3o1/eG8KbOHuR+NpOx8l4TycansO1r9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhwHW74mWzkkL for ; Thu, 01 Jan 2026 18:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38066 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:25:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Alexander Ziaee Subject: git: c0512bb6d8eb - stable/15 - vt.4: Remove Xr to nonexistent vidcontrol(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c0512bb6d8eb30f933da7fef9dd9811e7ca21aaf Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:25:43 +0000 Message-Id: <6956bc27.38066.2c117895@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c0512bb6d8eb30f933da7fef9dd9811e7ca21aaf commit c0512bb6d8eb30f933da7fef9dd9811e7ca21aaf Author: Ed Maste AuthorDate: 2025-12-28 00:52:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:25:22 +0000 vt.4: Remove Xr to nonexistent vidcontrol(8) PR: 291985 Fixes: a8740ba860bf ("vt.4: Document increasing scrollback size") (cherry picked from commit f22cffe43343d9d48c731952d94976c5deb9659e) --- share/man/man4/vt.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 6176c8c3093e..d59030cfff9d 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -420,7 +420,6 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , -.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Thu Jan 1 18:40: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 4dhwd3631nz6MYRs for ; Thu, 01 Jan 2026 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhwd35Wsbz3kQT for ; Thu, 01 Jan 2026 18:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292855; 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=wjCr9ALqIJykl7l0FF17XLxXELXyAm+OxZT34tjvUbw=; b=wuTfnlpD/bv8hlB+T3bFoLxX5zPc7elP5txnJy+RgPnmU75EOG5O6u6yyXRhlbLh3T+WIv OMromaW1FpWx+hQLmqmI472Kw/oFyCzIG0KxdpugsqisAEwEgtzYdoaBACBJOthjwUnwhk hIYPWBBSHG+9jFOD5RpmCWm+yeclLnTPOXUSeYH9a3rrjaYfJ6k6mLYLGBHbespI2plHPj 0LQ8muRAFS+t/C8DH4+iAMjm3Xxxf946UZ1yh+qn7V7dLtzF46D7Oc/qLNHOgbjyf6RAwM l0rBc7IgX5tjD8ZSrgGWXR092AfHwZov2NOFYpDkx2c5yGA4hOys5pBm2EUfQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292855; 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=wjCr9ALqIJykl7l0FF17XLxXELXyAm+OxZT34tjvUbw=; b=vzEWmAHkesk7OptSpN/sEPhE4il3B0rxb1o3uUueeN7qNRinTEHxUa1khQDJ0vOAzCrv9k JEpouLUN8A77zvVPUBgJovysBSMT/co0svUNjW8J5j38qiooxCZOZjC0gAgGiXgTCNRi75 I0G0vpSZ87j94k3aCyGxeIqePGEtmTKGO6ou93f+ijpKGrxSNf6cqes9Nkehi4LqIgmh4R EC+ZZdEq9itDPwmcmx/2a6ljMDlJLibkrT3mAiZH+YbPNQwd9lr7iWoCqat7nnP6P7TLm4 anNVfZKUcFxIxyI+UOW0TmLC2r0jOxuMmnuK/iJcSYOHIjPdnvZM51fz8kInWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767292855; a=rsa-sha256; cv=none; b=rmlS58P0H1RhRBIhpSkaY8wyt58q2x6DqgQnisS68t2nx6C7qcHNE/iKFOqacyVHMtU/Yu 8XjygW6Ysou23PkktH52nfiRXz4bXs71pswHSQhEOk9AIb+5nUCYidp1Tldlx2wSpLXB7Y 6jmZi3jMY2PocVpaYjGh4n3cgakQmbQLQZRr11jpV25feVT/uhftIgDcXz64gChwyDhWSy 4XrJ55RoEZunKXUQTnUO/GcpuE8veQmt5CGTj2+t22M3WkPYmdhGVrkkFRg2fThdQ1bhgZ guT70t1oy4ULJE/b7SZotClsi4KC9xoSZJ7Y1dLTd3FbI5B2CpFyPIsRE5eAPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhwd34dNmzjmK for ; Thu, 01 Jan 2026 18:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39129 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:40:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Alexander Ziaee Subject: git: c330c43e58d7 - stable/14 - vt.4: explain console fonts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c330c43e58d74726a9014d3cc380bd59bbcef256 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:40:55 +0000 Message-Id: <6956bfb7.39129.18372933@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c330c43e58d74726a9014d3cc380bd59bbcef256 commit c330c43e58d74726a9014d3cc380bd59bbcef256 Author: Alexander Ziaee AuthorDate: 2024-01-15 19:54:20 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:34:47 +0000 vt.4: explain console fonts Add explaination about console fonts, how to convert them, which subset of things support them and how to use them. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1063 (cherry picked from commit 7bd6cbbf69c7a9b952ebed096625a4a4a6b7bbfd) --- share/man/man4/vt.4 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index bd583abf8a98..9d61a5972f35 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -50,6 +50,7 @@ In .Cd kern.vt.color..rgb="" .Cd kern.vt.fb.default_mode="x" .Cd kern.vt.fb.modes.="x" +.Cd screen.font="x" .Pp In .Xr loader.conf 5 or @@ -266,6 +267,11 @@ It will contain a list of connectors and their associated tunables. This is currently only supported by the .Cm vt_fb backend when it is paired with a KMS video driver. +.It Va screen.font +Set this value to the base name of the desired font file located in +.Pa /boot/fonts . +Fonts can be converted for use with +.Xr vtfontcvt 8 . .El .Sh KEYBOARD SYSCTL TUNABLES These settings control whether certain special key combinations are enabled or @@ -369,6 +375,14 @@ To set black and white colors of console palette .Pp .Dl kern.vt.color.0.rgb="10,10,10" .Dl kern.vt.color.15.rgb="#f0f0f0" +.Pp +Load the 8x16 font in +.Xr loader.conf 5 +from +.Pa /boot/fonts/*.fnt[.gz] +at boot: +.Pp +.Dl screen.font="8x16" .Sh SEE ALSO .Xr kbdcontrol 1 , .Xr login 1 , @@ -382,6 +396,7 @@ To set black and white colors of console palette .Xr syscons 4 , .Xr ukbd 4 , .Xr kbdmap 5 , +.Xr loader.conf 5 , .Xr rc.conf 5 , .Xr ttys 5 , .Xr config 8 , From nobody Thu Jan 1 18:40: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 4dhwd46S8nz6MYRt for ; Thu, 01 Jan 2026 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhwd45JcFz3kLP for ; Thu, 01 Jan 2026 18:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hIdBPsQIU8IGuSw/j3zWolgUrnIls8LWDyraB8iSD9w=; b=qjtDPXMASQO14euPqfPD4CGsx4FZoPNpr9c4sRWnuCVPRu63twBbHffnSxL6HVffhJMhwz kLAUWJrO+OKQcwXiC18Qo+hVUepnLiukAnYpLz+JQ6GrLfy/rSumIp+eLMKHT/i32OuaoB AFRUe4SIGzget26TNMmGhCcB87omONY22lLQcwOEsCJRNUX4TwJe2WTpaXBVgzDHZCBMs+ go60h4m48G7flfXcx8JDuRrgc3Di8CVAKf30dHhuEuRxfG2c16cDN2hakRHh09rLlwXDcH gojitDgZE/QwOeobtjyi/ALq7nENO2rAsvctWutRGMM6pYzrR2EBVj58kRAUHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hIdBPsQIU8IGuSw/j3zWolgUrnIls8LWDyraB8iSD9w=; b=yqfeVOY4Bqb13j/95FUT89S+oGW4uK1ioUfNur9l/tZYHVQDqJ0lsKY0jfcTdb2fx8lpIG kF1q/yFniUmzoybiGWbyIsmRh+bBxM1FbVqMsK2/zaNYnFKhKvBiRE+eJzRbwfOZdz0kev NT3ZvpYPL7+iWHNweDMZrEb2wWfAFeN3AXChD8AnoVJRoBIWJBqaIuNvV1+Wl0fZq8cpYL gS1RbugXspjSwjkugfec/fv6uxtOjHKJ7ff3pxyexTHrA4w7M5PbxQHdggQG39/hgkN9VM V+cKxeQnaPp3mijkoIn+xtjNGJwKzK1xpbofTGEFSR8jMndPVJPcXt5jnFTivQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767292856; a=rsa-sha256; cv=none; b=NHK7+qVBvyAb6i1P1jxqMG3Vs9+0z/Cq26ntl6D7iRzn7mrr/ENym76aG6pO6qa/ClrJ9y aReQ/aePq5A68abwjCTUrFQdtYTVFakx0//MSURXYb5ZppyU5RMclNwdOBgjMCRDqhCSi2 fHd7LqYS/sCxrlImPgpkWXx7J8URB1/P5D/EbEBTbgfatLJp59bOQ8OH8CAvixqBCaDVGH No6JaZBPYyGd2g4Rp7YYOHhQOoXEnSF7gAc5Tq1coNZS621AuoROYzCY7CDox38HG6qGOl bT8XhssQZNrjNvw5DyKt8srUScY0SwfKjn9ZZiceTyXGWb86LELdmcDRpy6GUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhwd44sP1zl1S for ; Thu, 01 Jan 2026 18:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38933 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:40:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1b23b79beef2 - stable/14 - vt.4: Style pass List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b23b79beef230009f4df5c15f1571a134521810 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:40:56 +0000 Message-Id: <6956bfb8.38933.45fe14b3@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1b23b79beef230009f4df5c15f1571a134521810 commit 1b23b79beef230009f4df5c15f1571a134521810 Author: Alexander Ziaee AuthorDate: 2025-08-07 17:01:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:38:02 +0000 vt.4: Style pass Outstanding: I'm not sure kernel configuration declarations are defined variables. Dv does not allow arguments, but some why allowed paths, so non-path arguments were being incorrectly marked up as paths. MFC after: 3 days (with resolved conflicts) Reviewed by: 0mp, emaste Differential Revision: https://reviews.freebsd.org/D49565 (cherry picked from commit 7cd6da268a8fbf34b16564dd9a94c86853eb7c56) --- share/man/man4/vt.4 | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 9d61a5972f35..4d8a138f293c 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -1,4 +1,4 @@ -.\"- +.\" .\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2014 Warren Block @@ -26,31 +26,31 @@ .\" SUCH DAMAGE. .\" .Dd July 7, 2024 -.Dt "VT" 4 +.Dt VT 4 .Os .Sh NAME .Nm vt .Nd virtual terminal system video console driver .Sh SYNOPSIS -.Cd "options TERMINAL_KERN_ATTR=_attribute_" -.Cd "options TERMINAL_NORM_ATTR=_attribute_" -.Cd "options VT_MAXWINDOWS=N" +.Cd "options TERMINAL_KERN_ATTR=" +.Cd "options TERMINAL_NORM_ATTR=" +.Cd "options VT_MAXWINDOWS=" .Cd "options VT_ALT_TO_ESC_HACK=1" .Cd "options VT_TWOBUTTON_MOUSE" -.Cd "options VT_FB_MAX_WIDTH=X" -.Cd "options VT_FB_MAX_HEIGHT=Y" +.Cd "options VT_FB_MAX_WIDTH=" +.Cd "options VT_FB_MAX_HEIGHT=" .Cd "options SC_NO_CUTPASTE" .Cd "device vt" .Pp In .Xr loader.conf 5 : -.Cd hw.vga.textmode=1 -.Cd hw.vga.acpi_ignore_no_vga=1 -.Cd kern.vty=vt -.Cd kern.vt.color..rgb="" -.Cd kern.vt.fb.default_mode="x" -.Cd kern.vt.fb.modes.="x" -.Cd screen.font="x" +.Cd "hw.vga.textmode=1" +.Cd "hw.vga.acpi_ignore_no_vga=1" +.Cd "kern.vty=vt" +.Cd "kern.vt.color..rgb=" +.Cd "kern.vt.fb.default_mode=x" +.Cd "kern.vt.fb.modes.=x" +.Cd "screen.font=x" .Pp In .Xr loader.conf 5 or @@ -129,8 +129,8 @@ These kernel options control the .Nm driver. .Bl -tag -width MAXCONS -.It Dv TERMINAL_NORM_ATTR= Ns Pa attribute -.It Dv TERMINAL_KERN_ATTR= Ns Pa attribute +.It Dv TERMINAL_NORM_ATTR= +.It Dv TERMINAL_KERN_ATTR= These options change the default colors used for normal and kernel text. Available colors are defined in @@ -138,7 +138,7 @@ Available colors are defined in See .Sx EXAMPLES below. -.It Dv VT_MAXWINDOWS=N +.It Dv VT_MAXWINDOWS= Set the number of virtual terminals to be created to .Fa N . The value defaults to 12. @@ -151,10 +151,10 @@ In effect, this makes the right-hand mouse button perform a paste. These options are checked in the order shown. .It Dv SC_NO_CUTPASTE Disable mouse support. -.It VT_FB_MAX_WIDTH=X +.It VT_FB_MAX_WIDTH= Set the maximum width to .Fa X . -.It VT_FB_MAX_HEIGHT=Y +.It VT_FB_MAX_HEIGHT= Set the maximum height to .Fa Y . .El @@ -165,7 +165,7 @@ console device, These options will be removed in a future .Fx version. -.Bl -column -offset indent ".Sy vt VT_TWOBUTTON_MOUSE" ".Sy SC_TWOBUTTON_MOUSE" +.Bl -column -offset indent "TERMINAL_KERN_ATTR" "SC_KERNEL_CONS_ATTR" .It Sy vt Option Name Ta Sy sc Option Name .It Dv TERMINAL_KERN_ATTR Ta Dv SC_KERNEL_CONS_ATTR .It Dv TERMINAL_NORM_ATTR Ta Dv SC_NORM_ATTR @@ -229,7 +229,7 @@ Note that is not compatible with .Xr UEFI 8 boot. -.It Va kern.vt.color. Ns Ar colornum Ns Va .rgb +.It Va kern.vt.color. Ns Ar colornum Ns . Ns Va rgb Set this value to override default palette entry for color .Pa colornum which should be in a range from 0 to 15 inclusive. @@ -244,15 +244,15 @@ Note: The .Nm VGA hardware driver does not support palette configuration. .It Va kern.vt.fb.default_mode -Set this value to a graphic mode to override the default mode picked by the +Set this value to a graphic mode to override the default picked by the .Nm backend. The mode is applied to all output connectors. This is currently only supported by the .Cm vt_fb backend when it is paired with a KMS video driver. -.It Va kern.vt.fb.modes. Ns Pa connector_name -Set this value to a graphic mode to override the default mode picked by the +.It Va kern.vt.fb.modes. +Set this value to a graphic mode to override the default picked by the .Nm backend. This mode is applied to the output connector From nobody Thu Jan 1 18:40: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 4dhwd64wnZz6MYS6 for ; Thu, 01 Jan 2026 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhwd62HBzz3k3t for ; Thu, 01 Jan 2026 18:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eTDnr3eUh/o3UJPXtIeCP3X3NS1cHCeWzfbbiGh/d1I=; b=jY/UQi21XwBhBUXc3Pn05FDOs0X1ldvdaTB5qOdrvbOLLunp4CNOHir10FHHOLKaPoTgGs //0TSv672XjKPHuy2PBuSzhyYTECdGOL6OXdzzFo60WMDBpNVp+iOPJvfHhVJVn+C/VEZa XSNjnMWMFgBkh/3779VyK7NwoRNraN+5erm3+d/2ap0xBwv6GHESC/PXSTyNMQqp1HjlBA tuayTbX5MWoiH9rkYbBAaZIcA10O7wKLBIg1GZRs4r6EN4jcGFuvvr0EmZN5UOsgYXQ8XJ vWeks+x/jFzuOnEpCbsLDlEzPWExAQf03GTughJBAEUNmb/Q3gdr1EEB5MhBnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eTDnr3eUh/o3UJPXtIeCP3X3NS1cHCeWzfbbiGh/d1I=; b=sz4IYA5MhfFQcaU1ASr+jVsL/6NN41ZvitWBp+z1UsXQurPYYk8GME5Aw9mI3i8I2EWgDj 8bzHHWDXEtRVA60flvGTu8ThbcGXej0QhNSMvRsU0PmFEFKoae8wDN3kdpYhm12AEFLjG1 p9OEd7g8YjQzHsaeDTPBe3sqk+ZfxCmlr+Xaqv/bO9zy//jOrA+W/bUXVEiU+TcWSWnL/B 86Z8VHS2zlGO45Ss1Sj2CvSkqzKLJqyDwhBDxuzZ8qIG5w1fU3u2BfWek/tGoF5mG3P/CO 6KdQPGLXzg0eHG0qNKjkIuJPIzpYk7vyKuW8TD3/wxzpQZkc59WfX2Wil+E1qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767292858; a=rsa-sha256; cv=none; b=tGRFAZva7d2Gbk9ClmwR3RsFMYczJZ8mW42irrTZMOlk5757o3GpsIzCAajjFfCARHQpNx uX27qqmfTG0xGIeKiZkOWkIbf/TV+HziOodcTg+l2/wqh32b87eD/VtbDBB4hdw/9ge9H5 nwXdV7q9SfhimSxEcMg5iRu/sKPzJi6r3HnOmmbvJ6Q0cqP1L0SWwGuu70WozjubQLjqZ0 w9+q49tuMoh5t/copGigKz3QUXudov8B1p4vBTxSZtoSQkeFeIgUfRF5T6W0TTEiw8B2NH JFqR1hteMt93jOKqNOte2koh0ERwUoLdYfebf8T/KUjmy+I1xCW3MGFmcs4cag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhwd55gf2zk1d for ; Thu, 01 Jan 2026 18:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:40:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: ce92b9d8332a - stable/14 - vt.4: Document increasing scrollback 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 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/14 X-Git-Reftype: branch X-Git-Commit: ce92b9d8332a436ec03d3457dffe247865ffc9c2 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:40:57 +0000 Message-Id: <6956bfb9.375cd.7e49701f@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=ce92b9d8332a436ec03d3457dffe247865ffc9c2 commit ce92b9d8332a436ec03d3457dffe247865ffc9c2 Author: Alexander Ziaee AuthorDate: 2025-11-21 17:40:56 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:39:29 +0000 vt.4: Document increasing scrollback size MFC: immediately as 2 llms say this is impossible Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D53860 (cherry picked from commit a8740ba860bfc35879f886b80b30327d0d3b16bd) --- share/man/man4/vt.4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 4d8a138f293c..33d0ce3246b4 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 7, 2024 +.Dd November 21, 2025 .Dt VT 4 .Os .Sh NAME @@ -341,6 +341,12 @@ Notification that the console bell has rung. .It Li hz Ta Tone that was requested in Hz. .El .Sh EXAMPLES +To increase the scrollback buffer size to 22500 lines, +add the following line to +.Pa /etc/rc.conf : +.Pp +.Dl allscreens_flags="-h 22500" +.Pp This example changes the default color of normal text to green on a black background, or black on a green background when reversed. Note that white space cannot be used inside the attribute string @@ -403,6 +409,7 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , +.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Thu Jan 1 18:40: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 4dhwd732Hgz6MYbX for ; Thu, 01 Jan 2026 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhwd70vhgz3kW8 for ; Thu, 01 Jan 2026 18:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292859; 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=Dcs6RPMeeW7xUDQDHepUAGCa1wXNMItifLq/yA1tWYg=; b=E0HeXIsG4kOIVXdtMSumE2t6eJjfum3O4TBip78kGmiuFl4OYftl5iHlfXb87+weRBQRXO yXZMG53ImOzPFa5hYBCRMxuVAODIUzvNYp1ajpqSYvuI7VHYfqXoHIfNG7WfAny7+rU+Cl yPqWWA6GNzUoZdLNVahghGg6QlLZlPAxcIVbwfB+mz9bzWag2VRYCyFs4HLffMYDx3BbOZ o1EVHD8nmlMxflvwb0tAZy71oi3Bnw3c5CMHdtfCq/Vj+4qhKOylLCDnWcRygr6+CcWw8E gs8re9uyWDx5R6FG4b+isiLbU3UzyqsosNkys5LOJt0id2yAZx29KzmiejDCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767292859; 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=Dcs6RPMeeW7xUDQDHepUAGCa1wXNMItifLq/yA1tWYg=; b=knhcmyuqriry8WS/p/Z6rAcYGsQUnQ1Fz6K35Vb7qFZDf7N+yNYqoBgGoJSaFAT1kFjofM rlcPwlLrWlMAgRHnHPTR9c8l9UlHQMpY6Vf3LYftiKWyDMygi/xGLLdK98r6tialXb3XNw 2r9hN6+ZbrqcElt7DNwz24Yy1Le9gF+JZQ2jpkcSX8g78Vj+3+ObJyB6rNDSSrqPiXo84+ 0YvC/OyVAXijBZdza6eoLWL3nujrQNCUmFRMkXc71SC8spqE1OLGCLRf3nSzwCEQIthe03 19YKCuJc56hUdyVUpLtShj9eFqC9+yATawL4qy27+u508TLf2PcIewip2cobbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767292859; a=rsa-sha256; cv=none; b=swvGUAMWGk0UP6AqN20EEPvnk+Xwmr8RlidnHxVGWMLb9pPtCATqwL4Bq9OnGIVCes0LCH U7QGU9xjNlA9uLJheMawEtdlFnaIgRbUOLWqhwjasY1wOYhCPktqQ/KAHS/BcGhKwqop14 bV6EsWeyqFuk7l0EqkzFna/ZYVvYrqKyhnWTgwC7KTtV5R9DsB7zfDnag9p+UPr6Y9Cn1m gM7TcdJFSdTv7JBkJnbH7wkshOgWpEePjrrvDlVnj2A0nIopg2Dr1Vys/bRh20GZMYjwS2 hO6xIRpSEMC9kL77g4XDAfIiT9wowsI9ty86ocE4dMhiWTFXGNyzlzvuziT2iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhwd668TlzkxV for ; Thu, 01 Jan 2026 18:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 374cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 18:40:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Alexander Ziaee Subject: git: 47db87fe8398 - stable/14 - vt.4: Remove Xr to nonexistent vidcontrol(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 47db87fe8398d975e6bd8634eb8104ad0c001743 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 18:40:58 +0000 Message-Id: <6956bfba.374cc.4e929e0d@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=47db87fe8398d975e6bd8634eb8104ad0c001743 commit 47db87fe8398d975e6bd8634eb8104ad0c001743 Author: Ed Maste AuthorDate: 2025-12-28 00:52:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 18:39:29 +0000 vt.4: Remove Xr to nonexistent vidcontrol(8) PR: 291985 Fixes: a8740ba860bf ("vt.4: Document increasing scrollback size") (cherry picked from commit f22cffe43343d9d48c731952d94976c5deb9659e) --- share/man/man4/vt.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 33d0ce3246b4..6a9814aec438 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -409,7 +409,6 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , -.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Thu Jan 1 19:08: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 4dhxFQ0GSfz6Mb8c for ; Thu, 01 Jan 2026 19:08: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhxFP5SxCz3nfq for ; Thu, 01 Jan 2026 19:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767294537; 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=WuK/84ZVuupYT1ZLlRKZfXi7JuwM7KfdltMzDRswfcY=; b=gilO0EV0zdSA3D8VJ7ruc6/GFlOuDKvOA7TLWIvlBbLm6DfRX6BYQlbkmPzl07f99ltQaf WKV/l8G9LkDiWxS/Hz690C5NM0oqfWxAc2S1Ux0XQjZ/+x+61I+QRXGQMRIX68uqV2/sww NnhZrBdaNigK+TDb78g3gaTCXy9bKaLqdE1foio9cqCjpaHlrS4foVyEN0RHVqoAOY2pz/ 02iyQfW8f1Lo8zrf0wBAQ6FHClM8r9eKvN+x9J2etJqoJ68xbnKhtxRN8wnroe0+lZRmXI IY16FTs7xnJXg/hdD9mp45ti82UJYOWKoHIuPLHV8yr+RD2yGZRxlsvSXx0psw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767294537; 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=WuK/84ZVuupYT1ZLlRKZfXi7JuwM7KfdltMzDRswfcY=; b=opAkkmU13ueZX4dY/qm9rzg6EySsQFAZWqvqbE8wqyG/GJSDyxKDMO5KEhUPmTZxUzhtBH LN25O3dtq9yc+hzcJ3Y717SiFxAtveN648vZh0MV1Gq18WUDuGP8NZ9Z8iGuZ480UWF0Mo ht+i9IL5/CdsPwtnN8bXZ9nwwMQxtPy2WnEFknrMg7cqCLqbX7huLFeXHoJbXXgH75yOYz Wj3Dl1G8YDb7EA6XMInsZwO0NBrEx3Dkl2t+8OCYeX98SJOtP93qwqGxT7zNR91m8MAqlv J2bP3n29oaamSyoghj9SAXDJGgWy9aNixQAzl8Q+3wp7w9ftRXTjcAd0zEuoXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767294537; a=rsa-sha256; cv=none; b=yoEc3B9kk1DJI/RyAZAsbSdp0jnVnjmy4syk+CZmMqdmAwsCwqZkaTOT9zU5iS/Qt/82zP NUtwkivXuz1/5Dcv1iXkJaZyN7+teEXWEW3gsWg3S4RO2HeSUpIKbNNdS18aLfUeDKX+RO OA5Tmk16T3+rRHQOjQ6i/hicDtYpw56GenUVrdylarkNHUS/jYqrEeTro/OTvhA9agCcOp k7ybdwrpY7SmQy8ZQpHDJQs/1QI/2oOXNwyUR2u3qpONLNh/yVF4lDFzNvaLGOrAaVhv+5 y7CMiA+I3d/WFFbdURKUIXjB1dgxNK+v7aGk/Pq1d0UEyoKrse0WMZj3pZLmDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhxFP50QkzlHQ for ; Thu, 01 Jan 2026 19:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b8dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 19:08:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: 7fa86256aaca - stable/14 - ioctl.2: Mention EACCES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fa86256aaca948671c38f462e9ef4692799d8fc Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 19:08:57 +0000 Message-Id: <6956c649.3b8dc.4fb39093@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7fa86256aaca948671c38f462e9ef4692799d8fc commit 7fa86256aaca948671c38f462e9ef4692799d8fc Author: Felix Johnson AuthorDate: 2025-12-29 19:21:26 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 19:04:30 +0000 ioctl.2: Mention EACCES ioctls can fail with EACCES, see sys/kern/tty.c PR: 239504 MFC after: 3 days Reviewed by: ziaee Reported by: Brennan Vincent Differential Revision: https://reviews.freebsd.org/D49072 (cherry picked from commit e2afbc45258f2fa4bdcf126e959ac660e76fc802) --- lib/libc/sys/ioctl.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2 index d5b09cf67eba..27c290019779 100644 --- a/lib/libc/sys/ioctl.2 +++ b/lib/libc/sys/ioctl.2 @@ -27,7 +27,7 @@ .\" .\" @(#)ioctl.2 8.2 (Berkeley) 12/11/93 .\" -.Dd September 11, 2013 +.Dd December 29, 2025 .Dt IOCTL 2 .Os .Sh NAME @@ -112,6 +112,9 @@ The system call will fail if: .Bl -tag -width Er +.It Bq Er EACCES +The process does not have permission to call this +.Nm . .It Bq Er EBADF The .Fa fd From nobody Thu Jan 1 19:08: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 4dhxFR1H3Dz6MbBs for ; Thu, 01 Jan 2026 19:08: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhxFQ6hpkz3njM for ; Thu, 01 Jan 2026 19:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767294539; 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=aXp1yf+4c5Gv9E38m+Ol77gSgTQlmcSUkSlx7Jp/jKY=; b=br94NZvwQuI/fQ7VE+TKPpCKef7WfTMqbnIV22oeCJ7pBH6dnrA71ntFvyQzKoMyCM646L +ipdFBDFQjbSOapQxfr57ge8G2cB1TtN0sYls1KcCDDIvjPASGPh0aVgAaJ/iZ9McadBBC eXkRXj6STzg7WGMD+eocIHQLRF8jWeQKbEDYGwHzmzFgEgPi5bgSOwd2HEkRwvUN5lysuS d+73wJR1kZ9LC3A6rlM5uq7wj4lUeo6/ATZxL4fOqOZJQZp3nriYBWjd2SD+lTbRWZYeer QiPz5mJ6AlKBkqjUnH6WMFakQ/Sc1r3tFzBS9uoH+bhPHMz+rY5VPMctyoLJPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767294539; 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=aXp1yf+4c5Gv9E38m+Ol77gSgTQlmcSUkSlx7Jp/jKY=; b=PMharUOKDQaueldxE1kPudUtBqdr5CLPygLB+TGwNaRBUpSr4Hb4sKmqHk5kdTQeyXNDgW X/kuLo/VgIrfHUZrL+nBIpanHu0ljKTj74Hma4y7qhhPMmjQvlTnP35dG/2vKetqL5PsbR hYScgsK2kZK/usLmEb6T8KkGyxtpoV9tsB7VmIwIIjrHXdH+Qewrf0AKmf2nqrfmELACTf qXOZozydWbOzRP4iBDGgb4+gxVIGeL5z42OGF1c1GAXEUSwZ+kuF+4w2cCSRTK5egYsHAO +XdX3iQdTlKnS1CqwtDd/qUmYag/yuORT2Oam1CrZWfZ2mOvRi/Xjn+Srsy0CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767294539; a=rsa-sha256; cv=none; b=pc0PrplYKsU/q7oVIXGrkvAdqvRlWPME7cAi/Iw20R6PZ+Dl9958zeCSwb8QK2ZuUcZKfl Acpd+wh1ncTC9iuOS1JExOpZLzVdlkYZ0Jj90m/ojXOCE4MBC5jcExgVFzCm+LMzL8V+Pe 10hj4z+NHilX2Rpg/QBPpTpSBOGuMHcIy8tuAQeqDT1kC207Lrmx3bIKtVFFzof7TGVtEG SkiPq7neQ9uhcIGFV3xOSbkOSJRfUTk1ayIHwQgp1O/wZrqtKyLbZ6eCuS14kr4n7/wu/V xXr9qdlLiaKaGNkYWCGyAf0WOh1majzTrrH25qwCmFiTxdDtqopc0W0eVwKllg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhxFQ5xrlzlHS for ; Thu, 01 Jan 2026 19:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 19:08:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yan-Hao Wang From: Alexander Ziaee Subject: git: 063714951ad0 - stable/14 - kyua manuals: Correct --results-file short form List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 063714951ad0e8407f39095f36de6be62a5fe07b Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 19:08:58 +0000 Message-Id: <6956c64a.3a2bf.5db21fd@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=063714951ad0e8407f39095f36de6be62a5fe07b commit 063714951ad0e8407f39095f36de6be62a5fe07b Author: Yan-Hao Wang AuthorDate: 2025-12-29 20:13:16 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 19:05:28 +0000 kyua manuals: Correct --results-file short form PR: 290647 Ref: kyua/cli/common.cpp#104 MFC after: 3 days Reviewed by: ziaee Closes: https://github.com/freebsd/kyua/issues/267 (cherry picked from commit bbaa7d628175ee484e31a054fb3cf7b7866cad13) --- contrib/kyua/doc/kyua-db-exec.1.in | 2 +- contrib/kyua/doc/kyua-db-migrate.1.in | 2 +- contrib/kyua/doc/kyua-report-html.1.in | 2 +- contrib/kyua/doc/kyua-report-junit.1.in | 2 +- contrib/kyua/doc/kyua-report.1.in | 2 +- contrib/kyua/doc/kyua-test.1.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/kyua/doc/kyua-db-exec.1.in b/contrib/kyua/doc/kyua-db-exec.1.in index 04f34c7b54e7..2e3bada4f849 100644 --- a/contrib/kyua/doc/kyua-db-exec.1.in +++ b/contrib/kyua/doc/kyua-db-exec.1.in @@ -62,7 +62,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -no-headers Avoids printing the headers of the table in the output of the command. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-db-migrate.1.in b/contrib/kyua/doc/kyua-db-migrate.1.in index 67e46de46fec..4a1852aafd36 100644 --- a/contrib/kyua/doc/kyua-db-migrate.1.in +++ b/contrib/kyua/doc/kyua-db-migrate.1.in @@ -47,7 +47,7 @@ database lives. .Pp The following subcommand options are recognized: .Bl -tag -width XX -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-report-html.1.in b/contrib/kyua/doc/kyua-report-html.1.in index 1f9f55b69a3f..3ff044ca8d30 100644 --- a/contrib/kyua/doc/kyua-report-html.1.in +++ b/contrib/kyua/doc/kyua-report-html.1.in @@ -64,7 +64,7 @@ The directory must not exist unless the option is provided. The default is .Pa ./html . -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-report-junit.1.in b/contrib/kyua/doc/kyua-report-junit.1.in index f1ad3a2e7f29..508ea30a3f6e 100644 --- a/contrib/kyua/doc/kyua-report-junit.1.in +++ b/contrib/kyua/doc/kyua-report-junit.1.in @@ -50,7 +50,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -output Ar directory Specifies the file into which to store the JUnit report. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Caveats diff --git a/contrib/kyua/doc/kyua-report.1.in b/contrib/kyua/doc/kyua-report.1.in index 8e2485f9c4ac..a3e4d75456cf 100644 --- a/contrib/kyua/doc/kyua-report.1.in +++ b/contrib/kyua/doc/kyua-report.1.in @@ -70,7 +70,7 @@ and .Pa /dev/stderr can be used to specify the standard output and the standard error, respectively. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-test.1.in b/contrib/kyua/doc/kyua-test.1.in index 8cd5f34ae6af..07db6cf461c2 100644 --- a/contrib/kyua/doc/kyua-test.1.in +++ b/contrib/kyua/doc/kyua-test.1.in @@ -69,7 +69,7 @@ Specifies the Kyuafile to process. Defaults to a .Pa Kyuafile file in the current directory. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-write.mdoc .El .Pp From nobody Thu Jan 1 19:08: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 4dhxFS2mvDz6MZpM for ; Thu, 01 Jan 2026 19:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhxFS085Cz3nbn for ; Thu, 01 Jan 2026 19:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767294540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91UkpkGbkcmigxLwYmlXqOVCfyoT2Z94aHqmGu/M+wg=; b=bHnzBgeFjizrKXbxpm6nwo11B34fd+dqbmDCBM9551se7EZ+51u0A6ossacgscBNj5pbHh 9NQtIUaPZqbC95F0SF5wCWi0UB7fzAyrYuU+gsTXlRWb6/ZPqApXIQchofwJfIL/+D8WMx w+XxATUBq+RIkT3iAgo2AjtuSs+4LLoknMOwCCaIcgCIGYhhfTOfvUOptXKypAftp8kxGY q10VURpz06bWCJBSzbLznQ8DZgIdDjZ05owDg/1syA65tE2eG1Zxy5KW9Osts+R2BiX/o3 hcfwt8bIT7rU+HLSLkHDvsKsVoPJ9DNJwD1zLd4Vm1Ov4Gdo/Nf7s2U7Ov8xKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767294540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91UkpkGbkcmigxLwYmlXqOVCfyoT2Z94aHqmGu/M+wg=; b=Czq9ZHmtmXZVkLKTzDQuH86tLKsgDAIWaxvl1vI6/3/p3eTuFP92Txy4kRxCmUpgd0ZbwN Hua5CCPAEqQKfDKbwJv0CuQsR96+dC0p3ursULdghydHKJMcDjN4gISFuuH9DlnN19ediC I8DgJQcwJMAvWviwKihBQflOTMkjAjJem2NqVqY5rsm4jvdvxGwlgLP35Y9vKzxCWzVYT2 AVLyJ9Ms/zfaqG9+HAm8A8nJXqjJ3tltuAj+Nt5dEVl41RxBnErgVUJRA7fVvAgXLMzhIG vhXBh9l+Hq+aLKcu22o018TZLXmiic84Pgo6R4sh9HprO/tQ8FwvAVgPtDlHuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767294540; a=rsa-sha256; cv=none; b=u5kR0sEXgS+vYdflyXw0PTNbRJVMrV2SyUEElDqAGtlVWMjd01C7BoGqYy1JC862C+3jxq l1wZzU0M95/lPMfL3cdZFdda7M/QCzrWJMG62CFuuWfMiccPB9CMd7WyF8ElHab0eQ8mu8 t1AYfr7pAEYUhe/mGnDhlSzK4I+SCwwk90U9Urf7y9H9xBVaD1RUbD/F8ffRKyMd5HQpjH 5OqQv8OfiP2IPs9poR4/7RImxcL86ekbUeJm6l9vlPBhxdTnNi9D2j5bseWfUcHIAYo7Da vMIQ60QT7sCeUdu94zPFXo21Rbvv8pWXosuB8JvmjlXFaVK8mheqHlz1fsyz4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhxFR6gxpzlHT for ; Thu, 01 Jan 2026 19:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a49d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 19:08:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 74c8530c214c - stable/14 - camcontrol.8: Descriptions before examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 74c8530c214cbc6eb01af00f12aa1d204c65ab26 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 19:08:59 +0000 Message-Id: <6956c64b.3a49d.499d123c@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=74c8530c214cbc6eb01af00f12aa1d204c65ab26 commit 74c8530c214cbc6eb01af00f12aa1d204c65ab26 Author: Alexander Ziaee AuthorDate: 2025-12-23 13:36:49 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 19:05:58 +0000 camcontrol.8: Descriptions before examples This page has a lot of examples, so having them in the previous order can be confusing. Rewrite to the normal order where the descriptions come before the command, followed by a colon, which is still clear even jumping to the middle of the section. PR: 291759 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54285 (cherry picked from commit fbc321b9cdceecd3c97742868da5d500423cf484) --- sbin/camcontrol/camcontrol.8 | 349 ++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 201 deletions(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index bdda1828abf5..4963615fe6f6 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2684,303 +2684,250 @@ is the transport layer device. are the CAM application passthrough devices. .El .Sh EXAMPLES -.Dl camcontrol eject -n cd -u 1 -v -.Pp Eject the CD from cd1, and print SCSI sense information if the command -fails. +fails: .Pp -.Dl camcontrol tur da0 +.Dl camcontrol eject -n cd -u 1 -v .Pp Send the SCSI test unit ready command to da0. The .Nm -utility will report whether the disk is ready, but will not display sense -information if the command fails since the +utility will report whether the disk is ready, +but will not display sense information if the command fails since the .Fl v -switch was not specified. -.Bd -literal -offset indent -camcontrol tur da1 -E -C 4 -t 50 -Q head -v -.Ed +switch was not specified: +.Pp +.Dl camcontrol tur da0 .Pp Send a test unit ready command to da1. Enable kernel error recovery. Specify a retry count of 4, and a timeout of 50 seconds. -Enable sense -printing (with the -.Fl v -flag) if the command fails. -Since error recovery is turned on, the -disk will be spun up if it is not currently spinning. -The -.Tn SCSI -task attribute for the command will be set to Head of Queue. +Enable sense printing +.Pq with the Fl v flag +if the command fails. +Since error recovery is turned on, +the disk will be spun up if it is not currently spinning. +The SCSI task attribute for the command will be set to Head of Queue. The .Nm -utility will report whether the disk is ready. -.Bd -literal -offset indent -camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e - -i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1" -.Ed +utility will report whether the disk is ready: +.Pp +.Dl camcontrol tur da1 -E -C 4 -t 50 -Q head -v .Pp Issue a READ BUFFER command (0x3C) to cd1. Display the buffer size of cd1, and display the first 10 bytes from the cache on cd1. -Display SCSI sense -information if the command fails. +Display SCSI sense information if the command fails: .Bd -literal -offset indent -camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e - -o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8 +camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e + -i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1" .Ed .Pp Issue a WRITE BUFFER (0x3B) command to cd1. Write out 10 bytes of data, not including the (reserved) 4 byte header. -Print out sense information if -the command fails. -Be very careful with this command, improper use may -cause data corruption. +Print out sense information if the command fails. +Be very careful with this command, +improper use may cause data corruption: .Bd -literal -offset indent -camcontrol modepage da3 -m 1 -e -P 3 +camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e + -o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8 .Ed .Pp -Edit mode page 1 (the Read-Write Error Recover page) for da3, and save the -settings on the drive. +Edit mode page 1 (the Read-Write Error Recover page) for da3, +and save the settings on the drive. Mode page 1 contains a disk drive's auto read and -write reallocation settings, among other things. +write reallocation settings, among other things: +.Bd -literal -offset indent +camcontrol modepage da3 -m 1 -e -P 3 +.Ed +.Pp +Rescan all SCSI buses in the system for devices that have been added, +removed or changed: .Pp .Dl camcontrol rescan all .Pp -Rescan all SCSI buses in the system for devices that have been added, -removed or changed. +Rescan SCSI bus 0 for devices that have been added, removed or changed: .Pp .Dl camcontrol rescan 0 .Pp -Rescan SCSI bus 0 for devices that have been added, removed or changed. +Rescan SCSI bus 0, target 1, lun 0 to see if it has been added, removed, +or changed: .Pp .Dl camcontrol rescan 0:1:0 .Pp -Rescan SCSI bus 0, target 1, lun 0 to see if it has been added, removed, or -changed. +Set the number of concurrent transactions for da5 to 24: .Pp .Dl camcontrol tags da5 -N 24 .Pp -Set the number of concurrent transactions for da5 to 24. -.Bd -literal -offset indent -camcontrol negotiate -n da -u 4 -T disable -.Ed +Disable tagged queueing for da4: .Pp -Disable tagged queueing for da4. -.Bd -literal -offset indent -camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a -.Ed +.Dl camcontrol negotiate -n da -u 4 -T disable .Pp Negotiate a sync rate of 20MHz and an offset of 15 with da3. -Then send a -Test Unit Ready command to make the settings take effect. -.Bd -literal -offset indent -camcontrol smpcmd ses0 -v -r 4 "40 0 00 0" -R 1020 "s9 i1" -.Ed +Then send a Test Unit Ready command to make the settings take effect: .Pp -Send the SMP REPORT GENERAL command to ses0, and display the number of PHYs -it contains. -Display SMP errors if the command fails. -.Bd -literal -offset indent -camcontrol security ada0 -.Ed +.Dl camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a .Pp -Report security support and settings for ada0 -.Bd -literal -offset indent -camcontrol security ada0 -U user -s MyPass -.Ed +Send the SMP REPORT GENERAL command to ses0, +and display the number of PHYs it contains, +displaying SMP errors if the command fails: .Pp -Enable security on device ada0 with the password MyPass -.Bd -literal -offset indent -camcontrol security ada0 -U user -e MyPass -.Ed +.Dl camcontrol smpcmd ses0 -v -r 4 "40 0 00 0" -R 1020 "s9 i1" .Pp -Secure erase ada0 which has had security enabled with user password MyPass +Report security support and settings for ada0: .Pp -.Em WARNING! WARNING! WARNING! +.Dl camcontrol security ada0 +.Pp +Enable security on device ada0 with the password MyPass: +.Pp +.Dl camcontrol security ada0 -U user -s MyPass +.Pp +Secure erase the security enabled ada0 with user password MyPass. .Pp -This will +.Em WARNING ! WARNING ! WARNING ! +.Pp +The following command will .Em ERASE ALL data from the device, so backup your data before using! .Pp -This command can be used against an SSD drive to restoring it to -factory default write performance. -.Bd -literal -offset indent -camcontrol hpa ada0 -.Ed +This will restore a solid state drive +.Pq SSD +to factory default write performance: .Pp -Report HPA support and settings for ada0 (also reported via -identify). -.Bd -literal -offset indent -camcontrol hpa ada0 -s 10240 -.Ed +.Dl camcontrol security ada0 -U user -e MyPass .Pp -Enables HPA on ada0 setting the maximum reported sectors to 10240. +Report HPA support and settings for ada0 (also reported via identify): .Pp -.Em WARNING! WARNING! WARNING! +.Dl camcontrol hpa ada0 +.Pp +Enable HPA on ada0 setting the maximum reported sectors to 10240. +.Pp +.Em WARNING ! WARNING ! WARNING ! .Pp -This will +The following command will .Em PREVENT ACCESS -to all data on the device beyond this limit until HPA is disabled by setting -HPA to native max sectors of the device, which can only be done after a -power-on or hardware reset! +to all data on the device beyond this limit until HPA is disabled +by setting HPA to native max sectors of the device, +which can only be done after a power-on or hardware reset! .Pp .Em DO NOT -use this on a device which has an active filesystem! -.Bd -literal -offset indent -camcontrol persist da0 -v -i read_keys -.Ed +use this on a device which has an active filesystem: .Pp -This will read any persistent reservation keys registered with da0, and -display any errors encountered when sending the PERSISTENT RESERVE IN -.Tn SCSI -command. -.Bd -literal -offset indent -camcontrol persist da0 -v -o register -a -K 0x12345678 -.Ed +.Dl camcontrol hpa ada0 -s 10240 .Pp -This will register the persistent reservation key 0x12345678 with da0, -apply that registration to all ports on da0, and display any errors that -occur when sending the PERSISTENT RESERVE OUT command. -.Bd -literal -offset indent -camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac -.Ed +This will read any persistent reservation keys registered with da0, +and display any errors encountered when sending the +PERSISTENT RESERVE IN SCSI command: .Pp -This will reserve da0 for the exlusive use of the initiator issuing the -command. +.Dl camcontrol persist da0 -v -i read_keys +.Pp +Register the persistent reservation key 0x12345678 with da0, +apply that registration to all ports on da0, +and display any errors that +occur when sending the PERSISTENT RESERVE OUT command: +.Pp +.Dl camcontrol persist da0 -v -o register -a -K 0x12345678 +.Pp +Reserve da0 for the exclusive use of the initiator issuing the command. The scope of the reservation is the entire LUN. -Any errors sending the PERSISTENT RESERVE OUT command will be displayed. -.Bd -literal -offset indent -camcontrol persist da0 -v -i read_full -.Ed +Any errors sending the PERSISTENT RESERVE OUT command will be displayed: .Pp -This will display the full status of all reservations on da0 and print out -status if there are any errors. -.Bd -literal -offset indent -camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac -.Ed +.Dl camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac +.Pp +Display the full status of all reservations on da0 +and print out status if there are any errors: +.Pp +.Dl camcontrol persist da0 -v -i read_full .Pp This will release a reservation on da0 of the type ex_ac -(Exclusive Access). +.Pq Exclusive Access . The Reservation Key for this registration is 0x12345678. -Any errors that occur will be displayed. +Any errors that occur will be displayed: +.Pp +.Dl camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac +.Pp +Register the key 0x12345678 with da0, +specifying that it applies to the SAS initiators +with SAS addresses 0x1234567812345678 and 0x8765432187654321: .Bd -literal -offset indent camcontrol persist da0 -v -o register -K 0x12345678 -S \e -I sas,0x1234567812345678 -I sas,0x8765432187654321 .Ed .Pp -This will register the key 0x12345678 with da0, specifying that it applies -to the SAS initiators with SAS addresses 0x1234567812345678 and -0x8765432187654321. -.Bd -literal -offset indent -camcontrol persist da0 -v -o register_move -k 0x87654321 \e - -K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678 -.Ed -.Pp -This will move the registration from the current initiator, whose -Registration Key is 0x87654321, to the Fibre Channel initiator with the +Move the registration from the current initiator, +whose Registration Key is 0x87654321, +to the Fibre Channel initiator with the Fiber Channel World Wide Node Name 0x1234567812345678. A new registration key, 0x12345678, will be registered for the initiator -with the Fibre Channel World Wide Node Name 0x1234567812345678, and the -current initiator will be unregistered from the target. +with the Fibre Channel World Wide Node Name 0x1234567812345678, +and the current initiator will be unregistered from the target. The reservation will be moved to relative target port 2 on the target device. -The registration will persist across power losses. +The registration will persist across power losses: .Bd -literal -offset indent -camcontrol attrib sa0 -v -i attr_values -p 1 +camcontrol persist da0 -v -o register_move -k 0x87654321 \e + -K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678 .Ed .Pp -This will read and decode the attribute values from partition 1 on the tape -in tape drive sa0, and will display any -.Tn SCSI -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rz -P summary -.Ed +Read and decode the attribute values from partition 1 on the tape +in tape drive sa0, and will display any SCSI errors that result: .Pp -This will request the SMR zone list from disk da0, and print out a -summary of the zone parameters, and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rz -o reset -.Ed +.Dl camcontrol attrib sa0 -v -i attr_values -p 1 .Pp -This will request the list of SMR zones that should have their write -pointer reset from the disk da0, and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rwp -l 0x2c80000 -.Ed +Request the SMR zone list from disk da0, and print out a summary +of the zone parameters, and display any SCSI or ATA errors that result: .Pp -This will issue the Reset Write Pointer command to disk da0 for the zone -that starts at LBA 0x2c80000 and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s -.Ed +.Dl camcontrol zone da0 -v -c rz -P summary .Pp -Set the timer for the Idle_a power condition on drive -.Pa ada0 -to 60.1 seconds, enable that particular power condition, and save the timer -value and the enabled state of the power condition. -.Bd -literal -offset indent -camcontrol epc da4 -c goto -p Standby_z -H -.Ed +Request the list of SMR zones that should have their write pointer reset +from the disk da0, and display any SCSI or ATA errors that result: +.Pp +.Dl camcontrol zone da0 -v -c rz -o reset +.Pp +Issue the Reset Write Pointer command to disk da0 for the zone that +starts at LBA 0x2c80000 and display any SCSI or ATA errors that result: +.Pp +.Dl camcontrol zone da0 -v -c rwp -l 0x2c80000 +.Pp +Set the timer for the Idle_a power condition on drive ada0 to +60.1 seconds, enable that particular power condition, +and save the timer value and the enabled state of the power condition: +.Pp +.Dl camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s .Pp -Tell drive -.Pa da4 -to go to the Standby_z power state (which is -the drive's lowest power state) and hold in that state until it is -explicitly released by another +Tell drive da4 to go to the Standby_z power state +.Pq the drive's lowest power state +and hold in that state until it is explicitly released by another .Cm goto -command. -.Bd -literal -offset indent -camcontrol epc da2 -c status -P -.Ed +command: +.Pp +.Dl camcontrol epc da4 -c goto -p Standby_z -H .Pp -Report only the power state of -drive -.Pa da2 . +Report only the power state of drive da2. Some drives will power up in response to the commands sent by the .Pa status subcommand, and the .Fl P option causes .Nm -to only send the -.Tn ATA -CHECK POWER MODE command, which should not trigger a change in the drive's -power state. -.Bd -literal -offset indent -camcontrol epc ada0 -c list -.Ed +to only send the ATA CHECK POWER MODE command, +which should not trigger a change in the drive's power state: +.Pp +.Dl camcontrol epc da2 -c status -P .Pp -Display the ATA Power Conditions log (Log Address 0x08) for -drive -.Pa ada0 . +Display the ATA Power Conditions log (Log Address 0x08) for drive ada0: +.Pp +.Dl camcontrol epc ada0 -c list +.Pp +Set the timestamp of drive sa0 using a +.Xr strptime 3 +format string followed by a time string +that was created using this format string: .Bd -literal -offset indent camcontrol timestamp sa0 -s -f "%a, %d %b %Y %T %z" \e -T "Wed, 26 Oct 2016 21:43:57 -0600" .Ed -.Pp -Set the timestamp of drive -.Pa sa0 -using a -.Xr strptime 3 -format string followed by a time string -that was created using this format string. .Sh SEE ALSO .Xr cam 3 , .Xr cam_cdbparse 3 , From nobody Thu Jan 1 22:21: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 4dj1WY2wcQz6MnmV for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1WY1g35z49cM for ; Thu, 01 Jan 2026 22:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f/CrFmKugh2tuoLGwJ5I5DXn0hPOxUbd+j0NWzBzdpw=; b=LBq3zRsa4X8afWVeDDFv9hJgk42qpwhHpbtXLV/B2OOkm+q9Ya1lz8g1Klp4RbWrEOopGY yjWU5P4X51C3OAjoVYGmG64yhz9l1g4+0Sd2mDUAxJNQgFQPxJ9kMwiQV3uNrNno6TDNQV dU2i4emNlgisWqE/b8c/bW8CAQGg3zI+r1E9h4TXQETOEyI18WxW58G4XeZ8HQgCeTS4P8 aA8BYGfh2AlI8xo/kahhNqYs2Vk5095gv2/Yi2vPju2VGJSBwN2mupatcoMnKuxhZTmXSN HLe4x9lG4hbCvx263JBo0OU90thL0uK+HHRsJ+9no/UHafcQW6My9nUXOYRg2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f/CrFmKugh2tuoLGwJ5I5DXn0hPOxUbd+j0NWzBzdpw=; b=pmzALpGqGTj7KG6xksn1BiOnoKxUcQcl4EpxNebpD6QELRy8Ka3ORZAGC7iiGSOcv35EC1 Xp1RVgxajUaYHSi1eFTeiNwbT8WVQoiQ9ubG+T0ApV8q4/sDBLm90MtytfDUSw1uPNqhtK m3aTSrh6NQhw/kqRhE/2DWY22+iBAEbNgB6090RKeQ1WB4LO3WhaUB0wtRUtz/QDx2Y5cu uC9pRDvrmeHHvy4UdE/09sWHOuFlgY1UPzWmXfiIApNYBbdO9mBrQhmcbbs++iPRfO4Wib MNn/OoUEWo6LwsWzOH+D8gIShq8QEYl79zqvWbXAJTqJUxTwbv0Ht80wXrAK5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306089; a=rsa-sha256; cv=none; b=ciBdEt1wmrDDRyfYr4ejicIVKpfz6O3qgsV8hjipA/izvcvVtz0ZXC7Ix2U77Kat8dYjxk GQgkdsXCtS4uleCOS6vuPQ6PBf5pp+5u//RWIo4uqYKAurJBLVsaLEpk2chnGynlUPMNwI F3aA0gpMoqGS3iO9n4UFJdJKU/EKr2brptP6oPchtdMrBxObj1+RIuBteGMujl7MZzaUmw ojbk5/lZOkmlXMhQRRRvyKbhzXjJFa6BZL1B1cXGhQVpHmgz4752K+asjUP2eMYvPQrCRz TLq7Q5ZqniReEiJMjaW/1dZoW07B4NUvAke3LbmHARw52sDqc4GCfAcdUkXDBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1WY1C9XzrLJ for ; Thu, 01 Jan 2026 22:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e155 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: e53890c477f5 - stable/15 - contrib/mandoc: add -ieee754-2008 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e53890c477f53f12da721c48334a0330d07345c3 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:29 +0000 Message-Id: <6956f369.e155.470182a0@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e53890c477f53f12da721c48334a0330d07345c3 commit e53890c477f53f12da721c48334a0330d07345c3 Author: Robert Clausecker AuthorDate: 2025-11-17 17:18:40 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:47:32 +0000 contrib/mandoc: add -ieee754-2008 This is needed to simplify the msun manpages {sin,cos,tan}pi.3 Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53784 (cherry picked from commit db3884b03989b095d746087afab8e5e649c3699a) --- contrib/mandoc/st.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mandoc/st.c b/contrib/mandoc/st.c index 276981584e41..d740ee619f17 100644 --- a/contrib/mandoc/st.c +++ b/contrib/mandoc/st.c @@ -65,6 +65,7 @@ LINE("-iso9945-2-93", "ISO/IEC 9945-2:1993 (\\(lqPOSIX.2\\(rq)") LINE("-ansiC", "ANSI X3.159-1989 (\\(lqANSI\\~C89\\(rq)") LINE("-ansiC-89", "ANSI X3.159-1989 (\\(lqANSI\\~C89\\(rq)") LINE("-ieee754", "IEEE Std 754-1985") +LINE("-ieee754-2008", "IEEE Std 754-2008") LINE("-iso8802-3", "ISO 8802-3: 1989") LINE("-iso8601", "ISO 8601") LINE("-ieee1275-94", "IEEE Std 1275-1994 (\\(lqOpen Firmware\\(rq)") From nobody Thu Jan 1 22:21: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 4dj1WZ3rYxz6MnyF for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1WZ2YqFz49TV for ; Thu, 01 Jan 2026 22:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQc7UD57iHj++7eXO29nc2NswUpCanFD5Rrfi7KJ9Tw=; b=H9F89b3RGt6PLH9xpzIhhD2p5elHi3jgTcwurmDaSLf3IatdoEjx83/YiMFHGHjz0ePBnC oC5d5D/V1/QJn+/wUBfL/UjG3deTIqaHnw1cnq10OPkWC/c9XS64C2cQFNr18gdV/VZBtA 5DJnCt8rpZJ+WOLISkQsVU8k4+wsWHh+0CG7Cn5067BK5+za3mPkHKKgH68FrlOMryLeJx Dx99HVhJYnw2lR8tg1k0Jhclxm0usEU57wp38uKJLRL+HmnfQQNPDArUz2IN3lYoMpDuD9 mSRcLoHP0nuKKER9lddLV2gx8unpCoM4VlC7q2hYD+a74wYHL28zJc6idhRxkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQc7UD57iHj++7eXO29nc2NswUpCanFD5Rrfi7KJ9Tw=; b=deOJTR67kkZGvwt1kZsPfNSIo0XG8l4vRcCJzYbNEGeG2CW9Xng36Jk+yHCoX4cvIsNLZp jLSVgiz6rHMbToQguSO9Sia1mfhV7B6ohDHh9Ay/W9/1y9Mo4KevdRX0dQ8DnoWK8yohk7 KFt4FO8y1rAfmJU/TCyGiJ610sPhy9tJ5/MDw96w+lZ7dm02wj3dgaPQGbMg8lESe+7o4F 8jEugglvUzvVxtlAN7AhK/G+tkWIpIomq4IS/4vhiiiXA5fbVXVhSA+XVQCjn6d+vgPHQZ XhHGguabzU9u2iRThs7BQeVpMHDI8Ab2g+GYFHNCV+UyZbOHcE2u7wSCL6FDXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306090; a=rsa-sha256; cv=none; b=uQm4JKSA2w2/z8PxO4mMf1BFP7d8p3Kzm1JMrlWDzoRwNvW0x4KpAlse3TrsgT6ONAkT+/ Kx+f9ZRSmba43k4PveJ5vQxCzdWr23vZ++StRnJhemmTs9HQmw2TL3e2EHZkHpOnvOO6SJ N5T27jyniNd4sGEswStV00oOz+F9zM2JZ/wwMTp+5En1dFWjXj1lmaIUMt5H0oJAdKNY26 2bGzXGWIvTVzg4KGwXbdWI05havHgN0hlQNiXlXSad0A4dgHW4qCCcs590iqPjz2Azitaa MNZ862bQUweNnqlrXQuWepcjBF32v8ONPGl016jJG5KGcQN9s8MIxYaVQYIgyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1WZ21hNzrKG for ; Thu, 01 Jan 2026 22:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eede by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 141cec051d14 - stable/15 - contrib/mandoc: document .St -ieee754-2008 in mdoc(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 141cec051d142f329bd32e43d2e492aa6719d8f9 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:30 +0000 Message-Id: <6956f36a.eede.74109402@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=141cec051d142f329bd32e43d2e492aa6719d8f9 commit 141cec051d142f329bd32e43d2e492aa6719d8f9 Author: Robert Clausecker AuthorDate: 2025-11-17 15:39:11 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:47:33 +0000 contrib/mandoc: document .St -ieee754-2008 in mdoc(7) Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53784 (cherry picked from commit 63cd0841de76b215f5d5078fab097b515b42cc93) --- contrib/mandoc/mdoc.7 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/mandoc/mdoc.7 b/contrib/mandoc/mdoc.7 index 6c2d3568baa6..90f5600c59a7 100644 --- a/contrib/mandoc/mdoc.7 +++ b/contrib/mandoc/mdoc.7 @@ -2606,6 +2606,11 @@ Open Group Standard Base Specifications, Issue 8. .br Floating-point arithmetic. .Pp +.It \-ieee754-2008 +.St -ieee754-2008 +.br +Floating-point arithmetic, 2008 revision. +.Pp .It \-iso8601 .St -iso8601 .br From nobody Thu Jan 1 22:21: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 4dj1Wb5w1jz6Mnkg for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wb3BmQz49TZ for ; Thu, 01 Jan 2026 22:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtjJjYGu8AxTA4flPXMgt14qogxVpRK+SId30trQBzQ=; b=Ffkgz3GulV6tLuvczuiwxyGgqtxaYRe80lMq2uCmguAXCL4ceQypEMT4gArrtMNeSS+Ssu Cu24+VO7TOX9LQ2dhJMVNffKDl7aupbTt7wng0GOdzDFVtdfITHlEGI2lsupMuLPPT/GHk d3UyOlmh661Wd3Y+xWcd4aX2KmqrRC/5TsQlngkAUHyBCu72C3YAaI6/o5QxB3F9QhwOUs VDSJprcJMsL2SYFjk3GidKNLIFA8qIggcfiW56qE06IGlvyS61KseJrtXtrplHAwO1HPSv 56fQlRakymlLIt/y6K5VtQqeGCqAXkBig5pdmGSHT9ZprvDMvcyO73b2uTWCWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtjJjYGu8AxTA4flPXMgt14qogxVpRK+SId30trQBzQ=; b=yqGX8HHW40jhS4qqUECguQYZCBBLZF7Lf/cQGa2y6tXA1IqERveskUbfJ+cwfbE85RabN6 c1hLt8EibD/kMiuNmZa/cRgzJFl9vzw9jusz3RvhlNSQLrOi7yCTxykL0bx1O+bH58dZLn JtShlNI2vc2fl5w45XfveeL7LUkamuOTr6wGYAT71bdnHlQz8bNky3airHWrnimnqOG0YS ZIK0LiHwBjsrK710SWtWzoOeqcCKcJLit5F3lEk2wU3LfVZojrjouipiWJX1eMu47knC8K fpxT3iCe+TokJTbBrYM002LS0ChCTax7xLV+igVJ/4aZAbAy1Nh//TPrZXHs3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306091; a=rsa-sha256; cv=none; b=jJdsC+okgifDruIuv1DpOaS31W4pHcu4D45DcmhWRpAthFGC6V8dHYO0sEhBVHbyiebGWI l+kWSRRef0NT4TzHsAIOQXWVPUb+IaxoKhO9VgigozMK+QojIso0VX5iQANOcMO3VWNWQ0 CFC5v5UU5/tqQZC0gGyewUpLm/wSd5zWl/AgtX9o4iZQTl7sW3MzgG1HObRZVVUVwcIfEU 6e9Grp71JEUpQWY+334IIb9BK3y3HXkk7Ib4enBW3ORsq/M6GkU0KyhczomuzG9iizmOMN g3zUbFz3Cg22gTzNYHz91LGxHe9CTPuaTL7j2N2DYiLlzpbG8vC7ffQ8dlFeUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wb2pGSzrX7 for ; Thu, 01 Jan 2026 22:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eee2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 104488641aca - stable/15 - msun: expose the C23 functions we already support 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 104488641acaf2269d860d8abf142d80a340a5e8 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:31 +0000 Message-Id: <6956f36b.eee2.475c443b@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=104488641acaf2269d860d8abf142d80a340a5e8 commit 104488641acaf2269d860d8abf142d80a340a5e8 Author: Robert Clausecker AuthorDate: 2025-11-17 17:09:11 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:47:33 +0000 msun: expose the C23 functions we already support in This is the *pi family of trigonometric functions. Quite a few C23 functions are still missing. These seem to be: acospi, acospif, acospil, asinpi, asinpif, asinpil, atan2pi, atan2pif, atan2pil, atanpi, atanpif, atanpil, canonicalize, canonicalizef, canonicalizel, compoundn, compoundnf, compoundnl, daddl, ddivl, dfmal, dmull, dsqrtl, dsubl, exp10, exp10f, exp10l, exp10m1, exp10m1f, exp10m1l, exp2m1, exp2m1f, exp2m1l, fadd, faddl, fdiv, fdivl, ffma, ffmal, fmaximum, fmaximum_mag, fmaximum_mag_num, fmaximum_mag_numf, fmaximum_mag_numl, fmaximum_magf, fmaximum_magl, fmaximum_num, fmaximum_numf, fmaximum_numl, fmaximumf, fmaximuml, fminimum, fminimum_mag, fminimum_mag_num, fminimum_mag_numf, fminimum_mag_numl, fminimum_magf, fminimum_magl, fminimum_num, fminimum_numf, fminimum_numl, fminimumf, fminimuml, fmul, fmull, fromfp, fromfpf, fromfpl, fromfpx, fromfpxf, fromfpxl, fsqrt, fsqrtl, fsub, fsubl, iscanonical, iseqsig, issignaling, issubnormal, iszero, nextdown, nextdownf, nextdownl, nextup, nextupf, nextupl, pown, pownf, pownl, powr, powrf, powrl, rootf, rootl, rootn, roundeven, roundevenf, roundevenl, rsqrt, rsqrtf, rsqrtl, ufromfp, ufromfpf, ufromfpl, ufromfpx, ufromfpxf, ufromfpxl. Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D53783 (cherry picked from commit 37fa5b36abb15b322493aba20146709d48359507) --- lib/msun/src/math.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index aecc652ea08a..25bd64e36a63 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -508,6 +508,9 @@ long double lgammal_r(long double, int *); void sincos(double, double *, double *); void sincosf(float, float *, float *); void sincosl(long double, long double *, long double *); +#endif /* __BSD_VISIBLE */ + +#if __ISO_C_VISIBLE >= 2023 double cospi(double); float cospif(float); long double cospil(long double); @@ -517,7 +520,7 @@ long double sinpil(long double); double tanpi(double); float tanpif(float); long double tanpil(long double); -#endif +#endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS From nobody Thu Jan 1 22:21: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 4dj1Wd4sqQz6Mngk for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wd00SPz49nG for ; Thu, 01 Jan 2026 22:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xBXZEmdvhn2GuYYVNwwu56CLfRWgPwNlcsKJo5vnLhg=; b=Kk8uWQnp6JyuWVghTi+HWp6F3n61m+MkdQvR3NzXiWYIiGLBbNqOqD2rEZE9gfOIGwSu4l VzNba1oOZHVvQlej+Hv/kBkztAmmBOgr2bYR2pzhsTzKO1R+uIFPE9AbzLqvkl8+5KInpp 2Ffab99rDnGkUdyM5mZY66B3NAkDmRfQnd0+VqOlG7DjqE0/n5jWru3gsYwJqPYNJiqd+Q V3gY2hfc2cVsxtWl/eYOEHj0GF/+mnj2vh9Yu4vm5goDp97LG9kEQrSkEl4ybvSVLBMagE 5diNpKKShii9M/jbn+765wQsSUU/nk22o0MptlYTHALQt/366nMEo6JDtsb3BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xBXZEmdvhn2GuYYVNwwu56CLfRWgPwNlcsKJo5vnLhg=; b=bSRmlMLgwsVJP1Gsu84rKJCY5NLouwWaVoWeNJMdgjfphETbSIyuI3qf+U5gjUhnDLbTya a4va4HGjjg3qQtEheWb9xQ1/UNTHMSxmBA61yV1cUs6sK9rGSCIhtB0A95OpF9/FOJWani neFZ/dvscpVa6xxSpneZcflkL/ar3KnMr1VKMxBPMCaoTSFG3/Rl3N0hDcl/TDPRxfxz3R 2XEqc2lwxE/CXlWNQjhryti62DUCyt8Xnm9l+n83KU07dV66rhM2iqIEBAWKNYFApu0skS 9yVmowUkkI59K9/59cbtaoN6p8U412Ozcyt+rBZ25BO8FGsDAj19296u5Vsp9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306093; a=rsa-sha256; cv=none; b=J8yNOsVUi9jhLweVEzvNLsfAukjjqAPkEd4LpDP/pzjDtx0ZfU7J06+eoDPqB5nQx7CzCK 297a5WF4eQGS0OQ/BF0yTsEgPUDwRaAvn/Jicds7uyLLJEK36tD5u+zqwX8v7WxMPMIdEG x0snt3Wk3snKkoagu9Vg7Ahf0WkVeKaj/Dznd9o0Z6+3NL8O0GpnVJPG8XuW1U/i7P0fhx Evc7X9hyoD952hUYOSdDlh9wLu+gG9pR5j10oKCfXUctcjx5lqp2NvwxDPU+o8h8aQK+9l +uhgE3AY6/FwaL29EflE/pISs7wZEZ/NuIRq0bXHuEKjQ75Bp4EJoFn9UsU7Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wc38wvzrKJ for ; Thu, 01 Jan 2026 22:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c87b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 6fc280810ead - stable/15 - msun: document that {sin,cos,tan}pi(3) follow 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6fc280810ead5f562b54c590a7e00d21c52b2449 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:32 +0000 Message-Id: <6956f36c.c87b.11a1cede@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=6fc280810ead5f562b54c590a7e00d21c52b2449 commit 6fc280810ead5f562b54c590a7e00d21c52b2449 Author: Robert Clausecker AuthorDate: 2025-11-17 17:10:56 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:47:33 +0000 msun: document that {sin,cos,tan}pi(3) follow C23 - also use new .St -ieee754-2008 request in *pi.3 Reviewed by: imp Approved by markj (mentor) See also: D53784 Differential Revision: https://reviews.freebsd.org/D53783 (cherry picked from commit 4fcc58afbff924293c721f4c4056bb7f94580f22) --- lib/msun/man/cospi.3 | 13 +++++-------- lib/msun/man/sinpi.3 | 12 +++++------- lib/msun/man/tanpi.3 | 13 +++++-------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/lib/msun/man/cospi.3 b/lib/msun/man/cospi.3 index 86e63fb77498..92b449832112 100644 --- a/lib/msun/man/cospi.3 +++ b/lib/msun/man/cospi.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 1, 2017 +.Dd November 16, 2025 .Dt COSPI 3 .Os .Sh NAME @@ -92,12 +92,9 @@ The half\(encycle trignometric functions were written by .An Steven G. Kargl Aq Mt kargl@FreeBSD.org . .Sh STANDARDS These functions conform to -IEEE Std 754\(tm\(en2008 , -\(dqIEEE Standard for Floating-Point Arithmetic\(dq -and to -ISO/IEC TS 18661-4 , +.St -ieee754-2008 , +to ISO/IEC TS 18661-4, \(dqInformation technology \(em Programming languages, their environments, and system software interfaces \(em Floating\(enpoint extensions for -C\(dq \(em Part 4: Supplementary functions. - - +C\(dq \(em Part 4: Supplementary functions, and to +.St -isoC-2023 . diff --git a/lib/msun/man/sinpi.3 b/lib/msun/man/sinpi.3 index 63a1e3010de5..9d64e9d343a7 100644 --- a/lib/msun/man/sinpi.3 +++ b/lib/msun/man/sinpi.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 1, 2017 +.Dd November 16, 2025 .Dt SINPI 3 .Os .Sh NAME @@ -86,11 +86,9 @@ The half\(encycle trignometric functions were written by .An Steven G. Kargl Aq Mt kargl@FreeBSD.org . .Sh STANDARDS These functions conform to -IEEE Std 754\(tm\(en2008 , -\(dqIEEE Standard for Floating-Point Arithmetic\(dq -and to -ISO/IEC TS 18661-4 , +.St -ieee754-2008 , +to ISO/IEC TS 18661-4, \(dqInformation technology \(em Programming languages, their environments, and system software interfaces \(em Floating\(enpoint extensions for -C\(dq \(em Part 4: Supplementary functions. - +C\(dq \(em Part 4: Supplementary functions, and to +.St -isoC-2023 . diff --git a/lib/msun/man/tanpi.3 b/lib/msun/man/tanpi.3 index b11d54031b71..183240418e76 100644 --- a/lib/msun/man/tanpi.3 +++ b/lib/msun/man/tanpi.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 1, 2017 +.Dd November 16, 2025 .Dt TANPI 3 .Os .Sh NAME @@ -88,12 +88,9 @@ The half\(encycle trignometric functions were written by .An Steven G. Kargl Aq Mt kargl@FreeBSD.org . .Sh STANDARDS These functions conform to -IEEE Std 754\(tm\(en2008 , -\(dqIEEE Standard for Floating-Point Arithmetic\(dq -and to -ISO/IEC TS 18661-4 , +.St -ieee754-2008 , +to ISO/IEC TS 18661-4, \(dqInformation technology \(em Programming languages, their environments, and system software interfaces \(em Floating\(enpoint extensions for -C\(dq \(em Part 4: Supplementary functions. - - +C\(dq \(em Part 4: Supplementary functions, and to +.St -isoC-2023 . From nobody Thu Jan 1 22:21: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 4dj1Wd6PF6z6Mnpx for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wd4DKJz49X9 for ; Thu, 01 Jan 2026 22:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s8zpxX5d7DB+eiO9hqGM8kPh4bsxeoE35nca4tQ9fec=; b=dYeoLz4kytA9A6qgIbK2b+OGdedNL1xyNVRf4UEbuTkoYYolFgovtrkre4I5XXlxb6377q p4nbTe4K80O3VjiuV34ZLPiaAGXLmpf+g/NXm8xv7dEjQHNGeO5lwiXtBJFi8JcJtF9h6f bJ99jqV7xHiLRyd3yuplNZJm+/UNFtlpdnsg+qtwVjNcay9fP1PfvnQZZe1Izwbe4kIrkr KGv3TAIhFTlNySiWxSumgjoIpL9eEeUv3PHLhiC2f7a1yV5SyCZrD73QO5Z6xBaslDP/Z1 A+MycNrTwFzjWa9OmpbSMimKUoDml/Rz8/o/+wJsfR93Quz/xQzQk4sB/0PJZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s8zpxX5d7DB+eiO9hqGM8kPh4bsxeoE35nca4tQ9fec=; b=UFH4v+urJj7HpFdCt7DJczYpnRkBLQZbBcgAQE65ciKMQdevepFgJuPFp6ODkjNeA9Pnmb 36kc+i9KU4AWRw6uAneDSJ2UADXW91JfYm89Q2DFRjNagLA8C0qss1cezmKLl56kSJZszf qCA7un6yjRKBvE1B4OGhJ6tQw0HBMGPwS9YSMdYdRR+qOZBHn4i6+ZLqYtmefCq7V+gzLn tsQYmVnLMl0pf2NGt73HG+Vmu3teykhEKP3N19yFRsrbqUDVt7cHedcaRdctpIZHFIeGjf YC/vvoSBwDGYHmagh8P8zqvrD8rdej3d1DFL/SHYMycuLm0/gScohW6ITdFf1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306093; a=rsa-sha256; cv=none; b=kuy99MR0MAjldWg2Div1OR7khJY8tVYxfl8IKVItNHCEwNbXdWKGUCoLw2X+V1nXolVzAG a1VmzJ8jOKD4FXLY5lIGnUYchAoa6j9MhqtbKxnK/LW6gyzOvrqH0n98h/Tn7aHgE9CfiU Pndjiqba44Q3wz/2c0dPAI4ZNYCu8JOQVQ2DFqDxbBMJT5cwAyr4acBoF02gMHvvZsb2/I dN783KGoGBzNGItsE/2ICe8Nqi3ohW47p7MJXAzbp4M/FV0cBp48TOXpv9oK6pQYp4GYer aI9OzSclnseCdYj+uhUeR9SJDCq/JwQVaIMGPpf7SPxrF3GPlZKE5oBCx/y5Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wd3phTzrpR for ; Thu, 01 Jan 2026 22:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e159 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 35787967e876 - stable/15 - time.h: add timegm() to the C23 namespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 35787967e87679511c906fbcb7dbccb31fd1ef33 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:33 +0000 Message-Id: <6956f36d.e159.58e5e93@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=35787967e87679511c906fbcb7dbccb31fd1ef33 commit 35787967e87679511c906fbcb7dbccb31fd1ef33 Author: Robert Clausecker AuthorDate: 2025-11-27 17:36:18 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:47:33 +0000 time.h: add timegm() to the C23 namespace This function is part of ISO/IEC 9899:2024 (C23) and was forgotten in D47856. Reviewed by: imp Approved by: markj (mentor) See also: D47856 Fixes: 59677aecb67bbedcfa2ee5d7d2b189193cdc4af7 MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53951 (cherry picked from commit 5da388c633f8da8fbb35b8407ca848373e3ea977) --- include/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 9e71a85f6a9a..295df3b5790a 100644 --- a/include/time.h +++ b/include/time.h @@ -170,7 +170,6 @@ extern int daylight; #if __BSD_VISIBLE time_t timelocal(struct tm * const); -time_t timegm(struct tm * const); int timer_oshandle_np(timer_t timerid); time_t time2posix(time_t t); time_t posix2time(time_t t); @@ -193,6 +192,7 @@ int timespec_get(struct timespec *ts, int base); #define TIME_MONOTONIC 2 /* monotonic time */ /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ int timespec_getres(struct timespec *, int); +time_t timegm(struct tm * const); #endif #endif From nobody Thu Jan 1 22:21: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 4dj1Wg0DYMz6MnwL for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wf5G9Mz49nZ for ; Thu, 01 Jan 2026 22:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZQmsGMAGWmBN8RVNwsw5hvMVA2KzzlYSXsMR4cutmo=; b=ahb3MC47fzNbTyt7tkpyUYrdSclWCZ9tE3rw/juY9Boyb9LaNnKhd2RS5mug5lrA3dMi06 QyQfbxaU+qGFfNNmWqNnCeyQA9k99q8Wojf/J6J+0Qy/lkINindsMVolweTn8+FOjQ2FNx blOiD/jhYLg/RJdt6XNuPh0LtvdmIkGiFXzwRQ4tsUEedV2RahotRmotwSYQPybORLagll WyfX9mjQ1p9jSSe7oJdgngZ0ViR+hqb8NQemr5lfImrzLHWxBXNy6SI1Wp5Y0kcnvtQJ29 gc06m7I2D5yr6ezffHFBiD0dHv+P+9DlBp2hoWmjecNyLHgFb9/fcBygZPnY2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZQmsGMAGWmBN8RVNwsw5hvMVA2KzzlYSXsMR4cutmo=; b=iwqYIoTYLIWIzhDnQYPCZh7zS32oI2bGfF2GaO3LVn21kfXbti4/rDI5APqxk4vvvM3XD1 2BLWILhzLSIbyLsaQ8iGa3uU09XqcPTDS0ODwl4zg7YGucEdHH2x6Qi+Ukxh/7Nk5uSe+I 12LREGcMcQtyeA2sTmglaCoOvk2mxtziB83wo+Mm92xQKh+5pAIZWJU2YH+5K50TjkiPIE jmWdy+juYUn0JqGAtSogradN/CnIH32iCmHOmqBe8wMx77ScGEBBy8lKukeCtET9Qp/nG9 Z3AhLOwcXYzsR9IIi/5NkrvWHxIJpUw4mqw1hr5u9mLqhWphT/yzj7YKIVqspA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306094; a=rsa-sha256; cv=none; b=I665Mj2U9vjkwlWjdHe0tngTWteGpKEpc/UkbeIxjd/gXtlfFzOEg8BAuK+oXKNlXaXRZw t5QqZNOYy2peIX3HS1ZMnCCsGdPI/M8YVL7Qn9PJ+aWVeATpY4aMNjA4BQx+KE0DNFwU0J YSrBMeHvsrqJnVCNSbmUOjxR6RhxSU7FAdNn26fd+67r+xDYEwQa1umTUG30oc31GZEpQR 5c/gf97tt+AvShLCtZrsse/VCTErYCh3LoY/iNaqxF3DWb7LxoG3A18nqFK0OzVyTOtWeV t6vke0b76ZhJPVxVi7OGlB3yyqZTenL3DbpA1dj/rXwjPbVedyU3uyFqPxb4ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wf4PJxzrm0 for ; Thu, 01 Jan 2026 22:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ed27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 72609bb2bb25 - stable/15 - uchar.h: add char8_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72609bb2bb25710871157792715213ef71a51521 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:34 +0000 Message-Id: <6956f36e.ed27.12b7fa07@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=72609bb2bb25710871157792715213ef71a51521 commit 72609bb2bb25710871157792715213ef71a51521 Author: Robert Clausecker AuthorDate: 2025-11-27 17:57:02 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:47:33 +0000 uchar.h: add char8_t A type similar to char16 and char32_t, for compliance with C23. The related type atomic_char8_t is added to stdatomic.h. As char8_t is always unsigned char, I've skipped adding __char8_t. This can be added, too, if desired. Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53952 (cherry picked from commit f0e541118c374869a8226eaa1320bb6eda248a20) --- include/uchar.h | 5 +++++ sys/sys/stdatomic.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/include/uchar.h b/include/uchar.h index 951c6339abec..ebb2c89776b8 100644 --- a/include/uchar.h +++ b/include/uchar.h @@ -32,6 +32,11 @@ #include #include +#if __ISO_C_VISIBLE >= 2023 && !defined(_CHAR8_T_DECLARED) +typedef unsigned char char8_t; +#define _CHAR8_T_DECLARED +#endif + #ifndef _CHAR16_T_DECLARED typedef __char16_t char16_t; #define _CHAR16_T_DECLARED diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h index 099097ea84a4..67107f47e6b3 100644 --- a/sys/sys/stdatomic.h +++ b/sys/sys/stdatomic.h @@ -54,6 +54,9 @@ #ifdef __GCC_ATOMIC_CHAR_LOCK_FREE #define ATOMIC_CHAR_LOCK_FREE __GCC_ATOMIC_CHAR_LOCK_FREE #endif +#if __ISO_C_VISIBLE >= 2023 && defined(__GCC_ATOMIC_CHAR8_T_LOCK_FREE) +#define ATOMIC_CHAR8_T_LOCK_FREE __GCC_ATOMIC_CHAR8_T_LOCK_FREE +#endif #ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE #define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE #endif @@ -199,6 +202,9 @@ typedef _Atomic(long) atomic_long; typedef _Atomic(unsigned long) atomic_ulong; typedef _Atomic(long long) atomic_llong; typedef _Atomic(unsigned long long) atomic_ullong; +#if __ISO_C_VISIBLE >= 2023 +typedef _Atomic(unsigned char) atomic_char8_t; +#endif typedef _Atomic(__char16_t) atomic_char16_t; typedef _Atomic(__char32_t) atomic_char32_t; typedef _Atomic(___wchar_t) atomic_wchar_t; From nobody Thu Jan 1 22:21: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 4dj1Wh1wmTz6Mnkv for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wg5ncCz49qB for ; Thu, 01 Jan 2026 22:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b7dEXzzuW58GdsnElFkSzcSCBy/Hk+9NCuRnpfO53is=; b=P48KFj1CR/VPYOrfKqzZDY4CDNBg5tvC1mewoQk0MePz4JnFpem6D+JPOyJDL6nzVLm6nA 07ERIiJ2sk6B+9fWgfXKfmp/A6C+fFDPxndsaYT14EtBRzCm7PvUQ9ep+jG51Za4AZlTRw s91DYKrZ6UW2ta4HRYUH/iPJjADaV/3etot/V7fySEi5ZX194bBChFw9WliWwpVRopXTzN AGf6Ek9jPoHvxoFddXdQgmRrJ/gdb1dyYLPZl7U208o89QM3l1HpD7DDADIbmPXMoX5Qgf qArlXzT+ojDyDifFf2vtXCx9UVj8dvU//J8FosKG9RpdDtQr9ktkvtfc4C6DCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b7dEXzzuW58GdsnElFkSzcSCBy/Hk+9NCuRnpfO53is=; b=TfydQHRsBBTeB43aP6clg+LqmyayK0DU+QouDgdfMqOmtsfkb8SyinjLMkksj2wxPV4dWd Bff491seE80VMyPNmrGV+PvQhcOrlY4Fc/6q0A12mr68UUpobrf+x0g11aety80XCHepug ohcxt8nXZk3+EczENHTqVzLFYA2MIi7Uno3sj5Kqh1BVc6Bem2zye5URnRGdOqnIR+h0RT UTDzpt8eN15yWatQX2JDjDD0tectsGT//npl069DgaAn61vy/mE6TxWzc0IL967vWflWP/ yQ8OLuRi+qye3A1FZY0cLlOMP8LHnTlvqdJEBrq/taejZ3B3bB7Mr8OKAp24OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306095; a=rsa-sha256; cv=none; b=tyaWn6mqPLyPjB7kh9NiEaKUdmN3vNQubZVMehp4QE9PJ+3jfpWYTcRlkQkQ7FwRcgN3fQ eNcZbJfCtg7HBwqssVyMAxkVFHySC5JI/bFIPBLyc/MhXTJFlUTXkwQzJULtyuBanpTGlj Ohs08ESxSdClbtXhx02vpsalCxTU6abv0B+Nj1sGVGHPg14y8Zs+e0IdbS6Sl+bmrVHOHH ixotTxkOLVLMmkq+2QzqyyF5LBxpJLCBsMHJmSZcxlMJyE9lQ1pJyZts8jW5/mS0CGL3Fd kN30IlgBbBJkBE0eTn7P6uE1b8pcNiIlezXOrYLSjyzFJVwWEu15RHGeAf7OhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wg53WJzrLP for ; Thu, 01 Jan 2026 22:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f435 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 2ff4e6ac0d9f - stable/15 - sys/_types.h: recognise char8_t as a builtin type in C++20 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2ff4e6ac0d9f3f4ef477d15c40da04a87f5b7578 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:35 +0000 Message-Id: <6956f36f.f435.41139540@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2ff4e6ac0d9f3f4ef477d15c40da04a87f5b7578 commit 2ff4e6ac0d9f3f4ef477d15c40da04a87f5b7578 Author: Robert Clausecker AuthorDate: 2025-12-07 23:49:05 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 sys/_types.h: recognise char8_t as a builtin type in C++20 Unlike in C23 where it's a typedef, char8_t is a built in type in C++20. Recognise it as such. PR: 291449 Reported by: Tomoaki AOKI Approved by: markj (mentor) Reviewed by: imp Fixes: f0e541118c374869a8226eaa1320bb6eda248a20 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54124 (cherry picked from commit 66129def7bdaf8a0447aba55e736d27687204555) --- sys/sys/_types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 6b70b8dc6e32..02d01f86b298 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -177,6 +177,10 @@ typedef __uint_least32_t __char32_t; #define _CHAR16_T_DECLARED #define _CHAR32_T_DECLARED #endif +/* and so is char8_t in C++20 */ +#if defined(__cplusplus) && __cplusplus >= 202002L +#define _CHAR8_T_DECLARED +#endif typedef struct { long long __max_align1 From nobody Thu Jan 1 22:21: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 4dj1Wk5JfVz6Lpmp for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wk174Kz49dg for ; Thu, 01 Jan 2026 22:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7XgAIVxJvZWpcEQK0230b0DtvqbvcdiSG6yU9oNUBMI=; b=RNhCRwQpVvP6PRkekrv/KKsORdh8XMqsUtftjj604WSNzfNkRnxygSH6TI6wDe+Jjkw2Me mmzOUj1zXEymS3lpuK13Whe+l6iK9wfpxdEnWcX+FwS17D0+/0V/f20SPdxklOK93nnVa6 PNx2fTJ+ZS0nj84Oo0kC6OSLOlNQ8B6r3E690ZwyGV1LOjC+kV/Ezra0UAhdFxvaWt1/ed 3h6pjJLTHELlx1uYZM5mFsN6P5w7BAOPI3XjTXi6jY/0uNeLdTzir9xp6s1QmxWdP7cwDS ixAB0/MRw9co4nklBnraoDScogE/ZMMa+uvGR9F/zJxMSPme1D6FgrbBYEXFTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7XgAIVxJvZWpcEQK0230b0DtvqbvcdiSG6yU9oNUBMI=; b=S6LL8CTNyO6JH4mXhVS9PBwt0a1MtPf4OCPlOhy4BLf0Zaza6rwI1cTWaR+oMUJ1w7JvpG sKyhlADXqTSZN6Ic9TonkX25MhJNMXRRt7NLgj3rbIpDJnnEHQZo9YHho2JE8rC08+Vxh/ K+sY0+KS5dQNTnfz7+1VfJTBYZ3Q7raQe9IAqhglzGo2ydGZDwR+Uv8/QJ5ejcBx2O7jw6 fUI8FMSxv/O4K6vB9AUcTOVr+RWoBYYs8+ZLJO91PUs6b4bOdyw8Qjm10yaAztmMBviJRz UhMavIZPAnzqf7BySae45OQS4tZ2Ny1O2JIRnlALMgYvetmcrVT1KIoMTigw2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306098; a=rsa-sha256; cv=none; b=Igxb4HJLJu5onSvZ52gKrd3fcTznDmu78PHHtsMDThob2ZQAb7J81JV0G0atqR+GXRToH5 Gie/MFLX5h72fz2WovGOjbxih5PH4Ajpp9O6RtgJB/8zHI6mWDK2kfbQLTYcjvuZcg6oaB 4Ljl8D4EzWwh9RQvf7LoGwT80le0WnVKHU1PGNhMPp1k5MxLmrCLYUUeOqM3Q83/qKoiTV hvTzp6b7AlLCrvFBsN5XueFAR+KQYGyYkm/IUgjjZIyuyAkPDhDrjgK2M4YK/XjHWSRm5z NYiK3rTLn8FWJ19Vb9F3T6QWia57JA4lyXONXJsYMzFkyn1j6BF8YTtlsEFKYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wj6LVnzrX8 for ; Thu, 01 Jan 2026 22:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eeea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ff50ace5fe0e - stable/15 - sys/stdint.h: add C23 _WIDTH macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff50ace5fe0ec991ff2e72a80a6c9e90b7e7f709 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:37 +0000 Message-Id: <6956f371.eeea.3c94c9e9@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ff50ace5fe0ec991ff2e72a80a6c9e90b7e7f709 commit ff50ace5fe0ec991ff2e72a80a6c9e90b7e7f709 Author: Robert Clausecker AuthorDate: 2025-11-19 18:53:07 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 sys/stdint.h: add C23 _WIDTH macros The platform-dependent macros are added to the various _stdint.h headers, those that are always the same are added directly to _stdint.h. We may want to move the definitions for WCHAR_* and WINT_* out of the platform header files as those are always the same. Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53830 (cherry picked from commit 7998a82d2f99a00086baf64b2a3343ba10f8806d) --- sys/arm/include/_stdint.h | 23 +++++++++++++++++++++++ sys/arm64/include/_stdint.h | 23 +++++++++++++++++++++++ sys/powerpc/include/_stdint.h | 33 +++++++++++++++++++++++++++++++++ sys/riscv/include/_stdint.h | 23 +++++++++++++++++++++++ sys/sys/stdint.h | 29 +++++++++++++++++++++++++++++ sys/x86/include/_stdint.h | 33 +++++++++++++++++++++++++++++++++ 6 files changed, 164 insertions(+) diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 9931f8b56ef5..2ebc6ea4f89f 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -153,6 +153,29 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX +#if __ISO_C_VISIBLE >= 2023 +/* + * ISO/IEC 9899:2023 + * 7.22.2 Widths of specified-width integer types + */ +#define INT_FAST8_WIDTH INT32_WIDTH +#define INT_FAST16_WIDTH INT32_WIDTH +#define INT_FAST32_WIDTH INT32_WIDTH +#define INT_FAST64_WIDTH INT64_WIDTH +#define INTPTR_WIDTH INT32_WIDTH +#define INTMAX_WIDTH INT64_WIDTH + +/* + * ISO/IEC 9899:2023 + * 7.22.3 Width of other integer types + */ +#define PTRDIFF_WIDTH INT32_WIDTH +#define SIG_ATOMIC_WIDTH INT32_WIDTH +#define SIZE_WIDTH INT32_WIDTH +#define WCHAR_WIDTH INT32_WIDTH +#define WINT_WIDTH INT32_WIDTH +#endif /* __ISO_C_VISIBLE >= 2023 */ + #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/arm64/include/_stdint.h b/sys/arm64/include/_stdint.h index 0c183bd60dca..0b360b8ab460 100644 --- a/sys/arm64/include/_stdint.h +++ b/sys/arm64/include/_stdint.h @@ -155,6 +155,29 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX +#if __ISO_C_VISIBLE >= 2023 +/* + * ISO/IEC 9899:2023 + * 7.22.2 Widths of specified-width integer types + */ +#define INT_FAST8_WIDTH INT32_WIDTH +#define INT_FAST16_WIDTH INT32_WIDTH +#define INT_FAST32_WIDTH INT32_WIDTH +#define INT_FAST64_WIDTH INT64_WIDTH +#define INTPTR_WIDTH INT64_WIDTH +#define INTMAX_WIDTH INT64_WIDTH + +/* + * ISO/IEC 9899:2023 + * 7.22.3 Width of other integer types + */ +#define PTRDIFF_WIDTH INT64_WIDTH +#define SIG_ATOMIC_WIDTH INT64_WIDTH +#define SIZE_WIDTH INT64_WIDTH +#define WCHAR_WIDTH INT32_WIDTH +#define WINT_WIDTH INT32_WIDTH +#endif /* __ISO_C_VISIBLE >= 2023 */ + #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 67719432259d..983db38ccf25 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -195,6 +195,39 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX +#if __ISO_C_VISIBLE >= 2023 +/* + * ISO/IEC 9899:2023 + * 7.22.2 Widths of specified-width integer types + */ +#define INT_FAST8_WIDTH INT32_WIDTH +#define INT_FAST16_WIDTH INT32_WIDTH +#define INT_FAST32_WIDTH INT32_WIDTH +#define INT_FAST64_WIDTH INT64_WIDTH +#ifdef __LP64__ +#define INTPTR_WIDTH INT64_WIDTH +#else +#define INTPTR_WIDTH INT32_WIDTH +#endif +#define INTMAX_WIDTH INT64_WIDTH + +/* + * ISO/IEC 9899:2023 + * 7.22.3 Width of other integer types + */ +#ifdef __LP64__ +#define PTRDIFF_WIDTH INT64_WIDTH +#define SIG_ATOMIC_WIDTH INT64_WIDTH +#define SIZE_WIDTH INT64_WIDTH +#else +#define PTRDIFF_WIDTH INT32_WIDTH +#define SIG_ATOMIC_WIDTH INT32_WIDTH +#define SIZE_WIDTH INT32_WIDTH +#endif +#define WCHAR_WIDTH INT32_WIDTH +#define WINT_WIDTH INT32_WIDTH +#endif /* __ISO_C_VISIBLE >= 2023 */ + #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index 4e032c8b0a1d..9df000b0eac4 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -151,6 +151,29 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX +#if __ISO_C_VISIBLE >= 2023 +/* + * ISO/IEC 9899:2023 + * 7.22.2 Widths of specified-width integer types + */ +#define INT_FAST8_WIDTH INT32_WIDTH +#define INT_FAST16_WIDTH INT32_WIDTH +#define INT_FAST32_WIDTH INT32_WIDTH +#define INT_FAST64_WIDTH INT64_WIDTH +#define INTPTR_WIDTH INT64_WIDTH +#define INTMAX_WIDTH INT64_WIDTH + +/* + * ISO/IEC 9899:2023 + * 7.22.3 Width of other integer types + */ +#define PTRDIFF_WIDTH INT64_WIDTH +#define SIG_ATOMIC_WIDTH INT64_WIDTH +#define SIZE_WIDTH INT64_WIDTH +#define WCHAR_WIDTH INT32_WIDTH +#define WINT_WIDTH INT32_WIDTH +#endif /* __ISO_C_VISIBLE >= 2023 */ + #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h index f82e391c9e41..77f469f3c2a3 100644 --- a/sys/sys/stdint.h +++ b/sys/sys/stdint.h @@ -73,4 +73,33 @@ typedef __uint_fast64_t uint_fast64_t; #endif #endif /* __EXT1_VISIBLE */ +#if __ISO_C_VISIBLE >= 2023 +#define INT8_WIDTH 8 +#define UINT8_WIDTH 8 +#define INT_LEAST8_WIDTH 8 +#define UINT_LEAST8_WIDTH 8 +#define UINT_FAST8_WIDTH INT_FAST8_WIDTH + +#define INT16_WIDTH 16 +#define UINT16_WIDTH 16 +#define INT_LEAST16_WIDTH 16 +#define UINT_LEAST16_WIDTH 16 +#define UINT_FAST16_WIDTH INT_FAST16_WIDTH + +#define INT32_WIDTH 32 +#define UINT32_WIDTH 32 +#define INT_LEAST32_WIDTH 32 +#define UINT_LEAST32_WIDTH 32 +#define UINT_FAST32_WIDTH INT_FAST32_WIDTH + +#define INT64_WIDTH 64 +#define UINT64_WIDTH 64 +#define INT_LEAST64_WIDTH 64 +#define UINT_LEAST64_WIDTH 64 +#define UINT_FAST64_WIDTH INT_FAST64_WIDTH + +#define UINTMAX_WIDTH INTMAX_WIDTH +#define UINTPTR_WIDTH INTPTR_WIDTH +#endif /* __ISO_C_VISIBLE >= 2023 */ + #endif /* !_SYS_STDINT_H_ */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index 59aab4b39c0c..1b8523bf656b 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -184,6 +184,39 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX +#if __ISO_C_VISIBLE >= 2023 +/* + * ISO/IEC 9899:2023 + * 7.22.2 Widths of specified-width integer types + */ +#define INT_FAST8_WIDTH INT32_WIDTH +#define INT_FAST16_WIDTH INT32_WIDTH +#define INT_FAST32_WIDTH INT32_WIDTH +#define INT_FAST64_WIDTH INT64_WIDTH +#ifdef __LP64__ +#define INTPTR_WIDTH INT64_WIDTH +#else +#define INTPTR_WIDTH INT32_WIDTH +#endif +#define INTMAX_WIDTH INT64_WIDTH + +/* + * ISO/IEC 9899:2023 + * 7.22.3 Width of other integer types + */ +#ifdef __LP64__ +#define PTRDIFF_WIDTH INT64_WIDTH +#define SIG_ATOMIC_WIDTH INT64_WIDTH +#define SIZE_WIDTH INT64_WIDTH +#else +#define PTRDIFF_WIDTH INT32_WIDTH +#define SIG_ATOMIC_WIDTH INT32_WIDTH +#define SIZE_WIDTH INT32_WIDTH +#endif +#define WCHAR_WIDTH INT32_WIDTH +#define WINT_WIDTH INT32_WIDTH +#endif /* __ISO_C_VISIBLE >= 2023 */ + #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_MACHINE__STDINT_H_ */ From nobody Thu Jan 1 22:21: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 4dj1Wj0mxVz6MnyW for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wh6HXgz49vs for ; Thu, 01 Jan 2026 22:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2k3hF43SWve9iJTGnUYmuGnV0MO/GiD83Z4PNlGBPvE=; b=yiWeJx8Pz9TEe3A6EXoH/aVTdnzidFnU+dckLCXb6RqV2BYoYdF3OYLNpLwxhW2CGhn2oj lK2/zANYlVBKNqq6Y7I0dTRQQ+NKmpQ4p8JvgSNahWsDLLkqD2J1SJWddiavzzRxJLGoTT 9Qapypmbh/g4tNegn6pokl88cStfYOBloHzC0hpR6oVRA5KRpHGyDGGQ6bxxSlHQJJeSzk /d9DGeB2dkTMyBk1R6r8A4EZo6fBtT/p8oTA+5o9My8SO/A+eG4JrteU5H5Bm8NtydkgU7 5R6x17A0ZeyZQRNGGrDgExFXUtOLTNzpmirLNCtt3pWajMe5zo0ycpt9H9pDHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2k3hF43SWve9iJTGnUYmuGnV0MO/GiD83Z4PNlGBPvE=; b=G2Nmoweb7Dy5zWD2Lc1hhlH8IpMXeNqNxRtKvUDP0m06sOoEtdJM+loj98h3iItnyaVfZl fNJiv3N7Cxh0zZ1kxTtWUAyuysvk5aYTKfMIVsfDwOd3uMqbMO9OmsfeaITEEGTNKRcS93 8xQO19wpXjpqRp2fF57+uT5AHj1H3laNgHpwE2HixWeSmjHS6Yqox12hIF/I53juoS9m4F s7Gt4E9TgfHfLmRE9dexGqsvEuYhem/jAFR/kJ3H7IC6SLkR05oWtMkl7UkaGrcdn6HQMQ zNUWkP1z7df7H9B3Jlx5k6fIGFfvycmDKDoXQhQHZTQlliIFTuLGOlOdDWNGyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306096; a=rsa-sha256; cv=none; b=IwBbOA4DW4sL8/7FsYmIly6/b6zioIep5saLLW0SDxwYHSG0Y9xaj9akU86jOXr/UYOU81 uW3HHT2m456KeHWnwVPyu2E7H/BpbkL2qE1+0x3wsoOt/auHbBdjBcn0R4+PD8wOk+SKbn NObn5Mja/AKhzU8hqc2MwrDk9VT6QXOxw2PAwj4jh2F0EUodei2htb99rCtoG/2iwfIYt6 20h7AJIIopBhGioad2rO+FyKyoPI7DojWNM7y5PxkyOK3yTUXm8b1uDJZhERw1Q2Aadufw zvGKk8WOKQIo4d2dMitdGhdlRayq+7UuoE/nNl7MfkyGvnl/qj3D5QiQvt0nsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wh5pBPzrpT for ; Thu, 01 Jan 2026 22:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eee6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: cbad54ba46e6 - stable/15 - sys/limits.h: add C23 _WIDTH macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cbad54ba46e6a4ad83d87d379fc3fcedb0cd7246 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:36 +0000 Message-Id: <6956f370.eee6.5b3293bd@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=cbad54ba46e6a4ad83d87d379fc3fcedb0cd7246 commit cbad54ba46e6a4ad83d87d379fc3fcedb0cd7246 Author: Robert Clausecker AuthorDate: 2025-11-19 12:29:58 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 sys/limits.h: add C23 _WIDTH macros For compliance with IOS/IEC 9899:2024 ("C23"). These macros define the width in bits of the basic integer types. Another new macro, BITINT_MAXWIDTH, is not yet included as I do not understand what it should be set to. Perhaps it is compiler-specific. Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53825 (cherry picked from commit 7326bc7f9c14f86976a7769906b167ff96140809) --- sys/arm/include/_limits.h | 3 +++ sys/arm64/include/_limits.h | 3 +++ sys/powerpc/include/_limits.h | 3 +++ sys/riscv/include/_limits.h | 3 +++ sys/sys/limits.h | 20 ++++++++++++++++++++ sys/x86/include/_limits.h | 3 +++ 6 files changed, 35 insertions(+) diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h index 8cd48337508e..d6bcb09bda84 100644 --- a/sys/arm/include/_limits.h +++ b/sys/arm/include/_limits.h @@ -42,6 +42,9 @@ */ #define __CHAR_BIT 8 /* number of bits in a char */ +#define __SHRT_BIT 16 /* number of bits in a short */ +#define __INT_BIT 32 /* number of bits in an int */ +#define __LLONG_BIT 64 /* number of bits in a long long */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ diff --git a/sys/arm64/include/_limits.h b/sys/arm64/include/_limits.h index 08649b5c779d..aeb72dc19b09 100644 --- a/sys/arm64/include/_limits.h +++ b/sys/arm64/include/_limits.h @@ -41,6 +41,9 @@ */ #define __CHAR_BIT 8 /* number of bits in a char */ +#define __SHRT_BIT 16 /* number of bits in a short */ +#define __INT_BIT 32 /* number of bits in an int */ +#define __LLONG_BIT 64 /* number of bits in a long long */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h index 542248e51498..cae389ef0f36 100644 --- a/sys/powerpc/include/_limits.h +++ b/sys/powerpc/include/_limits.h @@ -42,6 +42,9 @@ */ #define __CHAR_BIT 8 /* number of bits in a char */ +#define __SHRT_BIT 16 /* number of bits in an short */ +#define __INT_BIT 32 /* number of bits in an int */ +#define __LLONG_BIT 64 /* number of bits in a long long */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ diff --git a/sys/riscv/include/_limits.h b/sys/riscv/include/_limits.h index 95e86c14e168..872e5b610e0c 100644 --- a/sys/riscv/include/_limits.h +++ b/sys/riscv/include/_limits.h @@ -37,6 +37,9 @@ */ #define __CHAR_BIT 8 /* number of bits in a char */ +#define __SHRT_BIT 16 /* number of bits in a short */ +#define __INT_BIT 32 /* number of bits in an int */ +#define __LLONG_BIT 64 /* number of bits in a long long */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ diff --git a/sys/sys/limits.h b/sys/sys/limits.h index 2cb0051fe86c..8044d4458639 100644 --- a/sys/sys/limits.h +++ b/sys/sys/limits.h @@ -68,6 +68,26 @@ #define LLONG_MIN __LLONG_MIN /* min for a long long */ #endif +#if __ISO_C_VISIBLE >= 2023 +#define BOOL_WIDTH 1 /* number of bits in a bool */ + +#define CHAR_WIDTH __CHAR_BIT /* number of bits in a char */ +#define SCHAR_WIDTH __CHAR_BIT /* number of bits in a signed char */ +#define UCHAR_WIDTH __CHAR_BIT /* number of bits in an unsigned char */ + +#define SHRT_WIDTH __SHRT_BIT /* number of bits in a short */ +#define USHRT_WIDTH __SHRT_BIT /* number of bits in an unsigned short */ + +#define INT_WIDTH __INT_BIT /* number of bits in an int */ +#define UINT_WIDTH __INT_BIT /* number of bits in an unsigned int */ + +#define LONG_WIDTH __LONG_BIT /* number of bits in a long */ +#define ULONG_WIDTH __LONG_BIT /* number of bits in an unsigned long */ + +#define LLONG_WIDTH __LLONG_BIT /* number of bits in a long long */ +#define ULLONG_WIDTH __LLONG_BIT /* number of bits in an unsigned long long */ +#endif + #if __POSIX_VISIBLE || __XSI_VISIBLE #define SSIZE_MAX __SSIZE_MAX /* max value for an ssize_t */ #endif diff --git a/sys/x86/include/_limits.h b/sys/x86/include/_limits.h index 422667a79bc0..fc7cfac1e70d 100644 --- a/sys/x86/include/_limits.h +++ b/sys/x86/include/_limits.h @@ -42,6 +42,9 @@ */ #define __CHAR_BIT 8 /* number of bits in a char */ +#define __SHRT_BIT 16 /* number of bits in a short */ +#define __INT_BIT 32 /* number of bits in an int */ +#define __LLONG_BIT 64 /* number of bits in a long long */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ From nobody Thu Jan 1 22:21: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 4dj1Wm4G2Dz6Lpmq for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wm0zjYz49dt for ; Thu, 01 Jan 2026 22:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TtsDXvejQRAHNZN7lGbTMPkfK12G7ON5W7VU2SemUVY=; b=BAfbtXk3Bl9rS4UGRd6hkVHgmEAslTkb6ZkDCrwyaNh0BAJ1H+AkjCTkOcW2MCKNbcVmLb 83T7A7tX0HHhDIW9lFpxVQUREqPXgPqDO6gfYPhpIMam3c7B5hBkBn/jsZuTIZg/achmk0 Vk2DgCABxVKdb2RD5umz+ipoaAEnVZZ1V4iidmH2lGtqDsFQ7rim8Z00Le5R+l2YxMCuSt m8n3GRhNg4AfO1ocNUiG/lSo2waylLBcOZNKQfkLdW8hoK+EbMMPrVGTzwY48KMBIw/v/U RqINJpqKI8dlUg5wQPdu8xgTxYRtDBK7TzVHcHhcTZ25iRTal9O1W6GE5uzUWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TtsDXvejQRAHNZN7lGbTMPkfK12G7ON5W7VU2SemUVY=; b=nXGEeSUn04Q38dzWUs6BzjSuaDzbVBoJuXoqyh+Ip4kFdkv4Uu1UT3TTCJxgtcvRnbasz0 +2+MSH+Uyq0o2VCbA87jFCBfn7AZIKRjzB9pKS8Zc4gSXGypU1AxxzE4xIKmpeb8RULXEN 4fOEOGR1TAlA0zhQkOjX8/wQCJYvPvgyJ86lULRn911IHzWkm71UGY5JCkM+vH0McCYEZ+ B9z4H0J1qdRh40PHbGZ3egxhVXBHMpX2XCEYAkFt051hj/676y0BK+DMfBw62CbUjVQndZ 2ZVWCVksmH7Y+mpIbGZN3WNnqcVxbBMXgnWG9BhTlsrFBCUAHan27ds+C4H+Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306100; a=rsa-sha256; cv=none; b=ebtVecO4/uCFUSK5AQOlfNGGMZjpxFpU/ftJAZvXTzzVS3/0BNKRy9DqAcOdxCUBn/o3u4 exxJYior+qNR9/+36Ojx271wVMaAhaJwPOHuLAaSyMvwpZrd202WQd3WIhQSQiIOT4vxRc +4o2R38EDVCZ9OtgGnX9tb/U2i6QxXNug8pEGMg7DFmaOyzHan5Ueg1SC18iAfRy0AAIYb J5hufV7JqFsmdp7Yh4ZW0l0iOuu68cDDPUGWm2K7u/Ew5ds3SJPX8Xb77Gx74vzCqt2AUG 1OVbZmNwE+EE/dqiR6r9ZbjbhbOG0bnGqJn6hco1RshyQKH2weh9Y1Gau0BpCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wm0XhMzqZY for ; Thu, 01 Jan 2026 22:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f439 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 12f87885206b - stable/15 - libc/tests: add test for *_MAX, *_MIN, and *_WIDTH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12f87885206b25b7400d447059cb207341febf92 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:40 +0000 Message-Id: <6956f374.f439.12bfbcc8@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=12f87885206b25b7400d447059cb207341febf92 commit 12f87885206b25b7400d447059cb207341febf92 Author: Robert Clausecker AuthorDate: 2025-11-19 19:26:11 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 libc/tests: add test for *_MAX, *_MIN, and *_WIDTH This file checks the correctness of the various _MAX, _MIN, and _WIDTH macros defined for the libc types. It assumes that none of the types have padding bits. Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53831 (cherry picked from commit 4a1c7529c96ff54657ef701fa89b92230ee6bac2) --- lib/libc/tests/gen/Makefile | 1 + lib/libc/tests/gen/limits_test.c | 101 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile index 8c2151105209..054b1b426b3d 100644 --- a/lib/libc/tests/gen/Makefile +++ b/lib/libc/tests/gen/Makefile @@ -19,6 +19,7 @@ ATF_TESTS_C+= glob2_test .if ${COMPILER_FEATURES:Mblocks} ATF_TESTS_C+= glob_blocks_test .endif +ATF_TESTS_C+= limits_test ATF_TESTS_C+= makecontext_test ATF_TESTS_C+= opendir_test ATF_TESTS_C+= popen_test diff --git a/lib/libc/tests/gen/limits_test.c b/lib/libc/tests/gen/limits_test.c new file mode 100644 index 000000000000..b4e8bf3178f1 --- /dev/null +++ b/lib/libc/tests/gen/limits_test.c @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: FreeBSD-2-Clause + */ + +#include +#include +#include +#include +#include + +#include + +/* if this file builds, the unit tests have passed */ +#define CHECK_STYPE(type, TYPE) \ + static_assert(sizeof(type) * CHAR_BIT == TYPE ## _WIDTH, \ + __XSTRING(TYPE) "_WIDTH wrongly defined"); \ + static_assert((1ULL << (TYPE ## _WIDTH - 1)) - 1 == TYPE ## _MAX, \ + __XSTRING(TYPE) "_MAX wrongly defined"); \ + static_assert(TYPE ## _MIN == -TYPE ## _MAX - 1, \ + __XSTRING(TYPE) "_MIN wrongly defined") +#define CHECK_UTYPE(type, TYPE) \ + static_assert(sizeof(type) * CHAR_BIT == TYPE ## _WIDTH, \ + __XSTRING(TYPE) "_WIDTH wrongly defined"); \ + static_assert((type)~0ULL == TYPE ## _MAX, \ + __XSTRING(TYPE) "_MAX wrongly defined"); + +/* primitive types */ +#ifdef __CHAR_UNSIGNED__ +CHECK_UTYPE(char, CHAR); +#else +CHECK_STYPE(char, CHAR); +#endif + +CHECK_STYPE(signed char, SCHAR); +CHECK_STYPE(short, SHRT); +CHECK_STYPE(int, INT); +CHECK_STYPE(long, LONG); +CHECK_STYPE(long long, LLONG); + +CHECK_UTYPE(unsigned char, UCHAR); +CHECK_UTYPE(unsigned short, USHRT); +CHECK_UTYPE(unsigned int, UINT); +CHECK_UTYPE(unsigned long, ULONG); +CHECK_UTYPE(unsigned long long, ULLONG); + +/* fixed-width types */ +CHECK_STYPE(int8_t, INT8); +CHECK_STYPE(int16_t, INT16); +CHECK_STYPE(int32_t, INT32); +CHECK_STYPE(int64_t, INT64); + +CHECK_UTYPE(uint8_t, UINT8); +CHECK_UTYPE(uint16_t, UINT16); +CHECK_UTYPE(uint32_t, UINT32); +CHECK_UTYPE(uint64_t, UINT64); + +CHECK_STYPE(int_least8_t, INT_LEAST8); +CHECK_STYPE(int_least16_t, INT_LEAST16); +CHECK_STYPE(int_least32_t, INT_LEAST32); +CHECK_STYPE(int_least64_t, INT_LEAST64); + +CHECK_UTYPE(uint_least8_t, UINT_LEAST8); +CHECK_UTYPE(uint_least16_t, UINT_LEAST16); +CHECK_UTYPE(uint_least32_t, UINT_LEAST32); +CHECK_UTYPE(uint_least64_t, UINT_LEAST64); + +CHECK_STYPE(int_fast8_t, INT_FAST8); +CHECK_STYPE(int_fast16_t, INT_FAST16); +CHECK_STYPE(int_fast32_t, INT_FAST32); +CHECK_STYPE(int_fast64_t, INT_FAST64); + +CHECK_UTYPE(uint_fast8_t, UINT_FAST8); +CHECK_UTYPE(uint_fast16_t, UINT_FAST16); +CHECK_UTYPE(uint_fast32_t, UINT_FAST32); +CHECK_UTYPE(uint_fast64_t, UINT_FAST64); + +/* other types */ +#if WCHAR_MIN == 0 +CHECK_UTYPE(wchar_t, WCHAR); +#else +CHECK_STYPE(wchar_t, WCHAR); +#endif +CHECK_STYPE(intmax_t, INTMAX); +CHECK_STYPE(intptr_t, INTPTR); +CHECK_STYPE(ptrdiff_t, PTRDIFF); +CHECK_STYPE(wint_t, WINT); +CHECK_STYPE(sig_atomic_t, SIG_ATOMIC); + +CHECK_UTYPE(uintmax_t, UINTMAX); +CHECK_UTYPE(uintptr_t, UINTPTR); +CHECK_UTYPE(size_t, SIZE); + +/* dummy */ +ATF_TP_ADD_TCS(tp) +{ + (void)tp; + + return (atf_no_error()); +} From nobody Thu Jan 1 22:21: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 4dj1Wl2t1Cz6Mngt for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wl0Kcyz49tY for ; Thu, 01 Jan 2026 22:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90eW0pkbqDcxTaGPflvjlwuV1haBDqDllVdZZ6WYKrs=; b=qxUH3YrAZ5qkUkicrPwOwaKVpossB5qiToiDNV52l30OgA3SU9rIBHluC2PO7xcHbTQksC mLpnPqeuaP1RbVoByshsEQmUkCQQJDrtDL7g91eh/h7ZJej+LVSe5QEP/5rrVOZt2gf1uU 8KzOv/l7/VJggVkNJPhgU7D/VXx8Mzw1C8mLLXdEadirjHSlBuP4wry6wB5ECC9K2DTs1o BCkgqi3+MifgHElSdPlvPV/X7gVefce2yzZCCoG6ZI9sstg1+KSGyol1pFMfL8ZoXguhib 7BJ0c7WVw3+qko4hMPTjZb2HCmlIZWeRmuCCWDHNHSZmYMaatgShqioyjQHK9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90eW0pkbqDcxTaGPflvjlwuV1haBDqDllVdZZ6WYKrs=; b=rW4RTJabIatKMoKqDGu7yd9oEPsrkJsVWqrnesTIcnPVkSp+3h0CNGQkYn8jc/EBC2BqE7 HvllRn9/FS/7hrd13lH8nzjYEGI0+9SJ/ppuuRZ+HJCzXMq+6g9PzmykWOAiu1B0CZJWUP PTEiNLNP0wxemJLT4cYnvTgLyOjeguCqOHg0eG1OLL+xW8sF5MfIsxsjSnntqA7W1gqlJE RE12QDz8c0A/TKQAhtm2g4kHE41QJIXR59HXDTRgWvpJ5WIMZ7YeO6pzJ7H3myU5Ve2Vxf ZA+1aI39ZklmS4hcsYWxSCZYQIPcc50ERH4MrRDSDuUmnCGz3Ok9tffVAuwpeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306099; a=rsa-sha256; cv=none; b=C4oV08NaVE2AcLDnk9WDrnAI7VtkpLVipWij/zR+/QwBRH8mu0CuRDHBP3nj0WEz1rKr3b rgpuANC7KpxXkoUz/m8GShNwVg9bNIB1/Y9mQ7P/pjp292xxCNTt0ktwMIbDQKHfXsGmiT E7yaZbPoU3woymGfD5YyyGESWRVozecB8YdYrJ14PAc6BG9RvEzKSBvRYH2GzXOz/8Zqtt FP+N6NVG/ziWoqoSboQFESp+7WkihD8fps3HxLEwXbKr6HOeYHkVgIMf+5Yd6W1/s+qAbE aAfIvN4S06nE4o8LR4oWkMBRo+ujXRiV3Ge+uip9PwwysYET6GyHBadcWjp9XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wk6rXGzrm2 for ; Thu, 01 Jan 2026 22:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ebc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 44fcd991dd28 - stable/15 - powerpc/_stdint.h: fix SIG_ATOMIC_{MIN,MAX,WIDTH} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 44fcd991dd2803984260d69f4991651c0d64e0d1 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:38 +0000 Message-Id: <6956f372.ebc6.238b422@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=44fcd991dd2803984260d69f4991651c0d64e0d1 commit 44fcd991dd2803984260d69f4991651c0d64e0d1 Author: Robert Clausecker AuthorDate: 2025-12-02 00:59:05 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 powerpc/_stdint.h: fix SIG_ATOMIC_{MIN,MAX,WIDTH} On powerpc/powerpc64, sig_atomic_t is an int, but was treated as if it was a long by . This was finally caught by the unit test added with 4a1c752 / D53831. Reported by: kib Reviewed by: kib, imp Approved by: markj (mentor) Fixes: c3e289e1ce8c9af8d14e9f727632e22b3bf901f9 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54026 (cherry picked from commit f417c9ed6642836c386c922d6e184b618d28127d) --- sys/powerpc/include/_stdint.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 983db38ccf25..385c33389809 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -167,15 +167,15 @@ * ISO/IEC 9899:1999 * 7.18.3 Limits of other integer types */ +/* Limits of sig_atomic_t. */ +#define SIG_ATOMIC_MIN INT32_MIN +#define SIG_ATOMIC_MAX INT32_MAX + #ifdef __LP64__ /* Limits of ptrdiff_t. */ #define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT64_MIN -#define SIG_ATOMIC_MAX INT64_MAX - /* Limit of size_t. */ #define SIZE_MAX UINT64_MAX #else @@ -183,10 +183,6 @@ #define PTRDIFF_MIN INT32_MIN #define PTRDIFF_MAX INT32_MAX -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT32_MIN -#define SIG_ATOMIC_MAX INT32_MAX - /* Limit of size_t. */ #define SIZE_MAX UINT32_MAX #endif @@ -217,13 +213,12 @@ */ #ifdef __LP64__ #define PTRDIFF_WIDTH INT64_WIDTH -#define SIG_ATOMIC_WIDTH INT64_WIDTH #define SIZE_WIDTH INT64_WIDTH #else #define PTRDIFF_WIDTH INT32_WIDTH -#define SIG_ATOMIC_WIDTH INT32_WIDTH #define SIZE_WIDTH INT32_WIDTH #endif +#define SIG_ATOMIC_WIDTH INT32_WIDTH #define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ From nobody Thu Jan 1 22: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 4dj1Wn4FxMz6Mnmx for ; Thu, 01 Jan 2026 22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wn1P67z49r2 for ; Thu, 01 Jan 2026 22: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=1767306101; 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=TRX9dOKDCDSTtWjPgE8moy7rKmOMAEF8qimBaxtLOxM=; b=ud++bsm60zd/gDi5FzXo8G8wSU5dMJLiMUbgQxjwLeWOszlQNzySewLhsJOHN2DfmjE5VK k2TAZKaMtnEj9HseqqAsvBQ+/HN/U/k1DSGGbke2lzydlfZBVvP6eFJx+qaPvDGrph978n 6hjUjspnlsWivgHOyfCQJemELN88fymCVWzXLL7RRsx3xFhMYk4MjVMzzLjhfUSuk3mb8F G7w52LDWtXUsJEXOwXbiQSSntYe4C5eTbXn+C8zUAZxyXTFnySrpq8Q40yPXRkULexBIsQ 4ISYHrnn0Fh6o4mgrXVuUvO5klUdt02u1HcecFYOR8pZ+5BQCxH3nDx0EGYWMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306101; 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=TRX9dOKDCDSTtWjPgE8moy7rKmOMAEF8qimBaxtLOxM=; b=GfIkJaicaiTEDqBFBb108XmuUZPM7fmkyOZuCmaNBTWUtVm+lh1tlWOw4zskRmBq+/OYpt 3UOSXDkSi/TJUhiCwWrAiTqidr5DG8qtaRygYaMJpfSxOAIb/TqUnBIjQ5MeyW7Hv4R3Y3 gSpFUMKG/QY87HFc/d8Ujv3TMBLiqGmISJou7rIaVOoMa5FZE1T+3N6isHu1wLFRnUjUNV p8dTOwd4ZqX7YH6p8wnfbPLMRuTkn65F1NQhypPLTlzhhGHW2FAxGDjj0/aITWRx0/IENG OASk1ljt+U04Lj9HidBiVtMlP9lHse+4zqjzcmEJGgbMlMVMCmPuQkw+Cb22uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306101; a=rsa-sha256; cv=none; b=OAitLl55WDVZGp8sF1IOZhDCmHU3ZrZspFgP0sfqcBBRozrPZ8K7uAQEGEs4zoZE7J4sE1 kvJsmjcK3THRUMf32zW4fXBkM59NKudsqbZIgwLMD86q9ldpdyRH6+E1waa4k65Auy6zIA Tk4guYb9kTZylpEn4pGMaRK7AoTlIV+uOecgaCS6oJgKaN05kGh0n0kcVbj3OI/JZJITyx BD15UVm0wCFXYs2b9GwCJF7CsNbFOztQlueqmMrxdk7ucr61nrZqP0lgHCHyvJqVdrLPwr We+Yr2vvr5JTxoUD2qAJ47t4rAipmI4b0H3lbK69F9ZE+qm8t/zwsPsBkOVh+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wn0xzyzrLT for ; Thu, 01 Jan 2026 22:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d7c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Robert Clausecker Subject: git: 325b327ff7d7 - stable/15 - libc/limits_test: add no-op testcase to satisfy kyua List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 325b327ff7d7ece7646058c4d42f087c026c9d08 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:41 +0000 Message-Id: <6956f375.d7c9.619d9c2e@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=325b327ff7d7ece7646058c4d42f087c026c9d08 commit 325b327ff7d7ece7646058c4d42f087c026c9d08 Author: Siva Mahadevan AuthorDate: 2025-10-23 13:17:25 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 libc/limits_test: add no-op testcase to satisfy kyua This test suite is purely tested with compile-time assertions, so it needs a dummy runtime test to ensure that kyua reports the file as passing. Pull Request: https://github.com/freebsd/freebsd-src/pull/1915 Sponsored by: The FreeBSD Foundation Reviewed by: fuz Approved by: markj (mentor) MFC after: 1 month Signed-off-by: Siva Mahadevan (cherry picked from commit 27ff0bbcfd27df588d3f486cb21180a26031b889) --- lib/libc/tests/gen/limits_test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/gen/limits_test.c b/lib/libc/tests/gen/limits_test.c index b4e8bf3178f1..7324ef74319e 100644 --- a/lib/libc/tests/gen/limits_test.c +++ b/lib/libc/tests/gen/limits_test.c @@ -93,9 +93,12 @@ CHECK_UTYPE(uintptr_t, UINTPTR); CHECK_UTYPE(size_t, SIZE); /* dummy */ +ATF_TC_WITHOUT_HEAD(dummy); +ATF_TC_BODY(dummy, tc) {} + ATF_TP_ADD_TCS(tp) { - (void)tp; + ATF_TP_ADD_TC(tp, dummy); return (atf_no_error()); } From nobody Thu Jan 1 22:21: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 4dj1Wq4bm4z6MnqV for ; Thu, 01 Jan 2026 22:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wq317sz49fK for ; Thu, 01 Jan 2026 22:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+T2fveRGAEtAtAlz+E6jYRCsHkZUaZXTea/ILaKw5rY=; b=aGf+dZlGHYIzi0yFia64m2NS4lk9yAF9MfdcI9jgQga3ooix6CwOkaVT6tiZo5BfBnJx/l zxDPMmUjCXKGOukRZG8M5vqG8YCt+SP2NEHSJBwW6pkpvIEmo2+/QyGxS2xY8b2cjjZ4v1 1vWgWuYwBWC25fnrby1ljefjQFWs21PS5AGUtR5nglVS+pgwf5D4DBOaBy9zqfRljBfZxX BW1PAuER2ovZl+y1joFwLow8j/tbYaDdO5UUDL6kgiqbtz5JIjMlXbvoFyO3qwLJkULuv6 2/zNxXONLJbZIDj4gsvFZWen40MFpNlbBxmQOQpcKWtPl+Udx/Z2WHcYrtm/iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+T2fveRGAEtAtAlz+E6jYRCsHkZUaZXTea/ILaKw5rY=; b=E9mPsNIQCCBU3FWD/l98QUI33yW49AkBaD9wImeakR4gpgs6knvmWrZsO9VKLj44U7eRLd jK151/iWZqvz4pl2nI11Itmcoei/3nXfZ4aKMCnRE+ajhBQcELIVhLnNvlGTpzxCW47CrR UMQWzcwnmha95iXO92ww5GRu7hJ15tEZ7wzXgRzFDONWjvdWbAX2goNl2QcU+0qNsM217W v0Ob+IEnvGQnSqRNzKL8WI6GgUcygBs4lznN66+6sPz06bcCZrznhV05I/i/icvVW2+oGs vz+YsU0SfFsVNR2sn/y2M3ovXe1neCYTABBajXHNHYQ1tB9Hg4KWXGP5yjmlQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306103; a=rsa-sha256; cv=none; b=taiOY8lQ9pZahtGEy7c8gW0PbguVxnkJYYHgylQK92lVs7RyihEuKblkLtsXtECXdsydFl fox3FjvbnnMUM4g/F8ADHNd9XYTEoeXf3lyZiVH7839Ydtsc/kAQzwCJ+/14B9wUuWKEib ldPjTBXPun3YQ0ihE54MqRI+mPpGPFYqyE9JhwQ7x+X3MPiqct1lh37WBuy8bDmcXfq70r 6S2lL0iB8m9LXdC55vhpzCSHOH/rVUhyOzmarXUdPfe7M9UvQLZNNZXvD0VJlGTfUmugtl 5iVTpIytYs3/Oz2TAywfyO2ozbM0eHETM+yIib8bdqzyG9YX1jTvV4wtDamvow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wq2Z4vzrjp for ; Thu, 01 Jan 2026 22:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c87f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: fff2795baf1a - stable/15 - libc/stdc_has_single_bit.c: fix gcc warning (-Wparentheses) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fff2795baf1ae298b0fcf137bc584faf1d79c785 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:43 +0000 Message-Id: <6956f377.c87f.1921335c@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fff2795baf1ae298b0fcf137bc584faf1d79c785 commit fff2795baf1ae298b0fcf137bc584faf1d79c785 Author: Robert Clausecker AuthorDate: 2025-12-03 18:36:27 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:32 +0000 libc/stdc_has_single_bit.c: fix gcc warning (-Wparentheses) gcc14 is concerned that the operator precedence between - and & might be confusing. Throw in some redundant parentheses to make it shut up. The LLVM build was fine before this change. Reported by: Martin Filla Approved by: markj (mentor) MFC after: 1 month Fixes: 6296500a85c8474e3ff3fe2f8e4a9d56dd0acd64 Differential Revision: https://reviews.freebsd.org/D54057 (cherry picked from commit 3d71ce92eae9f1417f35a0d07912858fd8f6fa0b) --- lib/libc/stdbit/stdc_has_single_bit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libc/stdbit/stdc_has_single_bit.c b/lib/libc/stdbit/stdc_has_single_bit.c index e5f676265551..a448464b04d9 100644 --- a/lib/libc/stdbit/stdc_has_single_bit.c +++ b/lib/libc/stdbit/stdc_has_single_bit.c @@ -10,29 +10,29 @@ bool stdc_has_single_bit_uc(unsigned char x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_us(unsigned short x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_ui(unsigned int x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_ul(unsigned long x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_ull(unsigned long long x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } From nobody Thu Jan 1 22:21: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 4dj1Wp3bLmz6MnlD for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wp2DHkz3Bln for ; Thu, 01 Jan 2026 22:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frFVgrxDvAYqgJ/NG73CRLWYQk6XqLkGTUKDmzHXdlk=; b=dtcV9hxBA6BIFHunjJgiqzvSj5OkbKPK5z8I3B/LTGU4IK7fqSSWbOsSwwJPj4RjJb3Eu2 LcrPEDK6glSu4RCxt0rt2gMxwh3q+iP9i4PmnpJWmgG+LUfvR3ls4zl/wrdyDE+Z7pfCW6 DprBV+vc1Ou+GOT36eupWpeyfqRrmMfAaZ0dX3PFM7eWTtooNySkOj8OuZF3Ru5PnmkRhp yUDatiAWrGZdvUt5hmTOvO/7Oi6NR29t0uFlI0sqngq7apxgj8PCNfGKj6pwWl9lXNVfMp fMECev4QXqhZkADniMUeSjijirnBhjx/+YVYQsq6xwAKk4lRiFbe/QBYC3NIpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frFVgrxDvAYqgJ/NG73CRLWYQk6XqLkGTUKDmzHXdlk=; b=OEU2Nd09r/krGByIQEVUCJOz6OM+U+r3eN21KpAK/AnfHLPPiK/gkXNRY8M+lxk/Bf5BDL 67AFZw3JYrTzlxB7LQQEz0x59FVjfvPiyPGbb6y/Hf7YB0wJh+BpLhD/eC6u9+qptiZ4xa jxZ7Lx9AyCfbprt0jSulHw2gulwfWKn5omef75miXKhk6OqadTwyVyIHhOSjnjbx6gPQD8 T8EM3ec6wVM9sXZ2BjWSYURlQQdkwdycwrLOe5uHs2kK4yM5Lu444qW+bd82zYlcds5Yt4 MB1xuJCmhFtrdq/yeDg9Cx8XnbX+CauSpb6ijvdZJHHUMRvAtE3dQYA8oOxAqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306102; a=rsa-sha256; cv=none; b=xh4z7pqVj8SRNimSX2efin/JOl0Qkt6jIySTD427zHwc+QI8yqyuI5GJe8+dMnbCAjXLsc oQ+GnSI59wr980nr0eY9MA7aQb+7Q16r6c05JQuZ8+BCsfO05xUtjC4NSfG+gqn7aC5/CZ zAw15lGUdNE/Od2B9TyeT6uhVSIY0640ZgfE7FETZNG3B0wJz61bgg7nbmhwtWwCx/BcWZ zEEXdQxmUdobwFjBu0gg8883e7PLHduyR/vYXqhF6ZqNfIaaFFs6K6Zsb0+r5efxeZMSa2 uh2tnTdb21q1Ogw4iRepkgT9b7C/A37YreYWbo2Hjn9Lh5RqZA+uYVEccukXTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wp1mcyzrjm for ; Thu, 01 Jan 2026 22:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c8e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 275c11b7ccff - stable/15 - libc: implement C23 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 275c11b7ccffffb8faf31fb0fb98e99ea5b413da Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:42 +0000 Message-Id: <6956f376.c8e6.5e1d7eac@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=275c11b7ccffffb8faf31fb0fb98e99ea5b413da commit 275c11b7ccffffb8faf31fb0fb98e99ea5b413da Author: Robert Clausecker AuthorDate: 2025-11-18 17:32:53 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:51:52 +0000 libc: implement C23 functions This new header complies with ISO/IEC 9899:2024 (C23). Contrary to glibc, we do not provide inline definitions in as we expect our system compiler to soon recognise these as builtins anyway. Relnotes: yes MFC after: 1 month Reviewed by: adrian Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D53657 (cherry picked from commit 6296500a85c8474e3ff3fe2f8e4a9d56dd0acd64) --- include/Makefile | 4 +- include/stdbit.h | 124 +++++++++++++++++++++++++++++ lib/libc/Makefile | 1 + lib/libc/stdbit/Makefile.inc | 19 +++++ lib/libc/stdbit/Symbol.map | 85 ++++++++++++++++++++ lib/libc/stdbit/stdc_bit_ceil.c | 71 +++++++++++++++++ lib/libc/stdbit/stdc_bit_floor.c | 53 ++++++++++++ lib/libc/stdbit/stdc_bit_width.c | 53 ++++++++++++ lib/libc/stdbit/stdc_count_ones.c | 38 +++++++++ lib/libc/stdbit/stdc_count_zeros.c | 38 +++++++++ lib/libc/stdbit/stdc_first_leading_one.c | 57 +++++++++++++ lib/libc/stdbit/stdc_first_leading_zero.c | 57 +++++++++++++ lib/libc/stdbit/stdc_first_trailing_one.c | 52 ++++++++++++ lib/libc/stdbit/stdc_first_trailing_zero.c | 53 ++++++++++++ lib/libc/stdbit/stdc_has_single_bit.c | 38 +++++++++ lib/libc/stdbit/stdc_leading_ones.c | 60 ++++++++++++++ lib/libc/stdbit/stdc_leading_zeros.c | 60 ++++++++++++++ lib/libc/stdbit/stdc_trailing_ones.c | 56 +++++++++++++ lib/libc/stdbit/stdc_trailing_zeros.c | 56 +++++++++++++ 19 files changed, 973 insertions(+), 2 deletions(-) diff --git a/include/Makefile b/include/Makefile index 661b2ee131ca..57b2b34f6c6e 100644 --- a/include/Makefile +++ b/include/Makefile @@ -29,8 +29,8 @@ INCS= a.out.h ar.h assert.h bitstring.h byteswap.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h \ res_update.h resolv.h runetype.h sched.h \ search.h semaphore.h setjmp.h \ - signal.h spawn.h stab.h stdalign.h stdbool.h stdckdint.h stddef.h \ - stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \ + signal.h spawn.h stab.h stdalign.h stdbit.h stdbool.h stdckdint.h \ + stddef.h stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ uchar.h ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h \ diff --git a/include/stdbit.h b/include/stdbit.h new file mode 100644 index 000000000000..a529676bed4b --- /dev/null +++ b/include/stdbit.h @@ -0,0 +1,124 @@ +/*- + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef __STDC_VERSION_STDBIT_H__ +#define __STDC_VERSION_STDBIT_H__ 202311L + +#include + +/* byte order */ +#define __STDC_ENDIAN_LITTLE__ __ORDER_LITTLE_ENDIAN__ +#define __STDC_ENDIAN_BIG__ __ORDER_BIG_ENDIAN__ +#define __STDC_ENDIAN_NATIVE__ __BYTE_ORDER__ + +#define __generic_bitfunc(func, x) (_Generic(x, \ + unsigned char: func ## _uc, \ + unsigned short: func ## _us, \ + unsigned int: func ## _ui, \ + unsigned long: func ## _ul, \ + unsigned long long: func ## _ull)(x)) + +__BEGIN_DECLS +unsigned int stdc_leading_zeros_uc(unsigned char) __pure2; +unsigned int stdc_leading_zeros_us(unsigned short) __pure2; +unsigned int stdc_leading_zeros_ui(unsigned int) __pure2; +unsigned int stdc_leading_zeros_ul(unsigned long) __pure2; +unsigned int stdc_leading_zeros_ull(unsigned long long) __pure2; +#define stdc_leading_zeros(x) __generic_bitfunc(stdc_leading_zeros, x) + +unsigned int stdc_leading_ones_uc(unsigned char) __pure2; +unsigned int stdc_leading_ones_us(unsigned short) __pure2; +unsigned int stdc_leading_ones_ui(unsigned int) __pure2; +unsigned int stdc_leading_ones_ul(unsigned long) __pure2; +unsigned int stdc_leading_ones_ull(unsigned long long) __pure2; +#define stdc_leading_ones(x) __generic_bitfunc(stdc_leading_ones, x) + +unsigned int stdc_trailing_zeros_uc(unsigned char) __pure2; +unsigned int stdc_trailing_zeros_us(unsigned short) __pure2; +unsigned int stdc_trailing_zeros_ui(unsigned int) __pure2; +unsigned int stdc_trailing_zeros_ul(unsigned long) __pure2; +unsigned int stdc_trailing_zeros_ull(unsigned long long) __pure2; +#define stdc_trailing_zeros(x) __generic_bitfunc(stdc_trailing_zeros, x) + +unsigned int stdc_trailing_ones_uc(unsigned char) __pure2; +unsigned int stdc_trailing_ones_us(unsigned short) __pure2; +unsigned int stdc_trailing_ones_ui(unsigned int) __pure2; +unsigned int stdc_trailing_ones_ul(unsigned long) __pure2; +unsigned int stdc_trailing_ones_ull(unsigned long long) __pure2; +#define stdc_trailing_ones(x) __generic_bitfunc(stdc_trailing_ones, x) + +unsigned int stdc_first_leading_zero_uc(unsigned char) __pure2; +unsigned int stdc_first_leading_zero_us(unsigned short) __pure2; +unsigned int stdc_first_leading_zero_ui(unsigned int) __pure2; +unsigned int stdc_first_leading_zero_ul(unsigned long) __pure2; +unsigned int stdc_first_leading_zero_ull(unsigned long long) __pure2; +#define stdc_first_leading_zero(x) __generic_bitfunc(stdc_first_leading_zero, x) + +unsigned int stdc_first_leading_one_uc(unsigned char) __pure2; +unsigned int stdc_first_leading_one_us(unsigned short) __pure2; +unsigned int stdc_first_leading_one_ui(unsigned int) __pure2; +unsigned int stdc_first_leading_one_ul(unsigned long) __pure2; +unsigned int stdc_first_leading_one_ull(unsigned long long) __pure2; +#define stdc_first_leading_one(x) __generic_bitfunc(stdc_first_leading_one, x) + +unsigned int stdc_first_trailing_zero_uc(unsigned char) __pure2; +unsigned int stdc_first_trailing_zero_us(unsigned short) __pure2; +unsigned int stdc_first_trailing_zero_ui(unsigned int) __pure2; +unsigned int stdc_first_trailing_zero_ul(unsigned long) __pure2; +unsigned int stdc_first_trailing_zero_ull(unsigned long long) __pure2; +#define stdc_first_trailing_zero(x) __generic_bitfunc(stdc_first_trailing_zero, x) + +unsigned int stdc_first_trailing_one_uc(unsigned char) __pure2; +unsigned int stdc_first_trailing_one_us(unsigned short) __pure2; +unsigned int stdc_first_trailing_one_ui(unsigned int) __pure2; +unsigned int stdc_first_trailing_one_ul(unsigned long) __pure2; +unsigned int stdc_first_trailing_one_ull(unsigned long long) __pure2; +#define stdc_first_trailing_one(x) __generic_bitfunc(stdc_first_trailing_one, x) + +unsigned int stdc_count_zeros_uc(unsigned char) __pure2; +unsigned int stdc_count_zeros_us(unsigned short) __pure2; +unsigned int stdc_count_zeros_ui(unsigned int) __pure2; +unsigned int stdc_count_zeros_ul(unsigned long) __pure2; +unsigned int stdc_count_zeros_ull(unsigned long long) __pure2; +#define stdc_count_zeros(x) __generic_bitfunc(stdc_count_zeros, x) + +unsigned int stdc_count_ones_uc(unsigned char) __pure2; +unsigned int stdc_count_ones_us(unsigned short) __pure2; +unsigned int stdc_count_ones_ui(unsigned int) __pure2; +unsigned int stdc_count_ones_ul(unsigned long) __pure2; +unsigned int stdc_count_ones_ull(unsigned long long) __pure2; +#define stdc_count_ones(x) __generic_bitfunc(stdc_count_ones, x) + +_Bool stdc_has_single_bit_uc(unsigned char) __pure2; +_Bool stdc_has_single_bit_us(unsigned short) __pure2; +_Bool stdc_has_single_bit_ui(unsigned int) __pure2; +_Bool stdc_has_single_bit_ul(unsigned long) __pure2; +_Bool stdc_has_single_bit_ull(unsigned long long) __pure2; +#define stdc_has_single_bit(x) __generic_bitfunc(stdc_has_single_bit, x) + +unsigned int stdc_bit_width_uc(unsigned char) __pure2; +unsigned int stdc_bit_width_us(unsigned short) __pure2; +unsigned int stdc_bit_width_ui(unsigned int) __pure2; +unsigned int stdc_bit_width_ul(unsigned long) __pure2; +unsigned int stdc_bit_width_ull(unsigned long long) __pure2; +#define stdc_bit_width(x) __generic_bitfunc(stdc_bit_width, x) + +unsigned char stdc_bit_floor_uc(unsigned char) __pure2; +unsigned short stdc_bit_floor_us(unsigned short) __pure2; +unsigned stdc_bit_floor_ui(unsigned int) __pure2; +unsigned long stdc_bit_floor_ul(unsigned long) __pure2; +unsigned long long stdc_bit_floor_ull(unsigned long long) __pure2; +#define stdc_bit_floor(x) __generic_bitfunc(stdc_bit_floor, x) + +unsigned char stdc_bit_ceil_uc(unsigned char) __pure2; +unsigned short stdc_bit_ceil_us(unsigned short) __pure2; +unsigned int stdc_bit_ceil_ui(unsigned int) __pure2; +unsigned long stdc_bit_ceil_ul(unsigned long) __pure2; +unsigned long long stdc_bit_ceil_ull(unsigned long long) __pure2; +#define stdc_bit_ceil(x) __generic_bitfunc(stdc_bit_ceil, x) +__END_DECLS + +#endif /* __STDC_VERSION_STDBIT_H__ */ diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 8705568f6d34..34474cfa9fe4 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -118,6 +118,7 @@ NOASM= .endif .include "${LIBC_SRCTOP}/regex/Makefile.inc" .include "${LIBC_SRCTOP}/resolv/Makefile.inc" +.include "${LIBC_SRCTOP}/stdbit/Makefile.inc" .include "${LIBC_SRCTOP}/stdio/Makefile.inc" .include "${LIBC_SRCTOP}/stdlib/Makefile.inc" .include "${LIBC_SRCTOP}/stdtime/Makefile.inc" diff --git a/lib/libc/stdbit/Makefile.inc b/lib/libc/stdbit/Makefile.inc new file mode 100644 index 000000000000..2ea96d2b6dfe --- /dev/null +++ b/lib/libc/stdbit/Makefile.inc @@ -0,0 +1,19 @@ +# sources for +.PATH: ${LIBC_SRCTOP}/stdbit + +SRCS+= stdc_bit_ceil.c \ + stdc_bit_floor.c \ + stdc_bit_width.c \ + stdc_count_ones.c \ + stdc_count_zeros.c \ + stdc_first_leading_one.c \ + stdc_first_leading_zero.c \ + stdc_first_trailing_one.c \ + stdc_first_trailing_zero.c \ + stdc_has_single_bit.c \ + stdc_leading_ones.c \ + stdc_leading_zeros.c \ + stdc_trailing_ones.c \ + stdc_trailing_zeros.c + +SYM_MAPS+=${LIBC_SRCTOP}/stdbit/Symbol.map diff --git a/lib/libc/stdbit/Symbol.map b/lib/libc/stdbit/Symbol.map new file mode 100644 index 000000000000..7014d6984c07 --- /dev/null +++ b/lib/libc/stdbit/Symbol.map @@ -0,0 +1,85 @@ +FBSD_1.9 { + stdc_leading_zeros_uc; + stdc_leading_zeros_us; + stdc_leading_zeros_ui; + stdc_leading_zeros_ul; + stdc_leading_zeros_ull; + + stdc_leading_ones_uc; + stdc_leading_ones_us; + stdc_leading_ones_ui; + stdc_leading_ones_ul; + stdc_leading_ones_ull; + + stdc_trailing_zeros_uc; + stdc_trailing_zeros_us; + stdc_trailing_zeros_ui; + stdc_trailing_zeros_ul; + stdc_trailing_zeros_ull; + + stdc_trailing_ones_uc; + stdc_trailing_ones_us; + stdc_trailing_ones_ui; + stdc_trailing_ones_ul; + stdc_trailing_ones_ull; + + stdc_first_leading_zero_uc; + stdc_first_leading_zero_us; + stdc_first_leading_zero_ui; + stdc_first_leading_zero_ul; + stdc_first_leading_zero_ull; + + stdc_first_leading_one_uc; + stdc_first_leading_one_us; + stdc_first_leading_one_ui; + stdc_first_leading_one_ul; + stdc_first_leading_one_ull; + + stdc_first_trailing_zero_uc; + stdc_first_trailing_zero_us; + stdc_first_trailing_zero_ui; + stdc_first_trailing_zero_ul; + stdc_first_trailing_zero_ull; + + stdc_first_trailing_one_uc; + stdc_first_trailing_one_us; + stdc_first_trailing_one_ui; + stdc_first_trailing_one_ul; + stdc_first_trailing_one_ull; + + stdc_count_zeros_uc; + stdc_count_zeros_us; + stdc_count_zeros_ui; + stdc_count_zeros_ul; + stdc_count_zeros_ull; + + stdc_count_ones_uc; + stdc_count_ones_us; + stdc_count_ones_ui; + stdc_count_ones_ul; + stdc_count_ones_ull; + + stdc_has_single_bit_uc; + stdc_has_single_bit_us; + stdc_has_single_bit_ui; + stdc_has_single_bit_ul; + stdc_has_single_bit_ull; + + stdc_bit_width_uc; + stdc_bit_width_us; + stdc_bit_width_ui; + stdc_bit_width_ul; + stdc_bit_width_ull; + + stdc_bit_floor_uc; + stdc_bit_floor_us; + stdc_bit_floor_ui; + stdc_bit_floor_ul; + stdc_bit_floor_ull; + + stdc_bit_ceil_uc; + stdc_bit_ceil_us; + stdc_bit_ceil_ui; + stdc_bit_ceil_ul; + stdc_bit_ceil_ull; +}; diff --git a/lib/libc/stdbit/stdc_bit_ceil.c b/lib/libc/stdbit/stdc_bit_ceil.c new file mode 100644 index 000000000000..2dfd7bbcbea2 --- /dev/null +++ b/lib/libc/stdbit/stdc_bit_ceil.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +/* Ensure we don't shift 1U out of range. */ +static_assert(UCHAR_WIDTH < UINT_WIDTH, + "stdc_bit_ceil_uc needs UCHAR_WIDTH < UINT_WIDTH"); + +unsigned char +stdc_bit_ceil_uc(unsigned char x) +{ + if (x <= 1) + return (1); + + return (1U << (UINT_WIDTH - __builtin_clz(x - 1))); +} + +/* Ensure we don't shift 1U out of range. */ +static_assert(USHRT_WIDTH < UINT_WIDTH, + "stdc_bit_ceil_us needs USHRT_WIDTH < UINT_WIDTH"); + +unsigned short +stdc_bit_ceil_us(unsigned short x) +{ + if (x <= 1) + return (1); + + return (1U << (UINT_WIDTH - __builtin_clz(x - 1))); +} + +unsigned int +stdc_bit_ceil_ui(unsigned int x) +{ + if (x <= 1) + return (1); + + if (x > UINT_MAX/2 + 1) + return (0); + + return (1U << (UINT_WIDTH - __builtin_clz(x - 1))); +} + +unsigned long +stdc_bit_ceil_ul(unsigned long x) +{ + if (x <= 1) + return (1); + + if (x > ULONG_MAX/2 + 1) + return (0); + + return (1UL << (ULONG_WIDTH - __builtin_clzl(x - 1))); +} + +unsigned long long +stdc_bit_ceil_ull(unsigned long long x) +{ + if (x <= 1) + return (1); + + if (x > ULLONG_MAX/2 + 1) + return (0); + + return (1ULL << (ULLONG_WIDTH - __builtin_clzll(x - 1))); +} diff --git a/lib/libc/stdbit/stdc_bit_floor.c b/lib/libc/stdbit/stdc_bit_floor.c new file mode 100644 index 000000000000..0a491d6ec7b3 --- /dev/null +++ b/lib/libc/stdbit/stdc_bit_floor.c @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned char +stdc_bit_floor_uc(unsigned char x) +{ + if (x == 0) + return (0); + + return (1U << (UINT_WIDTH - __builtin_clz(x) - 1)); +} + +unsigned short +stdc_bit_floor_us(unsigned short x) +{ + if (x == 0) + return (0); + + return (1U << (UINT_WIDTH - __builtin_clz(x) - 1)); +} + +unsigned int +stdc_bit_floor_ui(unsigned int x) +{ + if (x == 0) + return (0); + + return (1U << (UINT_WIDTH - __builtin_clz(x) - 1)); +} + +unsigned long +stdc_bit_floor_ul(unsigned long x) +{ + if (x == 0) + return (0); + + return (1UL << (ULONG_WIDTH - __builtin_clzl(x) - 1)); +} + +unsigned long long +stdc_bit_floor_ull(unsigned long long x) +{ + if (x == 0) + return (0); + + return (1ULL << (ULLONG_WIDTH - __builtin_clzll(x) - 1)); +} diff --git a/lib/libc/stdbit/stdc_bit_width.c b/lib/libc/stdbit/stdc_bit_width.c new file mode 100644 index 000000000000..e248fae48e9f --- /dev/null +++ b/lib/libc/stdbit/stdc_bit_width.c @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned int +stdc_bit_width_uc(unsigned char x) +{ + if (x == 0) + return (0); + + return (UINT_WIDTH - __builtin_clz(x)); +} + +unsigned int +stdc_bit_width_us(unsigned short x) +{ + if (x == 0) + return (0); + + return (UINT_WIDTH - __builtin_clz(x)); +} + +unsigned int +stdc_bit_width_ui(unsigned int x) +{ + if (x == 0) + return (0); + + return (UINT_WIDTH - __builtin_clz(x)); +} + +unsigned int +stdc_bit_width_ul(unsigned long x) +{ + if (x == 0) + return (0); + + return (ULONG_WIDTH - __builtin_clzl(x)); +} + +unsigned int +stdc_bit_width_ull(unsigned long long x) +{ + if (x == 0) + return (0); + + return (ULLONG_WIDTH - __builtin_clzll(x)); +} diff --git a/lib/libc/stdbit/stdc_count_ones.c b/lib/libc/stdbit/stdc_count_ones.c new file mode 100644 index 000000000000..c5198dca84df --- /dev/null +++ b/lib/libc/stdbit/stdc_count_ones.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned int +stdc_count_ones_uc(unsigned char x) +{ + return (__builtin_popcount(x)); +} + +unsigned int +stdc_count_ones_us(unsigned short x) +{ + return (__builtin_popcount(x)); +} + +unsigned int +stdc_count_ones_ui(unsigned int x) +{ + return (__builtin_popcount(x)); +} + +unsigned int +stdc_count_ones_ul(unsigned long x) +{ + return (__builtin_popcountl(x)); +} + +unsigned int +stdc_count_ones_ull(unsigned long long x) +{ + return (__builtin_popcountll(x)); +} diff --git a/lib/libc/stdbit/stdc_count_zeros.c b/lib/libc/stdbit/stdc_count_zeros.c new file mode 100644 index 000000000000..35db965afcb5 --- /dev/null +++ b/lib/libc/stdbit/stdc_count_zeros.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned int +stdc_count_zeros_uc(unsigned char x) +{ + return (__builtin_popcount(x ^ UCHAR_MAX)); +} + +unsigned int +stdc_count_zeros_us(unsigned short x) +{ + return (__builtin_popcount(x ^ USHRT_MAX)); +} + +unsigned int +stdc_count_zeros_ui(unsigned int x) +{ + return (__builtin_popcount(~x)); +} + +unsigned int +stdc_count_zeros_ul(unsigned long x) +{ + return (__builtin_popcountl(~x)); +} + +unsigned int +stdc_count_zeros_ull(unsigned long long x) +{ + return (__builtin_popcountll(~x)); +} diff --git a/lib/libc/stdbit/stdc_first_leading_one.c b/lib/libc/stdbit/stdc_first_leading_one.c new file mode 100644 index 000000000000..de436856569f --- /dev/null +++ b/lib/libc/stdbit/stdc_first_leading_one.c @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned int +stdc_first_leading_one_uc(unsigned char x) +{ + const int offset = UINT_WIDTH - UCHAR_WIDTH; + + if (x == 0) + return (0); + + return (__builtin_clz(x << offset) + 1); +} + +unsigned int +stdc_first_leading_one_us(unsigned short x) +{ + const int offset = UINT_WIDTH - USHRT_WIDTH; + + if (x == 0) + return (0); + + return (__builtin_clz(x << offset) + 1); +} + +unsigned int +stdc_first_leading_one_ui(unsigned int x) +{ + if (x == 0) + return (0); + + return (__builtin_clz(x) + 1); +} + +unsigned int +stdc_first_leading_one_ul(unsigned long x) +{ + if (x == 0) + return (0); + + return (__builtin_clzl(x) + 1); +} + +unsigned int +stdc_first_leading_one_ull(unsigned long long x) +{ + if (x == 0) + return (0); + + return (__builtin_clzll(x) + 1); +} diff --git a/lib/libc/stdbit/stdc_first_leading_zero.c b/lib/libc/stdbit/stdc_first_leading_zero.c new file mode 100644 index 000000000000..e6609b51b648 --- /dev/null +++ b/lib/libc/stdbit/stdc_first_leading_zero.c @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned int +stdc_first_leading_zero_uc(unsigned char x) +{ + const int offset = UINT_WIDTH - UCHAR_WIDTH; + + if (x == UCHAR_MAX) + return (0); + + return (__builtin_clz(~(unsigned int)x << offset) + 1); +} + +unsigned int +stdc_first_leading_zero_us(unsigned short x) +{ + const int offset = UINT_WIDTH - USHRT_WIDTH; + + if (x == USHRT_MAX) + return (0); + + return (__builtin_clz(~(unsigned int)x << offset) + 1); +} + +unsigned int +stdc_first_leading_zero_ui(unsigned int x) +{ + if (x == ~0U) + return (0); + + return (__builtin_clz(~x) + 1); +} + +unsigned int +stdc_first_leading_zero_ul(unsigned long x) +{ + if (x == ~0UL) + return (0); + + return (__builtin_clzl(~x) + 1); +} + +unsigned int +stdc_first_leading_zero_ull(unsigned long long x) +{ + if (x == ~0ULL) + return (0); + + return (__builtin_clzll(~x) + 1); +} diff --git a/lib/libc/stdbit/stdc_first_trailing_one.c b/lib/libc/stdbit/stdc_first_trailing_one.c new file mode 100644 index 000000000000..22972758d25d --- /dev/null +++ b/lib/libc/stdbit/stdc_first_trailing_one.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +unsigned int +stdc_first_trailing_one_uc(unsigned char x) +{ + if (x == 0) + return (0); + + return (__builtin_ctz(x) + 1); +} + +unsigned int +stdc_first_trailing_one_us(unsigned short x) +{ + if (x == 0) + return (0); + + return (__builtin_ctz(x) + 1); +} + +unsigned int +stdc_first_trailing_one_ui(unsigned int x) +{ + if (x == 0) + return (0); + + return (__builtin_ctz(x) + 1); +} + +unsigned int +stdc_first_trailing_one_ul(unsigned long x) +{ + if (x == 0) + return (0); + + return (__builtin_ctzl(x) + 1); +} + +unsigned int +stdc_first_trailing_one_ull(unsigned long long x) +{ + if (x == 0) + return (0); + + return (__builtin_ctzll(x) + 1); +} diff --git a/lib/libc/stdbit/stdc_first_trailing_zero.c b/lib/libc/stdbit/stdc_first_trailing_zero.c new file mode 100644 index 000000000000..27395c6977c3 --- /dev/null +++ b/lib/libc/stdbit/stdc_first_trailing_zero.c @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +unsigned int +stdc_first_trailing_zero_uc(unsigned char x) +{ + if (x == UCHAR_MAX) + return (0); + + return (__builtin_ctz(~x) + 1); +} + +unsigned int +stdc_first_trailing_zero_us(unsigned short x) +{ + if (x == USHRT_MAX) + return (0); + + return (__builtin_ctz(~x) + 1); +} + +unsigned int +stdc_first_trailing_zero_ui(unsigned int x) +{ + if (x == ~0U) + return (0); + + return (__builtin_ctz(~x) + 1); +} + +unsigned int +stdc_first_trailing_zero_ul(unsigned long x) +{ + if (x == ~0UL) + return (0); + + return (__builtin_ctzl(~x) + 1); +} + +unsigned int +stdc_first_trailing_zero_ull(unsigned long long x) +{ + if (x == ~0ULL) + return (0); + + return (__builtin_ctzll(~x) + 1); +} diff --git a/lib/libc/stdbit/stdc_has_single_bit.c b/lib/libc/stdbit/stdc_has_single_bit.c new file mode 100644 index 000000000000..e5f676265551 --- /dev/null +++ b/lib/libc/stdbit/stdc_has_single_bit.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +bool +stdc_has_single_bit_uc(unsigned char x) +{ + return (x != 0 && (x & x - 1) == 0); +} + +bool +stdc_has_single_bit_us(unsigned short x) +{ + return (x != 0 && (x & x - 1) == 0); +} + +bool +stdc_has_single_bit_ui(unsigned int x) +{ + return (x != 0 && (x & x - 1) == 0); +} + +bool +stdc_has_single_bit_ul(unsigned long x) +{ + return (x != 0 && (x & x - 1) == 0); +} + +bool +stdc_has_single_bit_ull(unsigned long long x) +{ + return (x != 0 && (x & x - 1) == 0); +} diff --git a/lib/libc/stdbit/stdc_leading_ones.c b/lib/libc/stdbit/stdc_leading_ones.c new file mode 100644 index 000000000000..79d3ec7f2065 --- /dev/null +++ b/lib/libc/stdbit/stdc_leading_ones.c @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +/* Avoid triggering undefined behavior if x == 0. */ +static_assert(UCHAR_WIDTH < UINT_WIDTH, + "stdc_leading_ones_uc needs UCHAR_WIDTH < UINT_WIDTH"); + +unsigned int +stdc_leading_ones_uc(unsigned char x) +{ + const int offset = UINT_WIDTH - UCHAR_WIDTH; + + return (__builtin_clz(~(x << offset))); +} + +/* Avoid triggering undefined behavior if x == 0. */ +static_assert(USHRT_WIDTH < UINT_WIDTH, + "stdc_leading_ones_us needs USHRT_WIDTH < UINT_WIDTH"); + +unsigned int +stdc_leading_ones_us(unsigned short x) +{ + const int offset = UINT_WIDTH - USHRT_WIDTH; + + return (__builtin_clz(~(x << offset))); +} + +unsigned int +stdc_leading_ones_ui(unsigned int x) +{ + if (x == ~0U) + return (UINT_WIDTH); + + return (__builtin_clz(~x)); +} + +unsigned int +stdc_leading_ones_ul(unsigned long x) +{ + if (x == ~0UL) + return (ULONG_WIDTH); + + return (__builtin_clzl(~x)); +} + +unsigned int +stdc_leading_ones_ull(unsigned long long x) +{ + if (x == ~0ULL) + return (ULLONG_WIDTH); + + return (__builtin_clzll(~x)); +} diff --git a/lib/libc/stdbit/stdc_leading_zeros.c b/lib/libc/stdbit/stdc_leading_zeros.c new file mode 100644 index 000000000000..2fdf64ec93d4 --- /dev/null +++ b/lib/libc/stdbit/stdc_leading_zeros.c @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +/* Offset must be greater than zero. */ +static_assert(UCHAR_WIDTH < UINT_WIDTH, + "stdc_leading_zeros_uc needs UCHAR_WIDTH < UINT_WIDTH"); + +unsigned int +stdc_leading_zeros_uc(unsigned char x) +{ + const int offset = UINT_WIDTH - UCHAR_WIDTH; + + return (__builtin_clz((x << offset) + (1U << (offset - 1)))); +} + +/* Offset must be greater than zero. */ +static_assert(USHRT_WIDTH < UINT_WIDTH, + "stdc_leading_zeros_us needs USHRT_WIDTH < UINT_WIDTH"); *** 159 LINES SKIPPED *** From nobody Thu Jan 1 22:21: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 4dj1Wr640gz6Mnn7 for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wr3yLqz4B1v for ; Thu, 01 Jan 2026 22:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onEgPzAQ51MelLciw/E3WlrBeU4G+1cYLN1LtDTophc=; b=qe5ogEVMrLHuLK3loHha6KL3UoVdqLD9JiiAYfXwhwrHGJ7El2YQ5ncphKwHGTyF3OHFr/ TAOTeoKB9Q4Ncz9kIvJsy0fuiC/Fj+Ro6rt2BZzax5D6Kpmb5kqp/jNPLo+VAzRbKC1IvD LOQOvV9758D693LqTtlt9k6MqgwpuZjp58VZv7vepzOz4v/akmYQp9Z2aFWEhuv15MVBsG JiulijTMCrzsZO8GK5gWaruXJeawWkVHUT2HvolnN1qiBPuUI6J7rfF4tiPGlU8ziMtnge IHYOaqj7m6RR19crWFoVM+77WjC9hO8EYfc2s5I7pycuwvQ9lINyNDUO8b4H/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onEgPzAQ51MelLciw/E3WlrBeU4G+1cYLN1LtDTophc=; b=lCiU5RKrFZolshysUKcbJf8PKpC5xFXqQ9sBL3Y6J86VzntMJ6bPV1AOD18GdOBt2sv5k+ 1N/jeX4rK2Nm6f0TqDvWKfffhez02xQcbWCOh3fvrlnHrfR3aTINJbMftiAazzJbMD8x8f 8aLswOUjzumz28c0PyLpV9xQfti0ZHVn476lOQIIhPWnGnbLL2tCZo8UfA+S29Mqccs1VL svzGFIhlk/4uhFAn0qOv5jkn2LyFjlyoKpToOdb+ppSgvlJ3ZeE3TjC8DoUYAmkzPcNPMh Zpj+tWjH/R1bCWsX3ZmO7MVN71NN8xp+LJZUKb7dJkCOSdPFEY2BlGsUIta0VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306104; a=rsa-sha256; cv=none; b=R7nauLjH7hT6be5GLTu8TD/jeNu/ECavWWW5I08q7LOnfIKF52EFiRjTSUDSo3skio9y7e te1OJtvQxso2nOCMjClz7LILmu+QINnQX5tt9d4b0cQf8CeGxGUVLP0TISzHFpRtNmNgMW CqnU2SzmavCFPXm++Pb+crAhaYVcJvXp9tGfBjLkYudsfGs2PFpCoP26Hzzy75vIsDbUip UXY6hjlEvHtvsUrsyIQJBk2qdQ8jgs2vNF8Kmc3rRyajzfC/Y3ITXuuYjL6t9AeN49SSC7 CmafVWSwUpp5eZQFXVLG4vDgUFNFmlDY3c05s4yN6nQih0gcr9wfbjh47s/hzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wr3BXCzqZf for ; Thu, 01 Jan 2026 22:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f483 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 6b7ed283d4b4 - stable/15 - man/man3: add stdbit.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6b7ed283d4b40c4e17c35e2581b9c2329c8669b6 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:44 +0000 Message-Id: <6956f378.f483.58110c29@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b7ed283d4b40c4e17c35e2581b9c2329c8669b6 commit 6b7ed283d4b40c4e17c35e2581b9c2329c8669b6 Author: Robert Clausecker AuthorDate: 2025-11-18 17:33:04 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:32 +0000 man/man3: add stdbit.3 This is the overview man page for the functions. Reviewed by: pauamma@gundo.com, adrian Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53658 (cherry picked from commit d39e310c7d6a42b459aa7919310e3c99cc478d50) --- share/man/man3/Makefile | 1 + share/man/man3/stdbit.3 | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index bce57291f073..8e4aadc460a6 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -31,6 +31,7 @@ MAN= alloca.3 \ snl.3 \ stats.3 \ stdarg.3 \ + stdbit.3 \ stdckdint.3 \ sysexits.3 \ tgmath.3 \ diff --git a/share/man/man3/stdbit.3 b/share/man/man3/stdbit.3 new file mode 100644 index 000000000000..bdee56cc8013 --- /dev/null +++ b/share/man/man3/stdbit.3 @@ -0,0 +1,120 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDBIT 3 +.Os +.Sh NAME +.Nm stdbit +.Nd bit and byte utilities +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Fd #define __STDC_ENDIAN_LITTLE__ +.Fd #define __STDC_ENDIAN_BIG__ +.Fd #define __STDC_ENDIAN_NATIVE__ +.Ft unsigned int +.Fn stdc_count_leading_zeros "value" +.Ft unsigned int +.Fn stdc_count_leading_ones "value" +.Ft unsigned int +.Fn stdc_count_trailing_zeros "value" +.Ft unsigned int +.Fn stdc_count_trailing_ones "value" +.Ft unsigned int +.Fn stdc_first_leading_zero "value" +.Ft unsigned int +.Fn stdc_first_leading_one "value" +.Ft unsigned int +.Fn stdc_first_trailing_zero "value" +.Ft unsigned int +.Fn stdc_first_trailing_one "value" +.Ft unsigned int +.Fn stdc_count_zeros "value" +.Ft unsigned int +.Fn stdc_count_ones "value" +.Ft bool +.Fn stdc_has_single_bit "value" +.Ft unsigned int +.Fn stdc_bit_width "value" +.Ft typeof Ns Pq Em value +.Fn stdc_bit_floor "value" +.Ft typeof Ns Pq Em value +.Fn stdc_bit_ceil "value" +.Sh DESCRIPTION +The +.Dv __STDC_ENDIAN_NATIVE__ +macro describes the byte order or endianness of the machine for which the +program is built. +If the machine has big-endian byte order, this macro is equal to +.Dv __STDC_ENDIAN_BIG__ . +If the machine has little-endian byte order, this macro is equal to +.Dv __STDC_ENDIAN_LITTLE__ . +Otherwise, the macro has a value that is equal to neither. +.Pp +The bit and byte utility functions analyze the bits within a datum. +Each function +.Em func +is provided in five variants +.Nm stdc_ Ns Em func Ns Em _ Ns Em type Ns Pq Em value +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +Additionally, for each +.Em func , +a type-generic macro +.Nm stdc_ Ns Em func Ns Pq Em value +that picks the appropriate function +.Nm stdc_ Ns Em func Ns Em _ Ns Em type Ns Pq Em value +based on the type of +.Fa value +is provided. +.Sh SEE ALSO +.Xr arch 7 , +.Xr bitstring 3 , +.Xr ffs 3 , +.Xr fls 3 , +.Xr stdc_count_leading_zeros 3 , +.Xr stdc_count_leading_ones 3 , +.Xr stdc_count_trailing_zeros 3 , +.Xr stdc_count_trailing_ones 3 , +.Xr stdc_first_leading_zero 3 , +.Xr stdc_first_leading_one 3 , +.Xr stdc_first_trailing_zero 3 , +.Xr stdc_first_trailing_one 3 , +.Xr stdc_count_zeros 3 , +.Xr stdc_count_ones 3 , +.Xr stdc_has_single_bit 3 , +.Xr stdc_bit_width 3 , +.Xr stdc_bit_floor 3 , +.Xr stdc_bit_ceil 3 +.Sh STANDARDS +The macros and functions of the +.In stdbit.h +header conform to +.St -isoC-2023 . +.Sh HISTORY +The +.In stdbit.h +header and the macros and functions defined therein where added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org From nobody Thu Jan 1 22:21: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 4dj1Wt3CSCz6Mnww for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Ws4X1tz3Bpb for ; Thu, 01 Jan 2026 22:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAuZE2PyBNgf4RWEnq4NCV3E7uTu6oDbQUBseoV3rHQ=; b=u9jHebMvx05Bd6uojeAMfHn6FszYdkC+E6hn+yAHfyIQy68MHZfYc972h1yUtxOBi46sm5 gF7X7WlMTZTd+eUcNvpTHM/jSvyiY68Pdf/85PHfutGB6BKnnAtjSGDuJHcUmEfToA90SN IBMvcgiiHAu/iRM2jsdrtEf+qtDQb5bnjQmRJRs1Qlmk5qLJnVAPzpXyCIhfxPNlqZptEa NRrcZ/yFWEwWLrN+W7ufcthh5dgVKIAy0snktvZP82qnaZGtMfVfLP+MPHYohAMKt5Pc5d LLHF4uwOBVFdcaPp9hCUThUijW171/Y0xOQASopXY+ujxFxZKRhav2wCo4fihw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAuZE2PyBNgf4RWEnq4NCV3E7uTu6oDbQUBseoV3rHQ=; b=DoJHWId5VHyhFENCPazXfAkQ1Qet7Q/D1UtCm/x3HBZHKqddmcoMR8IWw1mU0EQZwtlCmk 6V+PuHKUx8AXUEzTclnk1Rx5vLEWEwiH9H5cjyyvam5kEhk+97sfBrpyyAIgeojcz99PQQ fw+55/vmRSWzJXpzjQgmH8zXNWMV05dxjra+T/H7G5vjxaTstx0yJTf7+9BN4BJoqpCi9P 3KVX+0e0VGcnHSWzCzLNZM38isdhoGVqAIx3Qt9iuBPsTMplRcSm9zg54VS20cdtaqNutQ cQ9HoraP9nlD3jVxSxRx+GDKY8DKEn7LZNV3cF/zfgrtjWs2/Y9SACAjptg6iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306105; a=rsa-sha256; cv=none; b=MObut3ihfBov8bldiPaD9WwxrH5gyTVlZBmlFL/AwgNZE5qLj8u8s8Gjyf5N2o9j9dyrWG uV3aXRTsUUiLQw/IZoe97KRSNXSOWEfhy8oyo6lKuTI3Ng6J7T2hnp2ZNZBi/Dr6lxOCee 3tKMZQNCeJqLjvro/l2b+kCkQI+6yDdLqIK11dVKcZw6NaMDP74xtSLZZdIA54pNfYhaZp UZVTOsMBfBW5jP3s5kipXsX6XKkdMyYYfIjBUTEQY2yCx9Z+iZIGSI2/g5ZAZV4dEDx4P1 Zm0gdik5Ci6CkiQB6CalZO6kHGPfSVxWkUXT7HNIft1yeWbifLdWDpX6iB3rLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Ws42vJzr1g for ; Thu, 01 Jan 2026 22:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f487 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 27de6568a3ec - stable/15 - libc/stdbit: add man pages for stdbit 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 27de6568a3ec482804f7541afa219a9292f2c696 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:45 +0000 Message-Id: <6956f379.f487.562703ea@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=27de6568a3ec482804f7541afa219a9292f2c696 commit 27de6568a3ec482804f7541afa219a9292f2c696 Author: Robert Clausecker AuthorDate: 2025-11-18 17:31:07 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:32 +0000 libc/stdbit: add man pages for stdbit functions This adds man pages for each group of functions in . The man pages have cross references to one-another. Cross references from external man pages to these will be added in a later commit. Reviewed by: pauamma@gundo.com, kib Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53659 (cherry picked from commit d790b16bbf0c3055ef00200d01659dfb3c0e5e5e) --- lib/libc/stdbit/Makefile.inc | 15 ++++ lib/libc/stdbit/stdc_bit_ceil.3 | 81 +++++++++++++++++++++ lib/libc/stdbit/stdc_bit_floor.3 | 83 ++++++++++++++++++++++ lib/libc/stdbit/stdc_bit_width.3 | 104 +++++++++++++++++++++++++++ lib/libc/stdbit/stdc_count_ones.3 | 85 ++++++++++++++++++++++ lib/libc/stdbit/stdc_count_zeros.3 | 84 ++++++++++++++++++++++ lib/libc/stdbit/stdc_first_leading_one.3 | 93 ++++++++++++++++++++++++ lib/libc/stdbit/stdc_first_leading_zero.3 | 92 ++++++++++++++++++++++++ lib/libc/stdbit/stdc_first_trailing_one.3 | 110 +++++++++++++++++++++++++++++ lib/libc/stdbit/stdc_first_trailing_zero.3 | 93 ++++++++++++++++++++++++ lib/libc/stdbit/stdc_has_single_bit.3 | 98 +++++++++++++++++++++++++ lib/libc/stdbit/stdc_leading_ones.3 | 86 ++++++++++++++++++++++ lib/libc/stdbit/stdc_leading_zeros.3 | 86 ++++++++++++++++++++++ lib/libc/stdbit/stdc_trailing_ones.3 | 86 ++++++++++++++++++++++ lib/libc/stdbit/stdc_trailing_zeros.3 | 87 +++++++++++++++++++++++ 15 files changed, 1283 insertions(+) diff --git a/lib/libc/stdbit/Makefile.inc b/lib/libc/stdbit/Makefile.inc index 2ea96d2b6dfe..fceccb12b589 100644 --- a/lib/libc/stdbit/Makefile.inc +++ b/lib/libc/stdbit/Makefile.inc @@ -17,3 +17,18 @@ SRCS+= stdc_bit_ceil.c \ stdc_trailing_zeros.c SYM_MAPS+=${LIBC_SRCTOP}/stdbit/Symbol.map + +MAN+= stdc_bit_ceil.3 \ + stdc_bit_floor.3 \ + stdc_bit_width.3 \ + stdc_count_ones.3 \ + stdc_count_zeros.3 \ + stdc_first_leading_one.3 \ + stdc_first_leading_zero.3 \ + stdc_first_trailing_one.3 \ + stdc_first_trailing_zero.3 \ + stdc_has_single_bit.3 \ + stdc_leading_ones.3 \ + stdc_leading_zeros.3 \ + stdc_trailing_ones.3 \ + stdc_trailing_zeros.3 diff --git a/lib/libc/stdbit/stdc_bit_ceil.3 b/lib/libc/stdbit/stdc_bit_ceil.3 new file mode 100644 index 000000000000..470b255f471e --- /dev/null +++ b/lib/libc/stdbit/stdc_bit_ceil.3 @@ -0,0 +1,81 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_BIT_CEIL 3 +.Os +.Sh NAME +.Nm stdc_bit_ceil +.Nd round up to the next power of\~2 +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned char +.Fn stdc_bit_ceil_uc "unsigned char value" +.Ft unsigned short +.Fn stdc_bit_ceil_us "unsigned short value" +.Ft unsigned int +.Fn stdc_bit_ceil_ui "unsigned int value" +.Ft unsigned long +.Fn stdc_bit_ceil_ul "unsigned long value" +.Ft unsigned long long +.Fn stdc_bit_ceil_ull "unsigned long long value" +.Ft typeof Ns Pq Em value +.Fn stdc_bit_ceil "value" +.Sh DESCRIPTION +The +.Nm stdc_bit_ceil_ Ns Em type Ns () +family of functions rounds +.Fa value +up to the next power of\~2, where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_bit_ceil "value" +type-generic macro picks the appropriate +.Nm stdc_bit_ceil_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns +.Fa value +round up to the next power of\~2. +If this value is not representable, +0\~is returned. +.Sh SEE ALSO +.Xr stdbit 3 , +.Xr stdc_bit_floor 3 +.Sh STANDARDS +The +.Nm stdc_bit_ceil_ Ns Em type Ns () +family of functions and the +.Fn stdc_bit_ceil +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_bit_ceil_ Ns Em type Ns () +family of functions and the +.Fn stdc_bit_ceil +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_bit_floor.3 b/lib/libc/stdbit/stdc_bit_floor.3 new file mode 100644 index 000000000000..3e90c34f070f --- /dev/null +++ b/lib/libc/stdbit/stdc_bit_floor.3 @@ -0,0 +1,83 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_BIT_FLOOR 3 +.Os +.Sh NAME +.Nm stdc_bit_floor +.Nd round down to the previous power of\~2 +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned char +.Fn stdc_bit_floor_uc "unsigned char value" +.Ft unsigned short +.Fn stdc_bit_floor_us "unsigned short value" +.Ft unsigned int +.Fn stdc_bit_floor_ui "unsigned int value" +.Ft unsigned long +.Fn stdc_bit_floor_ul "unsigned long value" +.Ft unsigned long long +.Fn stdc_bit_floor_ull "unsigned long long value" +.Ft typeof Ns Pq Em value +.Fn stdc_bit_floor "value" +.Sh DESCRIPTION +The +.Nm stdc_bit_floor_ Ns Em type Ns () +family of functions rounds +.Fa value +down to the previous power of\~2, where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_bit_floor "value" +type-generic macro picks the appropriate +.Nm stdc_bit_floor_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns +.Fa value +round down to the previous power of\~2. +If +.Fa value +is equal to zero, +zero is returned. +.Sh SEE ALSO +.Xr stdbit 3 , +.Xr stdc_bit_ceil 3 +.Sh STANDARDS +The +.Nm stdc_bit_floor_ Ns Em type Ns () +family of functions and the +.Fn stdc_bit_floor +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_bit_floor_ Ns Em type Ns () +family of functions and the +.Fn stdc_bit_floor +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_bit_width.3 b/lib/libc/stdbit/stdc_bit_width.3 new file mode 100644 index 000000000000..8d59886818d3 --- /dev/null +++ b/lib/libc/stdbit/stdc_bit_width.3 @@ -0,0 +1,104 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_BIT_WIDTH 3 +.Os +.Sh NAME +.Nm stdc_bit_width +.Nd find the first trailing one in an intege +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_bit_width_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_bit_width_us "unsigned short value" +.Ft unsigned int +.Fn stdc_bit_width_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_bit_width_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_bit_width_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_bit_width "value" +.Sh DESCRIPTION +The +.Nm stdc_bit_width_ Ns Em type Ns () +family of functions returns the number of bits needed to represent +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_bit_width "value" +type-generic macro picks the appropriate +.Nm stdc_bit_width_ Ns Em type Ns () +function based on the type of +.Fa value . +.Pp +Functions +.Fn stdc_bit_width_ui , +.Fn stdc_bit_width_ul , +and +.Fn stdc_bit_width_ull +are identical to +.Bx 4.3 +functions +.Xr fls 3 , +.Xr flsl 3 , +and +.Xr flsll 3 +respectively, except for operating on unsigned instead of signed values. +.Sh RETURN VALUES +Returns the least number of bits needed to represent +.Fa value . +If +.Fa value +is zero, the return value is zero. +Otherwise it is +.EQ +1 + \(lf log sub 2 italic value \(rf . +.EN +.Sh SEE ALSO +.Xr bit_fls 3 , +.Xr fls 3 , +.Xr flsl 3 , +.Xr flsll 3 , +.Xr stdbit 3 , +.Xr stdc_count_leading_zeros 3 , +.Xr stdc_first_leading_one 3 +.Sh STANDARDS +The +.Nm stdc_bit_width_ Ns Em type Ns () +family of functions and the +.Fn stdc_bit_width +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_bit_width_ Ns Em type Ns () +family of functions and the +.Fn stdc_bit_width +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_count_ones.3 b/lib/libc/stdbit/stdc_count_ones.3 new file mode 100644 index 000000000000..6de92216c24b --- /dev/null +++ b/lib/libc/stdbit/stdc_count_ones.3 @@ -0,0 +1,85 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_COUNT_ONES 3 +.Os +.Sh NAME +.Nm stdc_count_ones +.Nd count the ones in an integer +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_count_ones_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_count_ones_us "unsigned short value" +.Ft unsigned int +.Fn stdc_count_ones_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_count_ones_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_count_ones_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_count_ones "value" +.Sh DESCRIPTION +The +.Nm stdc_count_ones_ Ns Em type Ns () +family of functions returns the number of bits set to\~1 in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +This is also known as the +.Dq population count +(popcount) or +.Dq Hamming weight +operation. +The +.Fn stdc_count_ones "value" +type-generic macro picks the appropriate +.Nm stdc_count_ones_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns the number of bits set to\~1 in +.Fa value . +.Sh SEE ALSO +.Xr bit_count 3 , +.Xr stdbit 3 , +.Xr stdc_count_zeros 3 , +.Xr stdc_has_single_bit 3 +.Sh STANDARDS +The +.Nm stdc_count_ones_ Ns Em type Ns () +family of functions and the +.Fn stdc_count_ones +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_count_ones_ Ns Em type Ns () +family of functions and the +.Fn stdc_count_ones +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_count_zeros.3 b/lib/libc/stdbit/stdc_count_zeros.3 new file mode 100644 index 000000000000..762ba62d3793 --- /dev/null +++ b/lib/libc/stdbit/stdc_count_zeros.3 @@ -0,0 +1,84 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_COUNT_ZEROS 3 +.Os +.Sh NAME +.Nm stdc_count_zeros +.Nd count the zeros in an integer +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_count_zeros_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_count_zeros_us "unsigned short value" +.Ft unsigned int +.Fn stdc_count_zeros_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_count_zeros_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_count_zeros_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_count_zeros "value" +.Sh DESCRIPTION +The +.Nm stdc_count_zeros_ Ns Em type Ns () +family of functions returns the number of bits set to\~0 in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +This is also known as the +.Dq population count +(popcount) or +.Dq Hamming weight +of the complement of +.Fa value . +The +.Fn stdc_count_zeros "value" +type-generic macro picks the appropriate +.Nm stdc_count_zeros_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns the number of bits set to\~0 in +.Fa value . +.Sh SEE ALSO +.Xr stdbit 3 , +.Xr stdc_count_ones 3 +.Sh STANDARDS +The +.Nm stdc_count_zeros_ Ns Em type Ns () +family of functions and the +.Fn stdc_count_zeros +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_count_zeros_ Ns Em type Ns () +family of functions and the +.Fn stdc_count_zeros +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_first_leading_one.3 b/lib/libc/stdbit/stdc_first_leading_one.3 new file mode 100644 index 000000000000..48f62d997043 --- /dev/null +++ b/lib/libc/stdbit/stdc_first_leading_one.3 @@ -0,0 +1,93 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_FIRST_LEADING_ONE 3 +.Os +.Sh NAME +.Nm stdc_first_leading_one +.Nd find the first leading one in an integer +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_first_leading_one_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_first_leading_one_us "unsigned short value" +.Ft unsigned int +.Fn stdc_first_leading_one_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_first_leading_one_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_first_leading_one_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_first_leading_one "value" +.Sh DESCRIPTION +The +.Nm stdc_first_leading_one_ Ns Em type Ns () +family of functions returns the index of the most significant set bit in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_first_leading_one "value" +type-generic macro picks the appropriate +.Nm stdc_first_leading_one_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns the index of the most significant set bit in +.Fa value . +The bits are numbered such that the most significant bit has number\~1, +and the least significant bit has number +.Ms w +where +.Ms w +is the number of bits in the type of +.Fa value . +If no bits are set in +.Fa value +(i.\^e.\& +.Fa value +is zero), zero is returned. +.Sh SEE ALSO +.Xr fls 3 , +.Xr stdbit 3 , +.Xr stdc_leading_zeros 3 , +.Xr stdc_first_leading_zero 3 , +.Xr stdc_first_trailing_one 3 +.Sh STANDARDS +The +.Nm stdc_first_leading_one_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_leading_one +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_first_leading_one_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_leading_one +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_first_leading_zero.3 b/lib/libc/stdbit/stdc_first_leading_zero.3 new file mode 100644 index 000000000000..317b6263acb0 --- /dev/null +++ b/lib/libc/stdbit/stdc_first_leading_zero.3 @@ -0,0 +1,92 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_FIRST_LEADING_ZERO 3 +.Os +.Sh NAME +.Nm stdc_first_leading_zero +.Nd find the first leading zero in an integer +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_first_leading_zero_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_first_leading_zero_us "unsigned short value" +.Ft unsigned int +.Fn stdc_first_leading_zero_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_first_leading_zero_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_first_leading_zero_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_first_leading_zero "value" +.Sh DESCRIPTION +The +.Nm stdc_first_leading_zero_ Ns Em type Ns () +family of functions returns the index of the most significant clear bit in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_first_leading_zero "value" +type-generic macro picks the appropriate +.Nm stdc_first_leading_zero_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns the index of the most significant clear bit in +.Fa value . +The bits are numbered such that the most significant bit has number\~1, +and the least significant bit has number +.Ms w +where +.Ms w +is the number of bits in the type of +.Fa value . +If no bits are clear in +.Fa value +(i.\^e.\& +.Fa value +is the bitwise complement of zero), zero is returned. +.Sh SEE ALSO +.Xr stdbit 3 , +.Xr stdc_leading_ones 3 , +.Xr stdc_first_leading_ones 3 , +.Xr stdc_first_trailing_zero 3 +.Sh STANDARDS +The +.Nm stdc_first_leading_zero_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_leading_zero +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_first_leading_zero_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_leading_zero +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_first_trailing_one.3 b/lib/libc/stdbit/stdc_first_trailing_one.3 new file mode 100644 index 000000000000..0b590ac39732 --- /dev/null +++ b/lib/libc/stdbit/stdc_first_trailing_one.3 @@ -0,0 +1,110 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_FIRST_TRAILING_ONE 3 +.Os +.Sh NAME +.Nm stdc_first_trailing_one +.Nd find the first trailing one in an integer +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_first_trailing_one_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_first_trailing_one_us "unsigned short value" +.Ft unsigned int +.Fn stdc_first_trailing_one_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_first_trailing_one_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_first_trailing_one_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_first_trailing_one "value" +.Sh DESCRIPTION +The +.Nm stdc_first_trailing_one_ Ns Em type Ns () +family of functions returns the index of the least significant set bit in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_first_trailing_one "value" +type-generic macro picks the appropriate +.Nm stdc_first_trailing_one_ Ns Em type Ns () +function based on the type of +.Fa value . +.Pp +Functions +.Fn stdc_first_trailing_one_ui , +.Fn stdc_first_trailing_one_ul , +and +.Fn stdc_first_trailing_one_ull +are identical to +.Bx 4.3 +functions +.Xr ffs 3 , +.Xr ffsl 3 , +and +.Xr ffsll 3 +respectively, except for operating on unsigned instead of signed values. +.Sh RETURN VALUES +Returns the index of the least significant set bit in +.Fa value . +The bits are numbered such that the least significant bit has number\~1, +and the most significant bit has number +.Ms w +where +.Ms w +is the number of bits in the type of +.Fa value . +If no bits are set in +.Fa value +(i.\^e.\& +.Fa value +is zero), one is returned. +.Sh SEE ALSO +.Xr bit_ffs 3 , +.Xr ffs 3 , +.Xr ffsl 3 , +.Xr ffsll 3 , +.Xr stdbit 3 , +.Xr stdc_trailing_zeros 3 , +.Xr stdc_first_trailing_zero 3 , +.Xr stdc_first_leading_one 3 +.Sh STANDARDS +The +.Nm stdc_first_trailing_one_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_trailing_one +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_first_trailing_one_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_trailing_one +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_first_trailing_zero.3 b/lib/libc/stdbit/stdc_first_trailing_zero.3 new file mode 100644 index 000000000000..bc4f7982d765 --- /dev/null +++ b/lib/libc/stdbit/stdc_first_trailing_zero.3 @@ -0,0 +1,93 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_FIRST_TRAILING_ZERO 3 +.Os +.Sh NAME +.Nm stdc_first_trailing_zero +.Nd find the first trailing zero in an integer +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft unsigned int +.Fn stdc_first_trailing_zero_uc "unsigned char value" +.Ft unsigned int +.Fn stdc_first_trailing_zero_us "unsigned short value" +.Ft unsigned int +.Fn stdc_first_trailing_zero_ui "unsigned int value" +.Ft unsigned int +.Fn stdc_first_trailing_zero_ul "unsigned long value" +.Ft unsigned int +.Fn stdc_first_trailing_zero_ull "unsigned long long value" +.Ft unsigned int +.Fn stdc_first_trailing_zero "value" +.Sh DESCRIPTION +The +.Nm stdc_first_trailing_zero_ Ns Em type Ns () +family of functions returns the index of the least significant clear bit in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , +.Va unsigned long , +or +.Va unsigned long long +for +.Em type +being +.Sy uc , +.Sy us , +.Sy ui , +.Sy ul , +or +.Sy ull +respectively. +The +.Fn stdc_first_trailing_zero "value" +type-generic macro picks the appropriate +.Nm stdc_first_trailing_zero_ Ns Em type Ns () +function based on the type of +.Fa value . +.Sh RETURN VALUES +Returns the index of the least significant clear bit in +.Fa value . +The bits are numbered such that the least significant bit has number\~1, +and the most significant bit has number +.Ms w +where +.Ms w +is the number of bits in the type of +.Fa value . +If no bits are clear in +.Fa value +(i.\^e.\& +.Fa value +is the bitwise complement of zero), zero is returned. +.Sh SEE ALSO +.Xr bit_ffc 3 , +.Xr stdbit 3 , +.Xr stdc_trailing_ones 3 , +.Xr stdc_first_trailing_ones 3 , +.Xr stdc_first_leading_zero 3 +.Sh STANDARDS +The +.Nm stdc_first_trailing_zero_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_trailing_zero +type-generic macro conform to +.St -isoC-2023 . +.Sh HISTORY +The +.Nm stdc_first_trailing_zero_ Ns Em type Ns () +family of functions and the +.Fn stdc_first_trailing_zero +type-generic macro were added in +.Fx 15.1. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org diff --git a/lib/libc/stdbit/stdc_has_single_bit.3 b/lib/libc/stdbit/stdc_has_single_bit.3 new file mode 100644 index 000000000000..8f82c552216a --- /dev/null +++ b/lib/libc/stdbit/stdc_has_single_bit.3 @@ -0,0 +1,98 @@ +.\" +.\" Copyright (c) 2025 Robert Clausecker +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt STDC_HAS_SINGLE_BIT 3 +.Os +.Sh NAME +.Nm stdc_has_single_bit +.Nd check for single bit set +.Sh SYNOPSIS +.Lb libc +.In stdbit.h +.Ft bool +.Fn stdc_has_single_bit_uc "unsigned char value" +.Ft bool +.Fn stdc_has_single_bit_us "unsigned short value" +.Ft bool +.Fn stdc_has_single_bit_ui "unsigned int value" +.Ft bool +.Fn stdc_has_single_bit_ul "unsigned long value" +.Ft bool +.Fn stdc_has_single_bit_ull "unsigned long long value" +.Ft bool +.Fn stdc_has_single_bit "value" +.Sh DESCRIPTION +The +.Nm stdc_has_single_bit_ Ns Em type Ns () +family of functions checks if there is exactly one bit +set in +.Fa value , +where +.Fa value +is of type +.Va unsigned char , +.Va unsigned short , +.Va unsigned int , *** 429 LINES SKIPPED *** From nobody Thu Jan 1 22:21: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 4dj1Wv1h0bz6Lpn7 for ; Thu, 01 Jan 2026 22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wt5Kkvz3Bvk for ; Thu, 01 Jan 2026 22:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q9CPJR2k3VXDUD6PXWftyuJQfA6A2pLDbKrHymzLseg=; b=y1F93EtzQIk5q7kaOv+oNkzajyK9kRjAk/qXVulKfA/vClcKsrtxejji3yglVvnePUvlis aabjnLkK7U8y73b8d0qmNeN1U3YH/m6F7cNnYSCKCRT7j8nW3OVdPhI3nBN3Z9mysS6CX+ uUpXna+kM38UvGNgJnJka9hXt5YIY1iIPaSrSFlOZiUpsO6DshD7cM7zHue0dYW2tiJBiE oNyuD6cmsZDPvX7Sr5wv601brvMOKIe2bjVGTCztT9dF0hw5uuBzJtDcm7K6oz/CjBMeR7 XaHmJkE+643JmB/YccDcf2v5S5c6cQf/tR1UKdmSxnsNzEs2/HUN4EOQI0UAVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q9CPJR2k3VXDUD6PXWftyuJQfA6A2pLDbKrHymzLseg=; b=M2gaJOcVsJhvq8mvgmEYqfZ4NEBC/8p2En+dTZh/h9+iEgdIQtSGNhp9o2Y/Obk7PaWY6u OW/eV0B0JxK6VNYlGqqJUCZRiQsUekrQ9Hg5ciYn6D006aVEBF6owgYLvdVhkQd93VL0jQ ZVBRSOjJNOOZgIhGUFsVbkddA1izZAaDvHi+/gKk6narsOx63dnYZt2iNYijqShRGp/qlf 8zsgxhf4fu0hDaRIskDnp+4iGKGXWFCfztkICLrVZSfUOrtB96+iT/S817FCPWoA8PL2CN wcoTkx25hbk7tp/Pfj+Po6BIJAYlMIzPH/ilA53FtfEnbqwQbUmZlN8Swg45Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306106; a=rsa-sha256; cv=none; b=Sg904tYTMueCfCNas32aaH4lzChAD2LGYILjrpvWFvegQxnuyqiGdXzDtYb2Ly4QkKesEN TCw93sCvuq0lpm9V5ooNg8wGqf1vGrEMLZdfwSbUdyLkaOZ6ifIlc3/6bO+dkvPxiM9d68 SVl9Sxx5GDWuTRJyx16NZLTvz7cpkcN8PFIirgjnyRIQUCZYlGasaIqykwZL51MRE6YU1/ dYclTVj4fzkNKsJ+IKPHN1EPql10Tgos9+v3YTe8gZ0xSGXcyVfmFDOWMzkJuiru1xeYhd 1Kpn5uwztnN/12ZjzjJ9h1pHmNyCpTp19lhcSsJWjRN8lZw0bfWHDr49kxf55w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wt4t47zrrw for ; Thu, 01 Jan 2026 22:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c958 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: c9ec3fc0d507 - stable/15 - libc/tests: add stdbit test framework and unit tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c9ec3fc0d5072b2d23d7d3dbd6dd2cedf4c7938d Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:46 +0000 Message-Id: <6956f37a.c958.600f3a71@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c9ec3fc0d5072b2d23d7d3dbd6dd2cedf4c7938d commit c9ec3fc0d5072b2d23d7d3dbd6dd2cedf4c7938d Author: Robert Clausecker AuthorDate: 2025-11-18 17:33:12 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:32 +0000 libc/tests: add stdbit test framework and unit tests This adds unit tests for all 70 functions in . I'm sorry for the test framework, but it makes it so I don't have to write 70 unit tests by hand. Reviewed by: adrian, des Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53660 (cherry picked from commit 2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044) --- etc/mtree/BSD.tests.dist | 2 + lib/libc/tests/Makefile | 1 + lib/libc/tests/stdbit/Makefile | 19 +++++ lib/libc/tests/stdbit/stdbit-test-framework.c | 80 ++++++++++++++++++++++ lib/libc/tests/stdbit/stdbit-test-kernel.c | 68 ++++++++++++++++++ lib/libc/tests/stdbit/stdc_bit_ceil_test.c | 20 ++++++ lib/libc/tests/stdbit/stdc_bit_floor_test.c | 25 +++++++ lib/libc/tests/stdbit/stdc_bit_width_test.c | 22 ++++++ lib/libc/tests/stdbit/stdc_count_ones_test.c | 22 ++++++ lib/libc/tests/stdbit/stdc_count_zeros_test.c | 23 +++++++ .../tests/stdbit/stdc_first_leading_one_test.c | 29 ++++++++ .../tests/stdbit/stdc_first_leading_zero_test.c | 30 ++++++++ .../tests/stdbit/stdc_first_trailing_one_test.c | 26 +++++++ .../tests/stdbit/stdc_first_trailing_zero_test.c | 27 ++++++++ lib/libc/tests/stdbit/stdc_has_single_bit_test.c | 21 ++++++ lib/libc/tests/stdbit/stdc_leading_ones_test.c | 26 +++++++ lib/libc/tests/stdbit/stdc_leading_zeros_test.c | 26 +++++++ lib/libc/tests/stdbit/stdc_trailing_ones_test.c | 23 +++++++ lib/libc/tests/stdbit/stdc_trailing_zeros_test.c | 23 +++++++ 19 files changed, 513 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 641846ebb603..89f98f5d9a29 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -382,6 +382,8 @@ .. ssp .. + stdbit + .. stdio .. stdlib diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile index 975c895770ee..ae8e0e937676 100644 --- a/lib/libc/tests/Makefile +++ b/lib/libc/tests/Makefile @@ -14,6 +14,7 @@ TESTS_SUBDIRS+= resolv TESTS_SUBDIRS+= rpc TESTS_SUBDIRS+= secure TESTS_SUBDIRS+= setjmp +TESTS_SUBDIRS+= stdbit TESTS_SUBDIRS+= stdio TESTS_SUBDIRS+= stdlib TESTS_SUBDIRS+= stdtime diff --git a/lib/libc/tests/stdbit/Makefile b/lib/libc/tests/stdbit/Makefile new file mode 100644 index 000000000000..37450056007a --- /dev/null +++ b/lib/libc/tests/stdbit/Makefile @@ -0,0 +1,19 @@ +# ensure libc functions are tested, not clang's builtins +CFLAGS+= -fno-builtin + +ATF_TESTS_C+= stdc_bit_ceil_test \ + stdc_bit_floor_test \ + stdc_bit_width_test \ + stdc_count_ones_test \ + stdc_count_zeros_test \ + stdc_first_leading_one_test \ + stdc_first_leading_zero_test \ + stdc_first_trailing_one_test \ + stdc_first_trailing_zero_test \ + stdc_has_single_bit_test \ + stdc_leading_ones_test \ + stdc_leading_zeros_test \ + stdc_trailing_ones_test \ + stdc_trailing_zeros_test + +.include diff --git a/lib/libc/tests/stdbit/stdbit-test-framework.c b/lib/libc/tests/stdbit/stdbit-test-framework.c new file mode 100644 index 000000000000..368b38fb4745 --- /dev/null +++ b/lib/libc/tests/stdbit/stdbit-test-framework.c @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * Test framework for stdbit functions. + * Requires the following macros to be defined: + * + * FUNCSTEM -- name of the function without type suffix + * MKREFFUNC(name, type) -- macro to generate a reference + * implementation of the function as a static function + * named name with give argument type. + */ + +#include +#include +#include +#include +#include + +#define ATF_TC_WITHOUT_HEAD1(stem, suffix) ATF_TC_WITHOUT_HEAD2(__CONCAT(stem, suffix)) +#define ATF_TC_WITHOUT_HEAD2(case) ATF_TC_WITHOUT_HEAD(case) +#define ATF_TC_BODY1(stem, suffix, tc) ATF_TC_BODY2(__CONCAT(stem, suffix), tc) +#define ATF_TC_BODY2(case, tc) ATF_TC_BODY(case, tc) + +#define SUFFIX _uc +#define TYPE unsigned char +#define TYPE_WIDTH UCHAR_WIDTH +#include "stdbit-test-kernel.c" +#undef TYPE_WIDTH +#undef TYPE +#undef SUFFIX + +#define SUFFIX _us +#define TYPE unsigned short +#define TYPE_WIDTH USHRT_WIDTH +#include "stdbit-test-kernel.c" +#undef TYPE_WIDTH +#undef TYPE +#undef SUFFIX + +#define SUFFIX _ui +#define TYPE unsigned int +#define TYPE_WIDTH UINT_WIDTH +#include "stdbit-test-kernel.c" +#undef TYPE_WIDTH +#undef TYPE +#undef SUFFIX + +#define SUFFIX _ul +#define TYPE unsigned long +#define TYPE_WIDTH ULONG_WIDTH +#include "stdbit-test-kernel.c" +#undef TYPE_WIDTH +#undef TYPE +#undef SUFFIX + +#define SUFFIX _ull +#define TYPE unsigned long long +#define TYPE_WIDTH ULLONG_WIDTH +#include "stdbit-test-kernel.c" +#undef TYPE_WIDTH +#undef TYPE +#undef SUFFIX + +#define ADD_CASE(stem, suffix) ADD_CASE1(__CONCAT(stem, suffix)) +#define ADD_CASE1(case) ATF_TP_ADD_TC(tp, case) + +ATF_TP_ADD_TCS(tp) +{ + ADD_CASE(FUNCSTEM, _uc); + ADD_CASE(FUNCSTEM, _us); + ADD_CASE(FUNCSTEM, _ui); + ADD_CASE(FUNCSTEM, _ul); + ADD_CASE(FUNCSTEM, _ull); + + return (atf_no_error()); +} diff --git a/lib/libc/tests/stdbit/stdbit-test-kernel.c b/lib/libc/tests/stdbit/stdbit-test-kernel.c new file mode 100644 index 000000000000..d584e391ff6f --- /dev/null +++ b/lib/libc/tests/stdbit/stdbit-test-kernel.c @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * test kernel for stdbit functions. + * Requires the following macros to be defined: + * + * FUNCSTEM -- stem of the function name + * SUFFIX -- type suffic + * TYPE -- argument type + * MKREFFUNC(ref, type) -- reference function builder + */ + +#define FUNC __CONCAT(FUNCSTEM, SUFFIX) +#define REF __CONCAT(FUNCSTEM, __CONCAT(SUFFIX, _ref)) + +MKREFFUNC(REF, TYPE) + +ATF_TC_WITHOUT_HEAD1(FUNCSTEM, SUFFIX); +ATF_TC_BODY1(FUNCSTEM, SUFFIX, tc) +{ + uintmax_t has, want; + size_t i, j; + TYPE value; + + /* test all single-bit patterns */ + for (i = 0; i < TYPE_WIDTH; i++) { + value = (TYPE)1 << i; + has = FUNC(value); + want = REF(value); + ATF_CHECK_EQ_MSG(has, want, "%s(%#jx) == %#jx != %#jx == %s(%#jx)", + __XSTRING(FUNC), (uintmax_t)value, has, want, __XSTRING(REF), (uintmax_t)value); + } + + /* test all double-bit patterns */ + for (i = 0; i < TYPE_WIDTH; i++) { + for (j = 0; j < i; j++) { + value = (TYPE)1 << i | (TYPE)1 << j; + has = FUNC(value); + want = REF(value); + ATF_CHECK_EQ_MSG(has, want, "%s(%#jx) == %#jx != %#jx == %s(%#jx)", + __XSTRING(FUNC), (uintmax_t)value, has, want, __XSTRING(REF), (uintmax_t)value); + } + } + + /* test all barber-pole patterns */ + value = ~(TYPE)0; + for (i = 0; i < TYPE_WIDTH; i++) { + has = FUNC(value); + want = REF(value); + ATF_CHECK_EQ_MSG(has, want, "%s(%#jx) == %#jx != %#jx == %s(%#jx)", + __XSTRING(FUNC), (uintmax_t)value, has, want, __XSTRING(REF), (uintmax_t)value); + + value = ~value; + has = FUNC(value); + want = REF(value); + ATF_CHECK_EQ_MSG(has, want, "%s(%#jx) == %#jx != %#jx == %s(%#jx)", + __XSTRING(FUNC), (uintmax_t)value, has, want, __XSTRING(REF), (uintmax_t)value); + + value = ~value << 1; + } +} + +#undef REF +#undef FUNC diff --git a/lib/libc/tests/stdbit/stdc_bit_ceil_test.c b/lib/libc/tests/stdbit/stdc_bit_ceil_test.c new file mode 100644 index 000000000000..0495da55c5d9 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_bit_ceil_test.c @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_bit_ceil +#define MKREFFUNC(name, type) \ + static type \ + name(type value) \ + { \ + type ceil = 1; \ + \ + while (ceil < value && ceil != 0) \ + ceil <<= 1; \ + \ + return (ceil); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_bit_floor_test.c b/lib/libc/tests/stdbit/stdc_bit_floor_test.c new file mode 100644 index 000000000000..a2c5b5f7d8ce --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_bit_floor_test.c @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_bit_floor +#define MKREFFUNC(name, type) \ + static type \ + name(type value) \ + { \ + type floor = 1; \ + \ + if (value == 0) \ + return (0); \ + \ + while (value != 1) { \ + floor <<= 1; \ + value >>= 1; \ + } \ + \ + return (floor); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_bit_width_test.c b/lib/libc/tests/stdbit/stdc_bit_width_test.c new file mode 100644 index 000000000000..bfcb2b3bd779 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_bit_width_test.c @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_bit_width +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + unsigned width = 0; \ + \ + while (value != 0) { \ + value >>= 1; \ + width++; \ + } \ + \ + return (width); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_count_ones_test.c b/lib/libc/tests/stdbit/stdc_count_ones_test.c new file mode 100644 index 000000000000..9093edde495b --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_count_ones_test.c @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_count_ones +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + unsigned count = 0; \ + \ + while (value != 0) { \ + count += value & 1; \ + value >>= 1; \ + } \ + \ + return (count); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_count_zeros_test.c b/lib/libc/tests/stdbit/stdc_count_zeros_test.c new file mode 100644 index 000000000000..a82de6696a64 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_count_zeros_test.c @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_count_zeros +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + unsigned count = 0; \ + \ + value = ~value; \ + while (value != 0) { \ + count += value & 1; \ + value >>= 1; \ + } \ + \ + return (count); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_first_leading_one_test.c b/lib/libc/tests/stdbit/stdc_first_leading_one_test.c new file mode 100644 index 000000000000..7312789262ea --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_first_leading_one_test.c @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_first_leading_one +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned pos = 1; \ + \ + if (value == 0) \ + return (0); \ + \ + while ((type)(bit << 1) != 0) \ + bit <<= 1; \ + \ + while ((bit & value) == 0) { \ + bit >>= 1; \ + pos++; \ + } \ + \ + return (pos); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_first_leading_zero_test.c b/lib/libc/tests/stdbit/stdc_first_leading_zero_test.c new file mode 100644 index 000000000000..df2a1f4b8673 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_first_leading_zero_test.c @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_first_leading_zero +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned pos = 1; \ + \ + value = ~value; \ + if (value == 0) \ + return (0); \ + \ + while ((type)(bit << 1) != 0) \ + bit <<= 1; \ + \ + while ((bit & value) == 0) { \ + bit >>= 1; \ + pos++; \ + } \ + \ + return (pos); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_first_trailing_one_test.c b/lib/libc/tests/stdbit/stdc_first_trailing_one_test.c new file mode 100644 index 000000000000..43284786cd0e --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_first_trailing_one_test.c @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_first_trailing_one +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned pos = 1; \ + \ + if (value == 0) \ + return (0); \ + \ + while ((bit & value) == 0) { \ + bit <<= 1; \ + pos++; \ + } \ + \ + return (pos); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_first_trailing_zero_test.c b/lib/libc/tests/stdbit/stdc_first_trailing_zero_test.c new file mode 100644 index 000000000000..ab2a995dcc86 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_first_trailing_zero_test.c @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_first_trailing_zero +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned pos = 1; \ + \ + value = ~value; \ + if (value == 0) \ + return (0); \ + \ + while ((bit & value) == 0) { \ + bit <<= 1; \ + pos++; \ + } \ + \ + return (pos); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_has_single_bit_test.c b/lib/libc/tests/stdbit/stdc_has_single_bit_test.c new file mode 100644 index 000000000000..3426deccd8d0 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_has_single_bit_test.c @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_has_single_bit +#define MKREFFUNC(name, type) \ + static bool \ + name(type value) \ + { \ + type bit; \ + \ + for (bit = 1; bit != 0; bit <<= 1) \ + if (value == bit) \ + return (true); \ + \ + return (false); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_leading_ones_test.c b/lib/libc/tests/stdbit/stdc_leading_ones_test.c new file mode 100644 index 000000000000..616b3d5e6279 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_leading_ones_test.c @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_leading_ones +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned count = 0; \ + \ + while ((type)(bit << 1) != 0) \ + bit <<= 1; \ + \ + while (bit != 0 && (bit & value) != 0) { \ + bit >>= 1; \ + count++; \ + } \ + \ + return (count); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_leading_zeros_test.c b/lib/libc/tests/stdbit/stdc_leading_zeros_test.c new file mode 100644 index 000000000000..7c9d26e86456 --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_leading_zeros_test.c @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_leading_zeros +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned count = 0; \ + \ + while ((type)(bit << 1) != 0) \ + bit <<= 1; \ + \ + while (bit != 0 && (bit & value) == 0) { \ + bit >>= 1; \ + count++; \ + } \ + \ + return (count); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_trailing_ones_test.c b/lib/libc/tests/stdbit/stdc_trailing_ones_test.c new file mode 100644 index 000000000000..9e261cc543de --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_trailing_ones_test.c @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_trailing_ones +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned count = 0; \ + \ + while (bit != 0 && (bit & value) != 0) { \ + bit <<= 1; \ + count++; \ + } \ + \ + return (count); \ + } + +#include "stdbit-test-framework.c" diff --git a/lib/libc/tests/stdbit/stdc_trailing_zeros_test.c b/lib/libc/tests/stdbit/stdc_trailing_zeros_test.c new file mode 100644 index 000000000000..81fe11c5c82a --- /dev/null +++ b/lib/libc/tests/stdbit/stdc_trailing_zeros_test.c @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#define FUNCSTEM stdc_trailing_zeros +#define MKREFFUNC(name, type) \ + static unsigned \ + name(type value) \ + { \ + type bit = 1; \ + unsigned count = 0; \ + \ + while (bit != 0 && (bit & value) == 0) { \ + bit <<= 1; \ + count++; \ + } \ + \ + return (count); \ + } + +#include "stdbit-test-framework.c" From nobody Thu Jan 1 22:21: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 4dj1Ww2r0Cz6Lpnv for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wv62RVz3Bn4 for ; Thu, 01 Jan 2026 22: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=1767306107; 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=3UuokAta280nxoEMazgidz6leINur8wspyyvN84pblM=; b=UZ9EGIlUko7Efhotlj4AcIDDmXuRY1c8BQ3p6cwuttvO42BpwCcrgP64X93fCFKBrHBJhY mnSDvE7ZlBIfQH965fnQDAFBr9qf6jvW6zoleko8uKCyRoUcEXGZciakhyikadxSwX8X6+ S1VrcbHhHWMfz0gLHnhCEtLXdQXxhvNe8NxZmuDSvcJS+wIjk2P0KLP5vM++dQOp4qbD/s tXGdf0thw+8bV6ySYY7YHQGQ87CSxN/u2rbXVBrkPs+I1Y2jpqlTc/th9PZvHG3JBbvL8s 2CTEBdAHtk9Lc1de3zf76x4qZwNiZQQ5e5TUsEjSM8Ihno/m0y3Sw3uOXa1MoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306107; 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=3UuokAta280nxoEMazgidz6leINur8wspyyvN84pblM=; b=byhTOjfEXGDcd2/T81fBLBKaKFFfAU6l5farm4uIbE24TB+IJieo121PCZDmr2jHkVUtBJ fsQkxgTjU2SG8XRNk9mxUv/AuPtyp4ByMLBA/eYCMbmxWt0lV3/j7vbnRCDDqIhQsBb9HB MM73kIwIGWVO2qAO8xjX4s5Yqe+cpZVJSxTZzaM+gv3kMJDFQOwG7UQbFoNLz7mY72niX8 P2IeyiXrucT6vTAwALBFP4+cntRP+FwZHZz2jll9+H0uhkuMCr123WHcGBRqWZJXZhBnaS dSdLT3/2S/tNKUiwOXqEIEY8xQ9nPrPyaCZnuQIHdoE92xt/VHcI37A+q1XPcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306107; a=rsa-sha256; cv=none; b=J+arplXDOuYCwiK2tpZ+3ffo3UixyIe1ucwUf9M0MTDBGe9a2sXh17RJLEDtv3daQehVWH nvK+bLYMKWXa5miJ+jIIkkgjFD3/dvKUsXbV1ncsfi0U0wkBV2E5U/BF8VfsdjdxE/9wed y45gdAhjv76BwYKqLXPc8o4OyuYrRjirKrbgcae7MpIp3BPVO0ZU8HZT4QdpMByP5DYMnp m4Plz0SuKvTaDV4WMZvSsXSvrKvOY8xIpvs5r7fhj6MViQdLcp5rSxyZCy1w18OXspgEpk DvuUINh9tFIPuf92IcN8qdloajIgw90BApW/UmSE0sB5xD5x8AmtQYoNnia2Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wv5dRtzrP1 for ; Thu, 01 Jan 2026 22:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ed2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Robert Clausecker Subject: git: 41b346a6e3a7 - stable/15 - libc: Fix TESTSDIR for new stdbit tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 41b346a6e3a71af8654706fba8f8e25ffdbc37c9 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:47 +0000 Message-Id: <6956f37b.ed2b.989727b@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=41b346a6e3a71af8654706fba8f8e25ffdbc37c9 commit 41b346a6e3a71af8654706fba8f8e25ffdbc37c9 Author: Jessica Clarke AuthorDate: 2025-12-01 14:06:21 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:33 +0000 libc: Fix TESTSDIR for new stdbit tests Otherwise the directory created by etc/mtree/BSD.tests.dist, which is where these belong, and referred to by the generated Kyuafile for /usr/tests/lib/libc (via stdbit's existence in TESTS_SUBDIRS), ends up empty with no Kyuafile, which is an error for kyua. Reported by: kp Fixes: 2fb8cbc6ef1b ("libc/tests: add stdbit test framework and unit tests") (cherry picked from commit 5f529f9e292a30c065c316ed5fd0d23e07b26e5c) --- lib/libc/tests/stdbit/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/tests/stdbit/Makefile b/lib/libc/tests/stdbit/Makefile index 37450056007a..8dbc86528de3 100644 --- a/lib/libc/tests/stdbit/Makefile +++ b/lib/libc/tests/stdbit/Makefile @@ -1,3 +1,5 @@ +TESTSDIR= ${TESTSBASE}/lib/libc/stdbit + # ensure libc functions are tested, not clang's builtins CFLAGS+= -fno-builtin From nobody Thu Jan 1 22:21: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 4dj1Wx2qhhz6MnnF for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wx0VKHz3ByZ for ; Thu, 01 Jan 2026 22:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=72kHoUiPct3aqUEVX3fBR/Tx2IAD0DTxnKbhjtxIaDk=; b=j9d0ICOFUu4otodihAzVo6Dk5imnhhuoCEcJl2KGxIY/3roxw56wSdtaANU1UrEB6bL3VC qVT7/pNLVqjxktlxL91ec80LnrEpcc7uG1TB0IjgDoXIiiwgVnSH/a4Dozc3Z6Kl+3QNBr eTnN7OjlE4SSukWYjxCYwj7bBh3Xs18b1dJUD6uLkwxdJ7E1+lCkNjyMTE1odi4p3wrWQr 1WZqNjYVoIlvzjyKdAz/xMunhF8z2SLL8EceqJ0tPcvKJrzhG1bAi3LdMTMrhN1jv45K80 cxaO1SMjYgqbP4xlFicwPlFODZ0PGmXU1yyD4yIy9Ua/xH9bKeWiYqE4xe83Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=72kHoUiPct3aqUEVX3fBR/Tx2IAD0DTxnKbhjtxIaDk=; b=FUvZLS5YjZBq6Zbh/yUqi9/K4pTOYlJZtLKxKBfhXjbnI8+eu4ZVnTQLAyxqfUf8qtlTXC qYCex5N/jno0V7N4Uebzwd/KVxzKM3/LNYWQfzdYLJz2XsmDXIornTmvvUFquVyIjFSZom 60FVOICoTZf2XMlFyeqJ6GXTb7WDHXV2i7mnwcIWaHP+I2Qdirx29EpxqcYG8NsurdBYHB hB5TUWxfN6nZyzlsDGrhJWuQIbZt5P/3pslNTj6FB0kmwKuH6vvX0ZA5SVQzelmLtgZUGm 3+cQqxPj//VJY5XzURNaw6xs3ibKLz+MVvaS1UtoXqfpw+O04bHtIHX3iX9ycA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306109; a=rsa-sha256; cv=none; b=bh7MlayLB8WFfqG162FHGselmwGfqHK/8OtvWXnA6D93gsWBnrVPkbLeQwmMxa88X+4DEK PTnC52nqkmoeLhNcszX2nJcHbvzcV3uU3GjX5g+okgkr8R02A6xtn2ctxUWp9goVtkDTr1 QBloYG54ByUYt3XV/XO9KiNnBQVu5c7HBxiP4LHzZ9UATlB/xhbFiiVfMKkoMsXgsNfZhw x6GN0dMjinObTuZCLf+8D6YAW7CeC/UbCmh+GpZUUtOMirmP5Ra26OgyYDgL0+V58yeaaL GSvWawMWr6KeM7zgSrEUsMHKUF8us2RPOyEOe2C6SZHd11lP3D8vvglUidK4/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Ww6Xr5zrXF for ; Thu, 01 Jan 2026 22:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eabd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: be65a18424e7 - stable/15 - man/man3: add cross references to stdbit(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: be65a18424e7189397ba30cd293c15668ffc32c0 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:48 +0000 Message-Id: <6956f37c.eabd.58d27a15@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=be65a18424e7189397ba30cd293c15668ffc32c0 commit be65a18424e7189397ba30cd293c15668ffc32c0 Author: Robert Clausecker AuthorDate: 2025-11-10 09:43:37 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:33 +0000 man/man3: add cross references to stdbit(3) Add cross references to relevant stdbit man pages Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53661 (cherry picked from commit 5bfdb66ad985774b123ecd0cadee65c071b7ded0) --- lib/libc/string/ffs.3 | 2 ++ share/man/man3/bitstring.3 | 1 + share/man/man3/intro.3 | 11 +++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3 index 1cca54c0b30b..14a64126e692 100644 --- a/lib/libc/string/ffs.3 +++ b/lib/libc/string/ffs.3 @@ -79,6 +79,8 @@ A return value of zero from any of these functions means that the argument was zero. .Sh SEE ALSO .Xr bitstring 3 , +.Xr stdc_first_trailing_one 3 , +.Xr stdc_trailing_zeros 3 , .Xr bitset 9 .Sh STANDARDS The diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3 index 07558bd41ec3..87ba9a24a1b5 100644 --- a/share/man/man3/bitstring.3 +++ b/share/man/man3/bitstring.3 @@ -461,6 +461,7 @@ make_lpr_available() .Ed .Sh SEE ALSO .Xr malloc 3 , +.Xr stdbit 3 , .Xr bitset 9 .Sh HISTORY The diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index 0cecdcab4069..952183d7dd2d 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -24,7 +24,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd November 27, 2024 +.Dd November 10, 2025 .Dt INTRO 3 .Os .Sh NAME @@ -72,13 +72,20 @@ see .It database routines see .Xr db 3 -.It bit operators +.It bit string operators see .Xr bitstring 3 +.It bit and byte utilities +see +.Xr stdbit 3 .It string operators see .Xr string 3 +and +.Xr bstring 3 .It character tests and character operators +see +.Xr ctype 3 .It storage allocation see .Xr mpool 3 From nobody Thu Jan 1 22:21: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 4dj1Wy2bRyz6Lpp1 for ; Thu, 01 Jan 2026 22:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dj1Wy0MDgz3C4R for ; Thu, 01 Jan 2026 22:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=irbJbPpUeLGfNtbC+26lE3WxIkPbtHQfvJ61omAWAbs=; b=RUZFy51io1zdGnHZs7TEPAYPAA5O8+de+PwbXIzbJPWXIvBKOYtrCmMHd5OaO9kug1ChND NGWypC7HcjW609QpGmT6hMtG4glv7nDaFUXgawjXKSvuXkwusgA5YmRKYicd9FT+tASHTs XHa3Ott2F8DVQJuRasqJbJ/mSJdnOrFaRI41FzgVky+rIdePoSJRvfMrKitBvhiTnP25OU lmVsi08XkYyJCsHEvpb7LdWD2715X9wlvxu/yI/SZ1BD0lX7Au1VJvMTX4HOLcVEyA8IA9 Cyiv5WFN+wybmw/bWVB9BAyzK7Byhvo+vr4HJZxEddXpd7IcEX8D/NcZ0MV21g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767306110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=irbJbPpUeLGfNtbC+26lE3WxIkPbtHQfvJ61omAWAbs=; b=vGQrTPf2hoAypQGF4gP81fAy6ISzdvbh2GvETQvS/Ktm0XagsgW4YSExyc3aioO/n24EFJ NEEVF6MHSsyzellL5Srvn0+jI9lexfpb1Fj57+MWMwC6ZViH0OHY5+tRDIR6dr9aZ30jlQ gVKm0ouKPwhKOEIGMgJMcvhFfbS1ZU4+P3XDCd0al/e28QcugxKJvfoUoH+y6c9ruCmPhH zNMVFdLvt15paM2WjSV6l9zHsShdW2+DgaTiPa38PQa9R8U1jMnMRlLv9hR2SDfiX/Idac 4WqSQc3O9OmyUBb1kgnK6ZZn8BeEgKhfTZ8K0N2ZDIPvaj1pMj7XUww1UDjktQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767306110; a=rsa-sha256; cv=none; b=E9kI0/HvPqDGOziIYZ+6eOtJJgS9LOKpZi4xorhG6JKCzF5brzHbnl2yve/PoNxmSEK3Zt U56Od+UUtKeCisDjviQBI740lha4Tv9vb6ucrL+ReWYHyQahk8GZvBoYaLSPlSdwVE9iMG o0vGiQfTCe+L83Emhdru+TMq4h5I+C5sET695axQZJdfvZOqooLrXPIAekoXkogCO6HKdc aHZLTi47LRT16Wsoh6XaitBMhHuDKxVXl7mesddSd9EbWD/CQ0mXUxxQDULcqYX++dzEBn sL4hxNMuHNAgkEagh17biody3ppSK/1ia6QUlZ9jZOS01tOSFeTVpRwtyNmCwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dj1Wx6w4Szrm5 for ; Thu, 01 Jan 2026 22:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ebca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 22:21:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 54849107681d - stable/15 - libc/tests/string: improve stpncpy() "bounds" unit test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 54849107681dadaf0aa7bc88d55b7defe3f7826d Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 22:21:49 +0000 Message-Id: <6956f37d.ebca.43daa179@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=54849107681dadaf0aa7bc88d55b7defe3f7826d commit 54849107681dadaf0aa7bc88d55b7defe3f7826d Author: Robert Clausecker AuthorDate: 2025-12-04 16:34:59 +0000 Commit: Robert Clausecker CommitDate: 2026-01-01 20:57:33 +0000 libc/tests/string: improve stpncpy() "bounds" unit test The test is extended the same way I previously extended the memccpy() test to fix what is probably the same kind of bug. PR: 291359 Reported by: Collin Funk Reviewed by: ngie Approved by: markj (mentor) Fixes: 6fa9e7d8737548ef93c573387ce62402c368d486 (D42519) See also: 61ed5748e4e9c7397fcb2638b442f46ac5c9e7c5 (D46051) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54169 (cherry picked from commit 123c086200491819595abc271d360e605288fd18) (cherry picked from commit 8be8642826099368208efb2c1222f2a102cc5b08) --- lib/libc/tests/string/stpncpy_test.c | 55 +++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c index 8574b2d591be..7fabe17bfe4a 100644 --- a/lib/libc/tests/string/stpncpy_test.c +++ b/lib/libc/tests/string/stpncpy_test.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2009 David Schultz - * Copyright (c) 2023 The FreeBSD Foundation + * Copyright (c) 2023, 2025 The FreeBSD Foundation * All rights reserved. * * Portions of this software were developed by Robert Clausecker @@ -52,34 +52,57 @@ makebuf(size_t len, int guard_at_end) buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); assert(buf); if (guard_at_end) { - assert(munmap(buf + alloc_size - page_size, page_size) == 0); + assert(mprotect(buf + alloc_size - page_size, page_size, PROT_NONE) == 0); return (buf + alloc_size - page_size - len); } else { - assert(munmap(buf, page_size) == 0); + assert(mprotect(buf, page_size, PROT_NONE) == 0); return (buf + page_size); } } static void -test_stpncpy(const char *s) +freebuf(char *buf, size_t len, int guard_at_end) { - char *src, *dst; - size_t size, len, bufsize, x; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + if (guard_at_end) + munmap(buf + len + page_size - alloc_size, alloc_size); + else + munmap(buf - page_size, alloc_size); +} + +static void +test_stpncpy(const char *s, size_t size) +{ + char *src, *dst, *expected; + size_t bufsize, x; int i, j; - size = strlen(s) + 1; for (i = 0; i <= 1; i++) { for (j = 0; j <= 1; j++) { - for (bufsize = 0; bufsize <= size + 10; bufsize++) { - src = makebuf(size, i); - memcpy(src, s, size); + for (bufsize = 0; bufsize <= size + 32; bufsize++) { dst = makebuf(bufsize, j); + if (bufsize < size) { + src = makebuf(bufsize, i); + memcpy(src, s, bufsize); + expected = dst + bufsize; + } else { + src = makebuf(size, i); + memcpy(src, s, size); + expected = dst + size - 1; + } + memset(dst, 'X', bufsize); - len = (bufsize < size) ? bufsize : size - 1; - assert(stpncpy_fn(dst, src, bufsize) == dst+len); - assert(memcmp(src, dst, len) == 0); - for (x = len; x < bufsize; x++) + assert(stpncpy_fn(dst, src, bufsize) == expected); + assert(memcmp(src, dst, MIN(bufsize, size)) == 0); + for (x = size; x < bufsize; x++) assert(dst[x] == '\0'); + + freebuf(dst, bufsize, j); + freebuf(src, MIN(bufsize, size), i); } } } @@ -140,12 +163,12 @@ ATF_TC_WITHOUT_HEAD(bounds); ATF_TC_BODY(bounds, tc) { size_t i; - char buf[64+1]; + char buf[64]; for (i = 0; i < sizeof(buf) - 1; i++) { buf[i] = ' ' + i; buf[i+1] = '\0'; - test_stpncpy(buf); + test_stpncpy(buf, i + 2); } } From nobody Fri Jan 2 07:40: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 4djFx257wdz6MTnT for ; Fri, 02 Jan 2026 07:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djFwx4RWRz49Ns for ; Fri, 02 Jan 2026 07:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767339649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CIouuqymknNOBEbc1g49C9d95fTVENgH+1NEE4m6po=; b=pqS282NpV5N5N/92kben3ARwhB9tA16Oyh3e5bpl54q7BMkE8FSzZTrjCXd5YkxhqfDVEY mAeA4FB4OMxytH6sXa19WElMDE3xdWn1ZwFENrQHy2YUmaZ+w1q2QHzhM7lCWaW0AyxNwx Ug+JFzBtTY23Zfhrb4qwZnOep3Vp5CciLk8xDc3lAhOvTcfWNTZ0LqLIKy/sKKc0GXtqhS GmW0AZVw/pVCUbYTY0plc4LpKo4dcfhrWYNK+xHpoMk+/4UV8l7Jh7U6wQCiVIyGyxLEhZ rPwWKhAElkDHM8PMrmQd1GmPruLHkAm8l+RiwxCOJzbkmP0NNd63PgTPQST1hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767339649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CIouuqymknNOBEbc1g49C9d95fTVENgH+1NEE4m6po=; b=U+RBv6uqVQa2USXJ7UdK0uwrlj5RKitu6mOyGNMYRRyRYNEI8I83NUpnyULy3qMbqy6u8F lrRfL2CB62vlvOEkaqrCv5J2pG84i5cuTmhT535mXCNn72cTmOITJL4seGRFjCchZjf1AG sC1uMeb0vALQuloRYMN4GrnMiXP5ZYxxypO7BVfrGmOpAQkHzjmwEhapKDGLdte4miRTio jBwdekUgEH16eFYIqyfNXfqx0MkPamDKqU9J54MZ0YA3aRBAvl5BIgrYs1xXmU4o2ZdXv9 6vFeHRqJRm4ta/lOYcQKmnSJUM9tpmE3ddN4ntbGryMp9xdW1Gt+10LtJ8Egqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767339649; a=rsa-sha256; cv=none; b=O/DMubopqBo/xqD8hzPp+9pqRnUGFfJinS+3/rPFz4poG5LIfH+TZPpizoUjRdHln4aLRv Ttx7ywJHrGe0xOqwiorQ7109g9HLfHj5+E1t/YsgkHQdpGjxyv+amaOA8YhBuGWdMmAlPW zC9VBlmF1jO5W6KxmpBQul4gkqq7Q/J90xNOnyEc+8UI9+hYR5ptjrCcTkatKVZF49xNIg aNpE1bVJwunvEZF+NoQT0EgwTR0vJuHvJ19V+RdC2UzkIygEmV+vcVjzFUWqaKXSysHPID HM2OS8UOKe58AgdgogNb8QA9DFy51XBJTMfHp+wm+OZiB2jW85G7FNdtrGm0Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djFwx40RQz17HV for ; Fri, 02 Jan 2026 07:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 07:40:49 +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: 3542d60fb804 - main - linuxkpi: Don't clobber result on 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 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: 3542d60fb8042474f66fbf2d779ed8c5a80d0f78 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 07:40:49 +0000 Message-Id: <69577681.3e120.15bea2a2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3542d60fb8042474f66fbf2d779ed8c5a80d0f78 commit 3542d60fb8042474f66fbf2d779ed8c5a80d0f78 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-02 07:30:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-02 07:30:06 +0000 linuxkpi: Don't clobber result on failure In kstrto*(), don't assign to *res until we know the conversion is successful, and address issues that may result in warnings if code that uses is compiled at high warning levels. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D54440 --- sys/compat/linuxkpi/common/include/linux/kstrtox.h | 43 +++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kstrtox.h b/sys/compat/linuxkpi/common/include/linux/kstrtox.h index 5da99de24197..6a145c409038 100644 --- a/sys/compat/linuxkpi/common/include/linux/kstrtox.h +++ b/sys/compat/linuxkpi/common/include/linux/kstrtox.h @@ -74,14 +74,17 @@ static inline int kstrtoul(const char *cp, unsigned int base, unsigned long *res) { char *end; + unsigned long temp; - *res = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = temp; return (0); } @@ -89,14 +92,17 @@ static inline int kstrtol(const char *cp, unsigned int base, long *res) { char *end; + long temp; - *res = strtol(cp, &end, base); + temp = strtol(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = temp; return (0); } @@ -106,7 +112,7 @@ kstrtoint(const char *cp, unsigned int base, int *res) char *end; long temp; - *res = temp = strtol(cp, &end, base); + temp = strtol(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -115,6 +121,8 @@ kstrtoint(const char *cp, unsigned int base, int *res) return (-EINVAL); if (temp != (int)temp) return (-ERANGE); + + *res = (int)temp; return (0); } @@ -124,7 +132,7 @@ kstrtouint(const char *cp, unsigned int base, unsigned int *res) char *end; unsigned long temp; - *res = temp = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -133,6 +141,8 @@ kstrtouint(const char *cp, unsigned int base, unsigned int *res) return (-EINVAL); if (temp != (unsigned int)temp) return (-ERANGE); + + *res = (unsigned int)temp; return (0); } @@ -142,7 +152,7 @@ kstrtou8(const char *cp, unsigned int base, uint8_t *res) char *end; unsigned long temp; - *res = temp = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -151,6 +161,8 @@ kstrtou8(const char *cp, unsigned int base, uint8_t *res) return (-EINVAL); if (temp != (uint8_t)temp) return (-ERANGE); + + *res = (uint8_t)temp; return (0); } @@ -160,7 +172,7 @@ kstrtou16(const char *cp, unsigned int base, uint16_t *res) char *end; unsigned long temp; - *res = temp = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -169,20 +181,20 @@ kstrtou16(const char *cp, unsigned int base, uint16_t *res) return (-EINVAL); if (temp != (uint16_t)temp) return (-ERANGE); + + *res = (uint16_t)temp; return (0); } static inline int kstrtou32(const char *cp, unsigned int base, uint32_t *res) { - return (kstrtouint(cp, base, res)); } static inline int kstrtos32(const char *cp, unsigned int base, int32_t *res) { - return (kstrtoint(cp, base, res)); } @@ -190,14 +202,17 @@ static inline int kstrtos64(const char *cp, unsigned int base, int64_t *res) { char *end; + quad_t temp; - *res = strtoq(cp, &end, base); + temp = strtoq(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = (int64_t)temp; return (0); } @@ -208,17 +223,20 @@ kstrtoll(const char *cp, unsigned int base, long long *res) } static inline int -kstrtou64(const char *cp, unsigned int base, u64 *res) +kstrtou64(const char *cp, unsigned int base, uint64_t *res) { char *end; + u_quad_t temp; - *res = strtouq(cp, &end, base); + temp = strtouq(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = (uint64_t)temp; return (0); } @@ -231,7 +249,7 @@ kstrtoull(const char *cp, unsigned int base, unsigned long long *res) static inline int kstrtobool(const char *s, bool *res) { - int len; + size_t len; if (s == NULL || (len = strlen(s)) == 0 || res == NULL) return (-EINVAL); @@ -302,7 +320,6 @@ static inline int kstrtou32_from_user(const char __user *s, size_t count, unsigned int base, unsigned int *p) { - return (kstrtouint_from_user(s, count, base, p)); } From nobody Fri Jan 2 15:49: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 4djSn13vcgz6N3ds for ; Fri, 02 Jan 2026 15:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djSn1307wz3qWd for ; Fri, 02 Jan 2026 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767368981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSgJMxCa3iF6SUH4thAbtp/Xt0KCQYSwGnHBTJ3kvvM=; b=oeDs5rYlBHYvmb3HMIrjxj16Rm3Q76oTMXZ213hZROFLA9KUdXGNSsMpdpZvQF8jkeiXmZ 7oPgkxGwBljV4UmZ1lU0R5aSHoMEb6enmwEugOCMcrFYyLAlCYs7SM0ovpDbh/89LcZdt0 4t5hzKF0J9bIQZ0fgrVnhdkFKk9IUFZfhZ36Ieax+dOOFOpTU//HOEutcJ4q5fMxFs/myK Vx7D25qoTZY94YjznPuDu26rXfPqM2R86CPpkDUTLpnkD27b/7tnKoRMJhjTLgQRJ1LrrT p2j5OZMJdlLwTjFuI692RYBtFLLM4JGKRasVYwW5/+UBt1ouQL7uxkJ+mlVCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767368981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSgJMxCa3iF6SUH4thAbtp/Xt0KCQYSwGnHBTJ3kvvM=; b=GNjCFkt6YMvHQuxSgDjnHnO6fPfo+ejxXU9kLEscSND/S82oUVtjSLioo9+Cb1xbD6lO5T twWU7wZaSCmw1tiUrpxK9e4DIlZFNHEnthSG5JtauNUnb9ktSv+DAAoP0jUJHXsWQAmNgE yLCN2Iyk6wfWx1t46PpgjyZj0zs0PeCm5ikveGmRn/IeKVHqtqXjj9a+mVboL0sgNJ+IRV QA0LcK2veDptqH35oeJFziuM+jeY4ubt40j4WO0BdWYAZEsMq+79KmsEKt3Fhv/SolKNRS OkAukydUq27CCAMZfEFJbzdZFsxaHDeW1XDfCAXBf6Al9IBv/70XG6W+kzB4yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767368981; a=rsa-sha256; cv=none; b=jMyPE7xXkA8q3fUmOtT4AcICOCKJCOp28V5Fb8C6BqzfBKVR2eON9tRvhqYJ4QxHRyabS9 yLEcOZ+uiDWU4kbjZQvNWStbTaf+Ch6o3R1YbNn7GFbHBsVDbM6/NmNEUa/gz2FNFO1Ugw O49N30+/NIcAOt+XvGWzaUhjpvFYXctC2DEfx10yjoQCpiQgn0AT2rV9EjYmtaoAPP7O+d kPt7ZrAMhqhtLtJhdGElHS2vF4jPyltVi8rLeFpFjhUUHYqm+Qq5IkkAOWjv1r/ZR0fLzF 8x+VGAH4tbUlVnuyhzIFf1yep1AFbKGtT8HHn/XdYmuDT8B3t9pw8uacz5AnWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djSn12bTlz8K1 for ; Fri, 02 Jan 2026 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d4fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 15:49:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2455db44ef08 - main - snd_hda: Default to 256 when corb/rirb is invalid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2455db44ef088797d113397f863d46c50e77134f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 15:49:41 +0000 Message-Id: <6957e915.d4fb.62b2ee57@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2455db44ef088797d113397f863d46c50e77134f commit 2455db44ef088797d113397f863d46c50e77134f Author: Christos Margiolis AuthorDate: 2026-01-02 15:49:33 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 15:49:33 +0000 snd_hda: Default to 256 when corb/rirb is invalid PR: 289284 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54339 --- sys/dev/sound/pci/hda/hdac.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index d1de81e7ba29..d397e98b4be3 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -545,9 +545,12 @@ hdac_get_capabilities(struct hdac_softc *sc) HDAC_CORBSIZE_CORBSZCAP_2) sc->corb_size = 2; else { - device_printf(sc->dev, "%s: Invalid corb size (%x)\n", + device_printf(sc->dev, "%s: Hardware reports invalid corb size " + "(%x), defaulting to 256\n", __func__, corbsize); - return (ENXIO); + sc->corb_size = 256; + corbsize = HDAC_CORBSIZE_CORBSIZE(HDAC_CORBSIZE_CORBSIZE_256); + HDAC_WRITE_1(&sc->mem, HDAC_CORBSIZE, corbsize); } rirbsize = HDAC_READ_1(&sc->mem, HDAC_RIRBSIZE); @@ -561,9 +564,12 @@ hdac_get_capabilities(struct hdac_softc *sc) HDAC_RIRBSIZE_RIRBSZCAP_2) sc->rirb_size = 2; else { - device_printf(sc->dev, "%s: Invalid rirb size (%x)\n", + device_printf(sc->dev, "%s: Hardware reports invalid rirb size " + "(%x), defaulting to 256\n", __func__, rirbsize); - return (ENXIO); + sc->rirb_size = 256; + rirbsize = HDAC_RIRBSIZE_RIRBSIZE(HDAC_RIRBSIZE_RIRBSIZE_256); + HDAC_WRITE_1(&sc->mem, HDAC_RIRBSIZE, rirbsize); } HDA_BOOTVERBOSE( From nobody Fri Jan 2 16:19: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 4djTR06MSrz6Ls17 for ; Fri, 02 Jan 2026 16:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djTR057ySz3xBY for ; Fri, 02 Jan 2026 16:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767370748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4UQX38MR5H55DJksMEfBrktLL25mVhCJZWFTMinXQk=; b=IULosAVlhGwMfxB00kdeOy75585uOQQ7R4n2PRjHkiu9vSzm9jebin3+5z9pXKTH0rVs9e fSPTUIydEwbKTE25JNgPgiKZhjSZEn6KYtR3mpx8FIQp6KA/OXobxuzMBFI/I5pbdH77P1 YU/s05N8n5Qee1zv1WEFgsroWrXa+LslO/38U340pM8dxtAb1diuDPEFgldv+pTNBHbFmd N/odgp7eIhkwnf4faSzCQ0q4Jrmsf9Z8GAYa+pqFiuJ/POUJcvgrzaDJj8+LLjZbJ3yA8p I6GiDJGUJvVLk34fYlUG09Lp43SnJGrgvXu8Ls6JXoR21d8Y05aA2aVRrCW/KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767370748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4UQX38MR5H55DJksMEfBrktLL25mVhCJZWFTMinXQk=; b=X7hFs04F1NOGEoaRG3bCEr68fulnkxZs51YBAqYuOE6O7nsFHveV4WIeFo/3uE4z3u4SRC H5nL71KxC8eOkpjOoVinVk8wdWFqVs3wVblfBbda0pC/qDyZXsR1Vk2y2E5NMMx1Y+GXpg 3TGbUAY4x17P6pyvQ8yOufmiexXDDYlrpZNRrbqso6L1qhLGSRMp3gusNjmBccBrgpXfkv bVtpjd68v34HNHLAVxrQosWc/Fd2Ubu8EPVrseLlDZpBD/tYuQ6+nEYlrclgaY/FJxmnXr PS/+UETZ1yqsPpx7Eo80QSl3v3I0dpTOl6Zp33DPy8XYn+00nBwyub6il7oogQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767370748; a=rsa-sha256; cv=none; b=uv4nJrwcoSoNpejNTESIeBupnAUYrBm4tGaqPO0Go9O891UXgX3n3oWYjrlcNiBsz+bJ8J tRwgzjnSUbnrNZWSKPGeOVkoCycjmfZr5EXVwOu37n5b6QDwjrR0AfoRbaeqE4CXmSQPny v5TJ0Z55Jiha+YW51kZCMeH8Nfk5+mk4XuQJXZONAA5XPkNZp9SfLuaBpJifDGOG4RkcFp EZhQy5vx6YhfeZApgfpQtZQHZP1mv00kLsLmzXzVnUeF5pOBhAzrKlW+yeZJI3oEEJlMeI /ZKIVrpV+x+6nr9gT9k9XoqeBZL679/Q9bOL07bKAXxCA3655lMETj0denP2ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djTR04PBfz8X6 for ; Fri, 02 Jan 2026 16:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ff0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:19:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fb476c703117 - main - pf: sprinkle const over pf_addr_cmp() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb476c70311788dfd6850d73a3f8d9abb7c3d58c Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:19:08 +0000 Message-Id: <6957effc.ff0a.13537d1c@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb476c70311788dfd6850d73a3f8d9abb7c3d58c commit fb476c70311788dfd6850d73a3f8d9abb7c3d58c Author: Kristof Provost AuthorDate: 2026-01-02 14:10:53 +0000 Commit: Kristof Provost CommitDate: 2026-01-02 16:05:29 +0000 pf: sprinkle const over pf_addr_cmp() Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index daaa2d3cddf7..6582250879ca 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2600,7 +2600,7 @@ int pfi_clear_flags(const char *, int); int pf_match_tag(struct mbuf *, struct pf_krule *, int *, int); int pf_tag_packet(struct pf_pdesc *, int); -int pf_addr_cmp(struct pf_addr *, struct pf_addr *, +int pf_addr_cmp(const struct pf_addr *, const struct pf_addr *, sa_family_t); uint8_t* pf_find_tcpopt(u_int8_t *, u_int8_t *, size_t, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8219aacd20de..60ca9039e9ce 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -570,7 +570,7 @@ pf_sctp_checksum(struct mbuf *m, int off) } int -pf_addr_cmp(struct pf_addr *a, struct pf_addr *b, sa_family_t af) +pf_addr_cmp(const struct pf_addr *a, const struct pf_addr *b, sa_family_t af) { switch (af) { From nobody Fri Jan 2 16:58: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 4djVJ641dHz6LvSy for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ6393wz41yg for ; Fri, 02 Jan 2026 16:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F+MVtPPL8xxiZ5JBAu6zicF6/jwh+Hin59k4cyRLEg=; b=BUIYPe/RUAEbzMAqrj13fKVehDq0g3+NArcLkVK1tV0w6Nd2k2taRZlGeinNzbLDJbSZyN k4v42LlpacTPA5lTRDkFcHbGb9sUjkv8ut3KDr64WsgjZTmior/GEk4SYwx2yH6L89AqbQ poFXnIxd7pzbYx22PjlDlPNh8KIhG4g0fA6JkKHq9p0I4NdsX5zw+FiO7Gwxgc9xfO7Kiy IhvsFvufxAkul6TTpHkgNZBYgyjKI8aiNWebwhFsS7MjIDI4+t8ECR8QhgBIY0mcuidayD nXyO7OkFXvBGBeaTpodzFl0i5DEmuP08AIyAnXRJJvAmOcc2XGiKsHTzpKOZAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F+MVtPPL8xxiZ5JBAu6zicF6/jwh+Hin59k4cyRLEg=; b=HOn3J3pr00aAoxzF1Rmy3iriVuYHaHQH9vtiELXTmrda9mas3CTyIbK5DoSjJLJqX8FjPX 7i492Eet6GStNxqNYFRQLL/RaKz6EirBxpGgWamGUlhMZe77YgsgJO1oOYol4gcjD1eCb1 k7avqD7OXiDM2R4Q/L/qwc8qb8roruxcHi50fNaKbbfMc6qu2+l3YOMqXT+9SIEGx1kNza Y/WDrmYH1vtRHgNjGtCJCUSbr3TKiDGBJntY7qG3nC4HLMkN0+EcRw97UIVzlcn41qEXTO hDWGiIFm9l16Ut4OqI84PvuYZniLUyGD0im8V2nCidqt6elHiyRfYMROQRIAyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373094; a=rsa-sha256; cv=none; b=kOiwFpW4IMZ6FQVxkoHU1bZo9SMNgPqB9i5R8Bzf0vzrqLTpEkqe0GK6Yigi3mMuP8aUDt D1CON9FfOQedoXAfRZVGBRm+iswLYV439giYSnpDcMD09dP2hCAX9pzX5bOX8l5P4JQU9i 60hithoF6y/aDMSZslwk2nAL9xSEDARwed2l+XSsx3nmffO+h34PLu2F25Z7zYj+Ladp+4 yMlWX4cpal58zyeqafq4W4YnZcsaZWJ9bUHtQS86Gb9Q9VaIz6tigDqhU4/CHjWgto9+nH UAPoEhs7VxGjaJKpjxfayjiOEXkZXlG7ajlAkFEKOtviIYMbWSH8JWLFpICZpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ62lF6zBGv for ; Fri, 02 Jan 2026 16:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24495 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 84976625da38 - main - sound: Retire pcm_feeder->desc_static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84976625da387a266f01b0a566aab447426609f7 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:14 +0000 Message-Id: <6957f926.24495.1ac3e38c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=84976625da387a266f01b0a566aab447426609f7 commit 84976625da387a266f01b0a566aab447426609f7 Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:44 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Retire pcm_feeder->desc_static Not sure what the value of this was. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54103 --- sys/dev/sound/pcm/feeder.c | 3 +-- sys/dev/sound/pcm/feeder.h | 2 +- sys/dev/sound/pcm/feeder_chain.c | 4 ++-- sys/dev/sound/pcm/feeder_eq.c | 10 +++++----- sys/dev/sound/pcm/feeder_format.c | 14 +++++++------- sys/dev/sound/pcm/feeder_matrix.c | 9 ++++----- sys/dev/sound/pcm/feeder_mixer.c | 10 +++++----- sys/dev/sound/pcm/feeder_rate.c | 8 ++++---- sys/dev/sound/pcm/feeder_volume.c | 14 +++++++------- sys/dev/sound/pcm/sndstat.c | 36 ++++++++++++++++++------------------ 10 files changed, 54 insertions(+), 56 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index fa4e4e16a133..2a7f54e5d30f 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -75,9 +75,8 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) return NULL; f->class = fc; - f->desc = &(f->desc_static); if (desc != NULL) - *(f->desc) = *desc; + f->desc = *desc; err = FEEDER_INIT(f); if (err) { diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index f1c96d86fda0..ed4ebc91fca7 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -51,7 +51,7 @@ struct feeder_class { struct pcm_feeder { KOBJ_FIELDS; int align; - struct pcm_feederdesc *desc, desc_static; + struct pcm_feederdesc desc; void *data; struct feeder_class *class; struct pcm_feeder *source, *parent; diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 32dd4ca14faf..4ec50d810253 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -473,8 +473,8 @@ feeder_build_root(struct pcm_channel *c, struct feeder_chain_desc *cdesc) c->feederflags |= 1 << FEEDER_ROOT; - c->feeder->desc->in = cdesc->current.afmt; - c->feeder->desc->out = cdesc->current.afmt; + c->feeder->desc.in = cdesc->current.afmt; + c->feeder->desc.out = cdesc->current.afmt; return (0); } diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 3838328fb0bb..4ab7334715d5 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -275,16 +275,16 @@ feed_eq_init(struct pcm_feeder *f) { struct feed_eq_info *info; - if (f->desc->in != f->desc->out) + if (f->desc.in != f->desc.out) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->fmt = AFMT_ENCODING(f->desc->in); - info->channels = AFMT_CHANNEL(f->desc->in); - info->align = info->channels * AFMT_BPS(f->desc->in); + info->fmt = AFMT_ENCODING(f->desc.in); + info->channels = AFMT_CHANNEL(f->desc.in); + info->align = info->channels * AFMT_BPS(f->desc.in); info->rate = FEEDEQ_RATE_MIN; info->treble.gain = FEEDEQ_L2GAIN(50); @@ -309,7 +309,7 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) if (value < SND_CHN_MIN || value > SND_CHN_MAX) return (EINVAL); info->channels = (uint32_t)value; - info->align = info->channels * AFMT_BPS(f->desc->in); + info->align = info->channels * AFMT_BPS(f->desc.in); feed_eq_reset(info); break; case FEEDEQ_RATE: diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index d2c4d7618ab4..25103b71d135 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -61,23 +61,23 @@ feed_format_init(struct pcm_feeder *f) { struct feed_format_info *info; - if (f->desc->in == f->desc->out || - AFMT_CHANNEL(f->desc->in) != AFMT_CHANNEL(f->desc->out)) + if (f->desc.in == f->desc.out || + AFMT_CHANNEL(f->desc.in) != AFMT_CHANNEL(f->desc.out)) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->channels = AFMT_CHANNEL(f->desc->in); + info->channels = AFMT_CHANNEL(f->desc.in); - info->ibps = AFMT_BPS(f->desc->in); + info->ibps = AFMT_BPS(f->desc.in); info->ialign = info->ibps * info->channels; - info->rdfmt = AFMT_ENCODING(f->desc->in); + info->rdfmt = AFMT_ENCODING(f->desc.in); - info->obps = AFMT_BPS(f->desc->out); + info->obps = AFMT_BPS(f->desc.out); info->oalign = info->obps * info->channels; - info->wrfmt = AFMT_ENCODING(f->desc->out); + info->wrfmt = AFMT_ENCODING(f->desc.out); f->data = info; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 2c7a3e04690d..198fe86d994f 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -283,15 +283,15 @@ feed_matrix_init(struct pcm_feeder *f) struct pcmchan_matrix *m_in, *m_out; int ret; - if (AFMT_ENCODING(f->desc->in) != AFMT_ENCODING(f->desc->out)) + if (AFMT_ENCODING(f->desc.in) != AFMT_ENCODING(f->desc.out)) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->in = f->desc->in; - info->out = f->desc->out; + info->in = f->desc.in; + info->out = f->desc.out; info->fmt = AFMT_ENCODING(info->in); info->bps = AFMT_BPS(info->in); info->ialign = AFMT_ALIGN(info->in); @@ -413,8 +413,7 @@ feeder_matrix_setup(struct pcm_feeder *f, struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out) { - if (f == NULL || f->desc == NULL || f->class->type != FEEDER_MATRIX || - f->data == NULL) + if (f == NULL || f->class->type != FEEDER_MATRIX || f->data == NULL) return (EINVAL); return (feed_matrix_setup(f->data, m_in, m_out)); diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 10de42ba727a..74ab633bf3c7 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -78,16 +78,16 @@ feed_mixer_init(struct pcm_feeder *f) { struct feed_mixer_info *info; - if (f->desc->in != f->desc->out) + if (f->desc.in != f->desc.out) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->format = AFMT_ENCODING(f->desc->in); - info->channels = AFMT_CHANNEL(f->desc->in); - info->bps = AFMT_BPS(f->desc->in); + info->format = AFMT_ENCODING(f->desc.in); + info->channels = AFMT_CHANNEL(f->desc.in); + info->bps = AFMT_BPS(f->desc.in); f->data = info; @@ -321,7 +321,7 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, if (mcnt != 0) { memset(b + rcnt, sndbuf_zerodata( - f->desc->out), mcnt); + f->desc.out), mcnt); mcnt = 0; } switch (info->format) { diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index c2c232a97177..7fe8ec856a88 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1109,7 +1109,7 @@ z_resampler_setup(struct pcm_feeder *f) if (!(Z_FACTOR_SAFE(info->z_gx) && Z_FACTOR_SAFE(info->z_gy))) return (EINVAL); - format = f->desc->in; + format = f->desc.in; adaptive = 0; z_scale = 0; @@ -1344,7 +1344,7 @@ z_setup_adaptive_sinc: /* * Zero out head of buffer to avoid pops and clicks. */ - memset(info->z_delay, sndbuf_zerodata(f->desc->out), + memset(info->z_delay, sndbuf_zerodata(f->desc.out), info->z_pos * align); #ifdef Z_DIAGNOSTIC @@ -1508,7 +1508,7 @@ z_resampler_init(struct pcm_feeder *f) struct z_info *info; int ret; - if (f->desc->in != f->desc->out) + if (f->desc.in != f->desc.out) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -1518,7 +1518,7 @@ z_resampler_init(struct pcm_feeder *f) info->rsrc = Z_RATE_DEFAULT; info->rdst = Z_RATE_DEFAULT; info->quality = feeder_rate_quality; - info->channels = AFMT_CHANNEL(f->desc->in); + info->channels = AFMT_CHANNEL(f->desc.in); f->data = info; diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 101cc7ba003b..f7c93ca716e6 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -151,20 +151,20 @@ feed_volume_init(struct pcm_feeder *f) uint32_t i; int ret; - if (f->desc->in != f->desc->out || - AFMT_CHANNEL(f->desc->in) > SND_CHN_MAX) + if (f->desc.in != f->desc.out || + AFMT_CHANNEL(f->desc.in) > SND_CHN_MAX) return (EINVAL); for (i = 0; i < FEEDVOLUME_TAB_SIZE; i++) { - if (AFMT_ENCODING(f->desc->in) == + if (AFMT_ENCODING(f->desc.in) == feed_volume_info_tab[i].format) { info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->bps = AFMT_BPS(f->desc->in); - info->channels = AFMT_CHANNEL(f->desc->in); + info->bps = AFMT_BPS(f->desc.in); + info->channels = AFMT_CHANNEL(f->desc.in); info->apply = feed_volume_info_tab[i].apply; info->volume_class = SND_VOL_C_PCM; info->state = FEEDVOLUME_ENABLE; @@ -332,8 +332,8 @@ feeder_volume_apply_matrix(struct pcm_feeder *f, struct pcmchan_matrix *m) struct feed_volume_info *info; uint32_t i; - if (f == NULL || f->desc == NULL || f->class->type != FEEDER_VOLUME || - f->data == NULL || m == NULL || m->channels < SND_CHN_MIN || + if (f == NULL || f->class->type != FEEDER_VOLUME || f->data == NULL || + m == NULL || m->channels < SND_CHN_MIN || m->channels > SND_CHN_MAX) return (EINVAL); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index a7c53ac85eb8..8f414e07757d 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -534,24 +534,24 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) while (f != NULL) { sbuf_printf(&sb, "%s", f->class->name); if (f->class->type == FEEDER_FORMAT) { - snd_afmt2str(f->desc->in, buf, sizeof(buf)); + snd_afmt2str(f->desc.in, buf, sizeof(buf)); sbuf_printf(&sb, "(%s -> ", buf); - snd_afmt2str(f->desc->out, buf, sizeof(buf)); + snd_afmt2str(f->desc.out, buf, sizeof(buf)); sbuf_printf(&sb, "%s)", buf); } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(&sb, "(%d.%dch -> %d.%dch)", - AFMT_CHANNEL(f->desc->in) - - AFMT_EXTCHANNEL(f->desc->in), - AFMT_EXTCHANNEL(f->desc->in), - AFMT_CHANNEL(f->desc->out) - - AFMT_EXTCHANNEL(f->desc->out), - AFMT_EXTCHANNEL(f->desc->out)); + AFMT_CHANNEL(f->desc.in) - + AFMT_EXTCHANNEL(f->desc.in), + AFMT_EXTCHANNEL(f->desc.in), + AFMT_CHANNEL(f->desc.out) - + AFMT_EXTCHANNEL(f->desc.out), + AFMT_EXTCHANNEL(f->desc.out)); } else if (f->class->type == FEEDER_RATE) { sbuf_printf(&sb, "(%d -> %d)", FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); } else { - snd_afmt2str(f->desc->out, buf, sizeof(buf)); + snd_afmt2str(f->desc.out, buf, sizeof(buf)); sbuf_printf(&sb, "(%s)", buf); } sbuf_printf(&sb, " -> "); @@ -1330,25 +1330,25 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) sbuf_printf(s, "%s", f->class->name); if (f->class->type == FEEDER_FORMAT) { sbuf_printf(s, "(0x%08x -> 0x%08x)", - f->desc->in, f->desc->out); + f->desc.in, f->desc.out); } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(s, "(%d.%d -> %d.%d)", - AFMT_CHANNEL(f->desc->in) - - AFMT_EXTCHANNEL(f->desc->in), - AFMT_EXTCHANNEL(f->desc->in), - AFMT_CHANNEL(f->desc->out) - - AFMT_EXTCHANNEL(f->desc->out), - AFMT_EXTCHANNEL(f->desc->out)); + AFMT_CHANNEL(f->desc.in) - + AFMT_EXTCHANNEL(f->desc.in), + AFMT_EXTCHANNEL(f->desc.in), + AFMT_CHANNEL(f->desc.out) - + AFMT_EXTCHANNEL(f->desc.out), + AFMT_EXTCHANNEL(f->desc.out)); } else if (f->class->type == FEEDER_RATE) { sbuf_printf(s, "(0x%08x q:%d %d -> %d)", - f->desc->out, + f->desc.out, FEEDER_GET(f, FEEDRATE_QUALITY), FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); } else { sbuf_printf(s, "(0x%08x)", - f->desc->out); + f->desc.out); } sbuf_printf(s, " -> "); f = f->parent; From nobody Fri Jan 2 16:58: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 4djVJ75qwqz6LvGV for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ73rSDz42G7 for ; Fri, 02 Jan 2026 16:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS7U46pJ93FHBvaqDC3k79FgRX8GcW2yCon5O+eYIW0=; b=fzlr2bAoZKAT1Dew2nxX3ZFNgUdwLG3nmPn9dxov2VPLTrG+ewcm3uBhUIl1PKY4bT3evx hgf0HvNPt+/2+VUml/BFLyiMx8WpyI/VOiOnqHvWns6oQGg7j06e2B6H7oQOExxfzV6oLB IJ+GitOCloKfg6IMOlA22I31L9Bm0Lj+MQtiwqserEeb5at/geN5VXKQAdYMvzhffxofVt ITc3pKJcJ5Yvjh591jVkHtgj7sXSz9mE6bXvERtNAy5wOoW5m+27uDGwlZnxHg7qWkZoPC mhgz0t8wV3hV1O8uYzFsMbhPsJL06uqd3RzOQv4VmLG4GOW+k/B34kooah3eow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS7U46pJ93FHBvaqDC3k79FgRX8GcW2yCon5O+eYIW0=; b=pidixMdlcjd0x617+m8yxXLvM96I8aWicbV+xX46tstrrb1qO+ordaylmYIRTIA7oOLYNP K0I7btARrODEmsEn8Zc6nBtRmvB8mv+n0/O2dAatQgVuZJx1xKgC+OvQLy0QZZTpZUd2hl 8Kht4/lTjV/UMTcY4aW/Zg3CiqmFDXMD5EUDyY/LlUB8qfWp4PsjU6+JgQDu6amecc77Tf 0NlIL9uptsmvDhyDPr+vNI122a2Hd2SWdZjedHuGM4FrCw4A3dcJyrtE+o/v1mgram10P1 PR7JPV/GSmmupwDHZwf2sj6IFWP5mvUTQs7/tQJOxXVdRF6Io03uwnlVGP0pzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373095; a=rsa-sha256; cv=none; b=Sd8dtg/GF+nF3kWFqEIgnZIxGkLWK3qpuxjwIk0gJqIGeiVJ2PJ0M9Q/WDnkVenQ6EPIUe 2zK6Ofda54MBav1rmRMzRgG4xXm04uMlP1N0Nk8Myda05HXt8Dw8nNsU+oEtUKeCOVK2Tm lGY/AGsbU3s/DD3SjxtrPesVfMB4mxIfCPqnT4dUVXiXBVmM0Nd3jITK18AT5INMwN2BXv kObPO9Rc857QuKaqM2rzTj74V2mpptKTjP0OFgI3N8Fye9B1/WkHvdWT8M+BarWkWIgl9p J5Cds8kuKtGvw5pPI0bTceJpxU/Reh9SOr6gDPSNXTTjhkDvbpBH2e13zOxhzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ73RJMzBGw for ; Fri, 02 Jan 2026 16:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25002 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2b088823df5b - main - sound: Update pcm/feeder.h LICENSE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b088823df5b0f28c3839bf381c9517b7b0d60c0 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:15 +0000 Message-Id: <6957f927.25002.6361ef4e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2b088823df5b0f28c3839bf381c9517b7b0d60c0 commit 2b088823df5b0f28c3839bf381c9517b7b0d60c0 Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:47 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Update pcm/feeder.h LICENSE Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/feeder.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index ed4ebc91fca7..b479b108ff93 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -4,6 +4,10 @@ * Copyright (c) 2005-2009 Ariff Abdullah * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * 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 From nobody Fri Jan 2 16:58:16 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 4djVJ90ZG9z6LvgZ for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ84xZZz424Q for ; Fri, 02 Jan 2026 16:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OG4qI7kkPIfK/V8JFUYY4KysA4U2DIqPBqWAtCq0mE=; b=g+ZnqnemK9L+uGKMXRs2PmJhgkafbHalxs5sEM9uEFVMWhNRFcJwZ0wms8Rv7io7JZW2RD d0vzbKGqEFUE2puxAhVfEKUjf/AMxOEbA3xveTr1uwWzsOTJTRPwtxePuREc8RGkBMPDi/ 1P1p8hLGyQrASYBiTI5EHbkXQTOkBeextSZaBMLU17of3CmHm2Mz1IWh1bZM+tlRg+b8Oi oeam5dcnASIqi8bA5sa4+P0y8uyU9cFWN4YRpg2G4Q/nEU7AqXbuHuX4rvSOsvXab1DSUl bFVQ3c2jhs4pVj1c9quUq1OjyrTbgX6xE8oWp+soiPI7XY+wD7DynAg1P0CRJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OG4qI7kkPIfK/V8JFUYY4KysA4U2DIqPBqWAtCq0mE=; b=TJLlxCa6MqRSe44Gu2zZ1dDMVZ7iypION0bPCMfITW3D2HMLSZcmeCvsojBV7TMEhfh+MX RV4haAHl7d5wmLHJ1yKOJ4lD7fW11MmB0WRAFaq4jOalVdWckktrHAo7Hv1qqH9MNuHixw rY2fbjfOZ1qhHWO9OQPbPovzWph6puMgXnjEz3DyU8Th7/449GmpjmTC31uuyKYgDC6WV2 4ATMhBIDpQ9j7vuV8gLu4PAgUgtYlOz+l1tSk8+VDf5gR9RSUHd9dGYnrXjqJUUi0qlFkt cW6Ar++htZHtgWj7w3PVtKLT/ujxoCe8CLjGfEU6oge/9rC1IH0Y8nMLf//4ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373096; a=rsa-sha256; cv=none; b=Fm2BbaWYL/zD+FciNavy/PsDLPkrJ/QR/dtQ51BlDMljw7p+keJLaX7255HGhb/15+up6J dRAU+iUAzkajsicTE6s2Go0cEOyQr9q/EkofiZJbcw0yjqsoUmMl7oPNXXM/Qf5VAopjvj jefqiTe7ovewzy9USAWO+1SwFkAbB9n7ru0BRQlHnSo3SyrbgetJ1dXoZNDbIYL5QL1ybN 7AGdUuvwUkpTdLBQDvmHizvJef+BIB1YWO+H3rWmaExlqvXX9dO0aYcdluLFV/4/+aX9Go m5G2K4kDlJxRdmuEZJi2Rms7JSGanbPDl8kl8VoKRrqrWx+Mt7J8GeenvtMfJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ84GtbzBQB for ; Fri, 02 Jan 2026 16:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 6002ce537b6a - main - sound: Retire unused pcm_feeder->align List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6002ce537b6a0e524da1a60ccd70493d8cd59b9b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:16 +0000 Message-Id: <6957f928.23a6d.6db88735@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6002ce537b6a0e524da1a60ccd70493d8cd59b9b commit 6002ce537b6a0e524da1a60ccd70493d8cd59b9b Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:51 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Retire unused pcm_feeder->align Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/feeder.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index b479b108ff93..1f106787ee83 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -54,12 +54,10 @@ struct feeder_class { struct pcm_feeder { KOBJ_FIELDS; - int align; struct pcm_feederdesc desc; void *data; struct feeder_class *class; struct pcm_feeder *source, *parent; - }; void feeder_register(void *p); From nobody Fri Jan 2 16:58: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 4djVJB297bz6LvGY for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ95Nzxz41yx for ; Fri, 02 Jan 2026 16:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQz002S132sVjkZQEYVajnMFTKdlPzFrawQneDlDeu8=; b=FVtTI44Aj6grOuer0fsVfqutAXPbovwYgrEbu2x9Q9fktKC7BTQJAw0VOhpRvcKmstMeX+ r+439UqXoz8TcZHYCEWOQHf9DVVg6rg6yLoqW/4QeP8e7RtTE7kzrv21UllHN9rVeVEoD+ s3rsFVWB8jK1Xe91iMSTCcYrIx0rREXW9IuX/dqVTTCS82nJQu27XrdlYcuy5orFkozCQQ j5h+CLiecxuirMj9oqMrbhWkpykiFkxeI7K8vEoPVFpOUDEqSDHxZI8jHqkwjeuH2RzQFP 0AJQ3JYnNMynVBCVm4fqAt/+Is5p5VbMFEpFXNBmAbKmITNx0JffP0nF0+CAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQz002S132sVjkZQEYVajnMFTKdlPzFrawQneDlDeu8=; b=HyhVEaWbWJvvSirbO0yW9tb1z/YeQOgCL2j05g0QZHN4CDxdarBLvTeFYKMv+SV3nQ5Reg A2moSyPWUUN8C52GFXOnLMVCy02yL2dN3JmFM8J8FW2b2BsHiUJTabZOeBgIwcdJ50KU9c mVLUpbPIeaP9bHT5+gK97HrLLrqBJg6d6isZCUVk/awF2l8ERrhGDvIPrj5DRh8f7Qjuuw KgdhyH86KcL/Hm+lixM+5woPHaCfH2ICIrC/k5uJ+4hmiU0rwcgNdPaMokDqtIOkdsDEYL PKbrmwr/qBf1+GeX10gNZ2ZOCfusZr8WN8YQgVHCvGUH+UuUdoEOTpUzloZBoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373097; a=rsa-sha256; cv=none; b=ZEg8MofAsL/neU9zCZG2IgEBtihFns5y1pXuIctCGm0PMbsi4yLMx5qj1geGZHccZj64O1 V7qqu9eUZFEOxvveoqdqdWPDc0+c0jTX7c3U0TJs2M8tc6ZLuV1KdwI9b5FXj466lPpn2M jvuysp3DZFNEpdgKZS7DrH6nKZq4zIyz9LXRUuW98PMk/fQ5z/DeYh+hhL1ixp5bHTQ1Ad dwWI5crcAY405qY9WOh9a2BKw1nob7pnnOC+wcyoRIs68ZAAMidO00ZievJtX/2aRnXRC1 eYJx7TV7nlPN8vry8KCvV76FOD7YkFxL7WwdQ7xo28mMLvShWON2mbR9LOhVDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ9504xzBQD for ; Fri, 02 Jan 2026 16:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2418f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 21a2aa785d7d - main - sound: Get rid of unnecessary breaks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21a2aa785d7d7610b3e90e028ae782893d8c095a Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:17 +0000 Message-Id: <6957f929.2418f.4e2b7731@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=21a2aa785d7d7610b3e90e028ae782893d8c095a commit 21a2aa785d7d7610b3e90e028ae782893d8c095a Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:54 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Get rid of unnecessary breaks No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pci/atiixp.c | 1 - sys/dev/sound/pcm/feeder_eq.c | 2 -- sys/dev/sound/pcm/feeder_format.c | 1 - sys/dev/sound/pcm/feeder_rate.c | 7 ------- sys/dev/sound/pcm/feeder_volume.c | 1 - sys/dev/sound/pcm/mixer.c | 1 - 6 files changed, 13 deletions(-) diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 12906ecc6253..0d2228ee16cd 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -804,7 +804,6 @@ atiixp_chan_trigger(kobj_t obj, void *data, int go) default: atiixp_unlock(sc); return (0); - break; } /* Update bus busy status */ diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 4ab7334715d5..08e789f6a5ad 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -319,7 +319,6 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) if (info->state == FEEDEQ_UNKNOWN) info->state = FEEDEQ_ENABLE; return (feed_eq_setup(info)); - break; case FEEDEQ_TREBLE: case FEEDEQ_BASS: if (value < 0 || value > 100) @@ -343,7 +342,6 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) break; default: return (EINVAL); - break; } return (0); diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 25103b71d135..3226aebf9580 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -115,7 +115,6 @@ feed_format_set(struct pcm_feeder *f, int what, int value) break; default: return (EINVAL); - break; } return (0); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 7fe8ec856a88..63d7fe11003a 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1469,7 +1469,6 @@ z_resampler_set(struct pcm_feeder *f, int what, int32_t value) break; default: return (EINVAL); - break; } return (z_resampler_setup(f)); @@ -1485,18 +1484,12 @@ z_resampler_get(struct pcm_feeder *f, int what) switch (what) { case Z_RATE_SRC: return (info->rsrc); - break; case Z_RATE_DST: return (info->rdst); - break; case Z_RATE_QUALITY: return (info->quality); - break; case Z_RATE_CHANNELS: return (info->channels); - break; - default: - break; } return (-1); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index f7c93ca716e6..3e9e3484fba8 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -232,7 +232,6 @@ feed_volume_set(struct pcm_feeder *f, int what, int value) break; default: return (EINVAL); - break; } return (ret); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index f6eb669010b5..55b61ccb4911 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1071,7 +1071,6 @@ mixer_ioctl_channel(struct cdev *dev, u_long cmd, caddr_t arg, int mode, break; default: return (-1); - break; } pid = td->td_proc->p_pid; From nobody Fri Jan 2 16:58: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 4djVJD1NnCz6LvXw for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJC0GyMz42R1 for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArrTe4iue2UTq+b+tG8h8qw6gnNCcKmjGbvElHQkSg=; b=SVp5hdQvJ2Ten646hH88egO6Ub8PsyYQCB4VcYYGKEmJhaVXUXgl3YyDpTkUh7PW7RW9oU icmtgNtqc3AUbhRNaiLrZ7EHUAz/4f832jd74BSCstkEmMg9/V8Xc54lTMz5lNEpZpq7Ut ixdJH5cD4nnOn7VEdbjbs2OHN1gxUVJYpjKmFJxHSQ0+9pYyoJC68PzLaUzB3Bbxqu43BL NIUhqwmzdfuA5eoDFuVGgO548J1IPtjEvwn5S84VIoU8/+y1NYUJZxWIwVsUKsbos/BKn/ Kj3cNY+x6VLE7n0BidaOv1IO7MxRNuJ1DqNvq/qob6yU3n0OZwemZi9+6/9QJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArrTe4iue2UTq+b+tG8h8qw6gnNCcKmjGbvElHQkSg=; b=x3a0gzXE6KAMH2HBICPGVLXc6yDCF5dodgRWIe9aw5DjxDn46mizoAsEUg44IGZQ5DjCQu eBW9JvM0yOCBV1lFjAGm48SJWSHPjSG1HMdgBi3cep8Jwv3IG8q0dJxUJ8oUi/8TZAYLHs L6kSsIepihbRvHDTMpf1Bji0xs4jbEoK1qXk41NQ4FqO1pVJiivPyUnYrv6EAzdJsYpomQ 36bd7B31RBK6l3fWRVDFBmPLZGDeGVSEjPzVALAvedAaH4q7iZIkTbVck3lI8PYDaD479q dQqAobWwqRpYg/Buqxin1Hu9PblnTuB62EMrL6sWbglnEb2lI1ssGoUVpI6Egg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373099; a=rsa-sha256; cv=none; b=IHNBvBK1zkhNB0tZCc0Rvmpr6tQ71LVykZH/BcwMpy8+Z4R3E1DQwnEH5PQOExx/Y6JwHj nLkbgAJ87dHx3mcTxgBTkwcjV9TlWJpRHb9Dgt2CpndTRH0HWqgN9Usohu+af5/jlvLC1L OxkbCbBlnOGz1RQPPn3uC5feeeRt/O/C+PLq/yuKG/w5C/7568UpmnZBtRyqOdCYzR6GPS tmjkALZXUBDMbyU8j5v0Q/Jtw7byvYSS3lEjdJMK8NiawKWQgMW3GIs1XVjuyOxCV9Qn+Q 3JsWQlMQTmsD8u4l8mLFZM/fJ43QLdEfBpq9wZtFVjffzcoElJf+CKgBE3te0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJB5m2dzBSZ for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 45bb10e0ed5a - main - sound: Stop building midi as a module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45bb10e0ed5a0b87adcae33635400b5bc36337ec Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:18 +0000 Message-Id: <6957f92a.24212.62547574@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=45bb10e0ed5a0b87adcae33635400b5bc36337ec commit 45bb10e0ed5a0b87adcae33635400b5bc36337ec Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:57 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Stop building midi as a module There is no reason for this. The midi functions are used by drivers on-demand anyway. Use SYSINIT(9) instead to do the appropriate (de-)initilizations. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54125 --- sys/dev/sound/midi/midi.c | 44 +++++++------------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index cca7b93abf5f..bf8d602c75df 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -102,8 +101,6 @@ static struct cdevsw midi_cdevsw = { }; static int midi_destroy(struct snd_midi *, int); -static int midi_load(void); -static int midi_unload(void); SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Midi driver"); @@ -701,17 +698,16 @@ midi_destroy(struct snd_midi *m, int midiuninit) return 0; } -static int -midi_load(void) +static void +midi_sysinit(void *data __unused) { sx_init(&mstat_lock, "midistat lock"); TAILQ_INIT(&midi_devs); - - return 0; } +SYSINIT(midi_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysinit, NULL); -static int -midi_unload(void) +static void +midi_sysuninit(void *data __unused) { struct snd_midi *m, *tmp; int retval; @@ -731,38 +727,12 @@ midi_unload(void) midistat_unlock(); sx_destroy(&mstat_lock); - return 0; + return; exit: mtx_unlock(&m->lock); midistat_unlock(); if (retval) MIDI_DEBUG(2, printf("midi_unload: failed\n")); - return retval; -} - -static int -midi_modevent(module_t mod, int type, void *data) -{ - int retval; - - retval = 0; - - switch (type) { - case MOD_LOAD: - retval = midi_load(); - break; - - case MOD_UNLOAD: - retval = midi_unload(); - break; - - default: - break; - } - - return retval; } - -DEV_MODULE(midi, midi_modevent, NULL); -MODULE_VERSION(midi, 1); +SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysuninit, NULL); From nobody Fri Jan 2 16:58: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 4djVJD1ZDxz6Lv7k for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJD0Gc9z4250 for ; Fri, 02 Jan 2026 16:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXpsNYNprYikoXZwErC/qsZ6MC3IQnWnWN2Zrc9v8zc=; b=Jb15zHDEQO4IZVX8JxTX4leEeQmUoys45vxBSF8/d6SCGrGgww92Uc5+6i5k1girPQZruz 2ogWQoTbn8MV9F1wRB176Dblm0tcanzC5NqXsCtCzab5Xbc+iiit3I4WCMP/fNR1f+J/rG 5ZqvmNb8LxUPyuq58rGhtFKHgrO4LOzpeycfImxUfPEboQ9FINQNafR6CKwH0RlzCTHNvd cP7bQfqO9kb6jcOnboY7gfK6i+k5nkA8BWg/0zsk0UUYA/AodV6OhGqKXc7anVZCHLmsEr Z3oIV03y9lT26TCJ7kxnPb/uBQtkNqHaw5qeYPOEVFzEhM72lv3lxADn/ggZmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXpsNYNprYikoXZwErC/qsZ6MC3IQnWnWN2Zrc9v8zc=; b=P/ENNNbhxgbByEBHfHfYNkKlwouRz+0fXpEiph+jXlfvsjts+kgGoT9LqJzz0NTpqajGUa dLikvE35UwNr7XegmD9qLU4vd9DiSXa57XJgI5NlTaxC8vQF0pJPHSfpeot/iiqXRkGUAX 8wwQCeEeF6WWbgdJcx6CP4z4NPEVQcjnjSBMp7Aac7zOIWQ2YMw0+mUpZli7+ZQSuM7GP1 Y6l64hddPSlI6r6oGdtuxlswtqdsbfFGRJuyzvHpIxb6p+aeM03e6/P0SykjVR7YTxgCUQ GEWwPSzvjnWZUAyn7zBmd8xa/3pVmhnCFGbiSTbYeC+GlCWilhTJmgi8oU52PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373100; a=rsa-sha256; cv=none; b=xBpoad3cdgeA/T87vGVYyMe/7DNUkqsWCmVltDiWtH2adScIgk9vS7y2MLOI3otBA1eu41 msp/RDJ2quEuIT+vI6s5T3msiyKksYMh17KcZxq+Eu4DFcyIAMkdZLw3ixjDXibRIqbyTb PyZum9S0uoH3kXnlgIEYhfZQ7GRkbVZbozVm8ymZWXbEAv8Vqzc4hX7llLfNBIVA8Pk1rp bJh8Olf2ZNkwPIYqycOZNf+oTxdYGTSqwDt5GHRoWpE0wI3Dlvwtv4gJNQahVOpZ2qzBF5 oxuIWlZ91BOO3pHAhDawVGoB4urvC2sICxf4miQHuS/jMXZLSdP4EbDb73vK2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJC6VRdzBSb for ; Fri, 02 Jan 2026 16:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c508be8ca957 - main - sound: Retire midi_devs and mstat_lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c508be8ca9578ef6e3e4b31de1baca8038c0e0ae Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:19 +0000 Message-Id: <6957f92b.244a0.3c5409c9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c508be8ca9578ef6e3e4b31de1baca8038c0e0ae commit c508be8ca9578ef6e3e4b31de1baca8038c0e0ae Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:02 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Retire midi_devs and mstat_lock Nowadays midi_devs only has two uses: 1. To verify in midi_init() if a given device unit exists, as well as to calculate the next device unit. Instead, make sure we always get a unique unit and channel number using unr(9). 2. To keep track of all midi devices, so that it can destroy them all at once in midi_sysuninit(). However, since we stopped building midi as a kernel module, there is no reason to do that, simply let the drivers tear down the devices themselves. Also retire mstat_lock since it's only used to protect midi_devs. PR: 261071 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54126 --- sys/dev/sound/midi/midi.c | 130 ++++++++------------------------------------ sys/dev/sound/midi/midi.h | 7 +-- sys/dev/sound/midi/mpu401.c | 2 +- 3 files changed, 26 insertions(+), 113 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index bf8d602c75df..8a74732c8907 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -36,12 +36,11 @@ #include #include #include +#include #include #include #include -#include #include -#include #include #include @@ -62,8 +61,8 @@ struct snd_midi { struct mtx lock; /* Protects all but queues */ void *cookie; - int unit; /* Should only be used in midistat */ - int channel; /* Should only be used in midistat */ + int unit; + int channel; int busy; int flags; /* File flags */ @@ -75,13 +74,8 @@ struct snd_midi { int hiwat; /* QLEN(outq)>High-water -> disable * writes from userland */ struct cdev *dev; - TAILQ_ENTRY(snd_midi) link; }; -TAILQ_HEAD(, snd_midi) midi_devs; - -struct sx mstat_lock; - static d_open_t midi_open; static d_close_t midi_close; static d_ioctl_t midi_ioctl; @@ -102,6 +96,9 @@ static struct cdevsw midi_cdevsw = { static int midi_destroy(struct snd_midi *, int); +struct unrhdr *dev_unr = NULL; +struct unrhdr *chn_unr = NULL; + SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Midi driver"); @@ -111,70 +108,19 @@ SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); #define MIDI_DEBUG(l,a) if(midi_debug>=l) a -void -midistat_lock(void) -{ - sx_xlock(&mstat_lock); -} - -void -midistat_unlock(void) -{ - sx_xunlock(&mstat_lock); -} - -void -midistat_lockassert(void) -{ - sx_assert(&mstat_lock, SA_XLOCKED); -} - /* - * Register a new rmidi device. cls midi_if interface unit == 0 means - * auto-assign new unit number unit != 0 already assigned a unit number, eg. - * not the first channel provided by this device. channel, sub-unit - * cookie is passed back on MPU calls Typical device drivers will call with - * unit=0, channel=1..(number of channels) and cookie=soft_c and won't care - * what unit number is used. + * Register a new rmidi device. * - * It is an error to call midi_init with an already used unit/channel combo. + * "cookie" is passed to the MPU calls, and is normally set to the driver's + * softc. */ struct snd_midi * -midi_init(kobj_class_t cls, int unit, int channel, void *cookie) +midi_init(kobj_class_t cls, void *cookie) { struct snd_midi *m; - int i; int inqsize, outqsize; uint8_t *buf; - MIDI_DEBUG(1, printf("midiinit: unit %d/%d.\n", unit, channel)); - midistat_lock(); - /* - * Protect against call with existing unit/channel or auto-allocate a - * new unit number. - */ - i = -1; - TAILQ_FOREACH(m, &midi_devs, link) { - mtx_lock(&m->lock); - if (unit != 0) { - if (m->unit == unit && m->channel == channel) { - mtx_unlock(&m->lock); - goto err0; - } - } else { - /* - * Find a better unit number - */ - if (m->unit > i) - i = m->unit; - } - mtx_unlock(&m->lock); - } - - if (unit == 0) - unit = i + 1; - - MIDI_DEBUG(1, printf("midiinit #2: unit %d/%d.\n", unit, channel)); m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); inqsize = MPU_INQSIZE(m, cookie); @@ -211,8 +157,8 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) m->busy = 0; m->flags = 0; - m->unit = unit; - m->channel = channel; + m->unit = alloc_unr(dev_unr); + m->channel = alloc_unr(chn_unr); m->cookie = cookie; if (MPU_INIT(m, cookie)) @@ -221,12 +167,8 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) mtx_unlock(&m->lock); mtx_unlock(&m->qlock); - TAILQ_INSERT_TAIL(&midi_devs, m, link); - - midistat_unlock(); - - m->dev = make_dev(&midi_cdevsw, unit, UID_ROOT, GID_WHEEL, 0666, - "midi%d.%d", unit, channel); + m->dev = make_dev(&midi_cdevsw, m->unit, UID_ROOT, GID_WHEEL, 0666, + "midi%d.%d", m->unit, m->channel); m->dev->si_drv1 = m; return m; @@ -241,8 +183,6 @@ err2: free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); -err0: - midistat_unlock(); MIDI_DEBUG(1, printf("midi_init ended in error\n")); return NULL; } @@ -258,7 +198,6 @@ midi_uninit(struct snd_midi *m) int err; err = EBUSY; - midistat_lock(); mtx_lock(&m->lock); if (m->busy) { if (!(m->rchan || m->wchan)) @@ -280,7 +219,6 @@ midi_uninit(struct snd_midi *m) err: mtx_unlock(&m->lock); exit: - midistat_unlock(); return err; } @@ -680,16 +618,17 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) static int midi_destroy(struct snd_midi *m, int midiuninit) { - midistat_lockassert(); mtx_assert(&m->lock, MA_OWNED); MIDI_DEBUG(3, printf("midi_destroy\n")); m->dev->si_drv1 = NULL; mtx_unlock(&m->lock); /* XXX */ destroy_dev(m->dev); - TAILQ_REMOVE(&midi_devs, m, link); + /* XXX */ if (midiuninit) MPU_UNINIT(m, m->cookie); + free_unr(dev_unr, m->unit); + free_unr(chn_unr, m->channel); free(MIDIQ_BUF(m->inq), M_MIDI); free(MIDIQ_BUF(m->outq), M_MIDI); mtx_destroy(&m->qlock); @@ -701,38 +640,17 @@ midi_destroy(struct snd_midi *m, int midiuninit) static void midi_sysinit(void *data __unused) { - sx_init(&mstat_lock, "midistat lock"); - TAILQ_INIT(&midi_devs); + dev_unr = new_unrhdr(0, INT_MAX, NULL); + chn_unr = new_unrhdr(0, INT_MAX, NULL); } SYSINIT(midi_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysinit, NULL); static void midi_sysuninit(void *data __unused) { - struct snd_midi *m, *tmp; - int retval; - - MIDI_DEBUG(1, printf("midi_unload()\n")); - retval = EBUSY; - midistat_lock(); - TAILQ_FOREACH_SAFE(m, &midi_devs, link, tmp) { - mtx_lock(&m->lock); - if (m->busy) - retval = EBUSY; - else - retval = midi_destroy(m, 1); - if (retval) - goto exit; - } - midistat_unlock(); - - sx_destroy(&mstat_lock); - return; - -exit: - mtx_unlock(&m->lock); - midistat_unlock(); - if (retval) - MIDI_DEBUG(2, printf("midi_unload: failed\n")); + if (dev_unr != NULL) + delete_unrhdr(dev_unr); + if (chn_unr != NULL) + delete_unrhdr(chn_unr); } -SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysuninit, NULL); +SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_ANY, midi_sysuninit, NULL); diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h index 286e84264ef3..a4e6c2801150 100644 --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -41,12 +41,7 @@ MALLOC_DECLARE(M_MIDI); struct snd_midi; -void midistat_lock(void); -void midistat_unlock(void); -void midistat_lockassert(void); - -struct snd_midi * -midi_init(kobj_class_t _mpu_cls, int _unit, int _channel, void *cookie); +struct snd_midi *midi_init(kobj_class_t _mpu_cls, void *cookie); int midi_uninit(struct snd_midi *_m); int midi_out(struct snd_midi *_m, uint8_t *_buf, int _size); int midi_in(struct snd_midi *_m, uint8_t *_buf, int _size); diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 7d3edb6323ef..21141a0c8e3c 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -157,7 +157,7 @@ mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr, m->cookie = cookie; m->flags = 0; - m->mid = midi_init(&mpu401_class, 0, 0, m); + m->mid = midi_init(&mpu401_class, m); if (!m->mid) goto err; *cb = mpu401_intr; From nobody Fri Jan 2 16:58: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 4djVJG3b5qz6Lvmd for ; Fri, 02 Jan 2026 16:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJG1R7wz42XF for ; Fri, 02 Jan 2026 16:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Kxuq/XjOA7Tun4MDGYA5Tfz529KgERk4+lhatudTvQ=; b=d1cEIIz+3tFeLbCYi56uOmjVmsF0GvULx/ELsaznhvaqoVRyNgh12MvSVTMFBhdVpiGpay zNGDT//7D14v0rcf+hUVZtX7PDFipl3AX21nk/+wLhAuyYzr6VEtFmYlpr//pmNy9aUMV+ J6JNwDDZCoBCMfl23TdWhEnvb+XO7ZNfSyRsXumtw64tJ/8cCs6aLARdvTSDnXQTGIAlpE nQsDYYj4Ri5qmneG2CXRaCevOosTJfmTa4wDSFddUUHvWRRDR9HqMVua2ntsGGY6fG7SoL wJ5tabQjHNJQXEA8dzpyJYAyDb1E4qHPBRv64fcd1lYpMJkAD5OMczfKWSVogA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Kxuq/XjOA7Tun4MDGYA5Tfz529KgERk4+lhatudTvQ=; b=iidC12VWwytDzCoHQaPDxQXTDzNO0JTO3GAnubuhQGAyCLxDhLmlC9FoBAz5wlDnfF4HfV 2P3V+dEkZRvtJSnRjIAdSpvwZ+VHwu3yBXA26cvH3V3xBhkIX4BD8uAu11/pE4s7GjPzaK RmBej/CIg2BiyCL/NZErMqXzd80MP1Ksr8v/pGXBnHQmFFmtpl+/868AKTxN+2MHH1Bkis rzuQcxYgFVjMatZWkw44tf7Wb63uxUz+Juu7ayZLALWv4mLPkI7J9giA0aKDhulOhVAQdZ zjcSUpLZtsO2WH4lZVWg4m8hvMOF3JXs+odhzBJ+y3oAXuMpJ8q+DEe9zy6Z0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373102; a=rsa-sha256; cv=none; b=DTLU3UmKH4R08x0UqNakGHxlzHWnDT5h/WO2hQx+KlSM9jAFC8n1PXc8In7epHlTBHjtv9 svjMy88JU23jIrHsxOlszbZIx4usLDn4J6r2vtzvkkiaOJ2qU5NASZM5p0D4FbOBj4je+t tL2E8MkexUPmXQHh7I/eakplNvaPs0vxFKjrvWopsfErr40aP8Ge5yN6SZI81qjWqY/H64 kQ9OjHwGUBt5i7pFnovR6GY7UhOzzl/m4y2AgJsIN0KZe2kD/O8NheQSmMzx2qgBYqOecW adXwCcOMY3RzdH1pUWQQRxbPBJoNNJLkA/TMPl0L6mammFYVO5RvHfze2cPdeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJG0kHTzB3f for ; Fri, 02 Jan 2026 16:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4cc78f5dd7c2 - main - sound: Retire snd_midi->qlock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cc78f5dd7c2e82571ced6e23fa22d48c6cd1697 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:22 +0000 Message-Id: <6957f92e.244a4.6811698c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4cc78f5dd7c2e82571ced6e23fa22d48c6cd1697 commit 4cc78f5dd7c2e82571ced6e23fa22d48c6cd1697 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:12 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Retire snd_midi->qlock snd_midi->qlock is used to protect snd_midi->{in,out}q. However, apart from the numerous LORs present already in the code, there is no reason not to use snd_midi->lock, as we do for the rest of the structure Started by: https://github.com/freebsd/freebsd-src/pull/1902 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_nicolas-provost.fr Differential Revision: https://reviews.freebsd.org/D54129 --- sys/dev/sound/midi/midi.c | 60 +++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 8a74732c8907..0ed03dbc898b 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -58,7 +58,7 @@ MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); #define MIDI_NAMELEN 16 struct snd_midi { KOBJ_FIELDS; - struct mtx lock; /* Protects all but queues */ + struct mtx lock; void *cookie; int unit; @@ -67,7 +67,6 @@ struct snd_midi { int busy; int flags; /* File flags */ char name[MIDI_NAMELEN]; - struct mtx qlock; /* Protects inq, outq and flags */ MIDIQ_HEAD(, char) inq, outq; int rchan, wchan; struct selinfo rsel, wsel; @@ -131,10 +130,8 @@ midi_init(kobj_class_t cls, void *cookie) goto err1; mtx_init(&m->lock, "raw midi", NULL, 0); - mtx_init(&m->qlock, "q raw midi", NULL, 0); mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (inqsize) buf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, M_NOWAIT); @@ -165,7 +162,6 @@ midi_init(kobj_class_t cls, void *cookie) goto err2; mtx_unlock(&m->lock); - mtx_unlock(&m->qlock); m->dev = make_dev(&midi_cdevsw, m->unit, UID_ROOT, GID_WHEEL, 0666, "midi%d.%d", m->unit, m->channel); @@ -174,7 +170,6 @@ midi_init(kobj_class_t cls, void *cookie) return m; err2: - mtx_destroy(&m->qlock); mtx_destroy(&m->lock); if (MIDIQ_BUF(m->inq)) @@ -246,17 +241,18 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) { int used; + mtx_lock(&m->lock); + MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); -/* - * XXX: locking flub - */ - if (!(m->flags & M_RX)) - return size; + if (!(m->flags & M_RX)) { + /* We should return 0 but this may stop receiving/sending. */ + mtx_unlock(&m->lock); + return (size); + } used = 0; - mtx_lock(&m->qlock); MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", (intmax_t)MIDIQ_LEN(m->inq), (intmax_t)MIDIQ_AVAIL(m->inq))); @@ -265,7 +261,7 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) MIDIQ_ENQ(m->inq, buf, size); } else { MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); - mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); return 0; } if (m->rchan) { @@ -273,7 +269,7 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) m->rchan = 0; } selwakeup(&m->rsel); - mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); return used; } @@ -285,14 +281,14 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) { int used; -/* - * XXX: locking flub - */ - if (!(m->flags & M_TXEN)) - return 0; + mtx_lock(&m->lock); MIDI_DEBUG(2, printf("midi_out: %p\n", m)); - mtx_lock(&m->qlock); + if (!(m->flags & M_TXEN)) { + mtx_unlock(&m->lock); + return (0); + } + used = MIN(size, MIDIQ_LEN(m->outq)); MIDI_DEBUG(3, printf("midi_out: used %d\n", used)); if (used) @@ -308,7 +304,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) } selwakeup(&m->wsel); } - mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); return used; } @@ -324,7 +320,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) return ENXIO; mtx_lock(&m->lock); - mtx_lock(&m->qlock); retval = 0; @@ -365,7 +360,7 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) MIDI_DEBUG(2, printf("midi_open: opened.\n")); -err: mtx_unlock(&m->qlock); +err: mtx_unlock(&m->lock); return retval; } @@ -384,7 +379,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) return ENXIO; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if ((flags & FREAD && !(m->flags & M_RX)) || (flags & FWRITE && !(m->flags & M_TX))) { @@ -405,7 +399,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) MIDI_DEBUG(1, printf("midi_close: closed, busy = %d.\n", m->busy)); - mtx_unlock(&m->qlock); mtx_unlock(&m->lock); retval = 0; err: return retval; @@ -433,7 +426,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (!(m->flags & M_RX)) goto err1; @@ -443,9 +435,8 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) retval = EWOULDBLOCK; if (ioflag & O_NONBLOCK) goto err1; - mtx_unlock(&m->lock); m->rchan = 1; - retval = msleep(&m->rchan, &m->qlock, + retval = msleep(&m->rchan, &m->lock, PCATCH | PDROP, "midi RX", 0); /* * We slept, maybe things have changed since last @@ -459,7 +450,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) if (retval) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); m->rchan = 0; if (!m->busy) goto err1; @@ -483,7 +473,7 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) * If we Made it here then transfer is good */ retval = 0; -err1: mtx_unlock(&m->qlock); +err1: mtx_unlock(&m->lock); err0: MIDI_DEBUG(4, printf("midi_read: ret %d\n", retval)); return retval; @@ -508,7 +498,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (!(m->flags & M_TX)) goto err1; @@ -518,10 +507,9 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) retval = EWOULDBLOCK; if (ioflag & O_NONBLOCK) goto err1; - mtx_unlock(&m->lock); m->wchan = 1; MIDI_DEBUG(3, printf("midi_write msleep\n")); - retval = msleep(&m->wchan, &m->qlock, + retval = msleep(&m->wchan, &m->lock, PCATCH | PDROP, "midi TX", 0); /* * We slept, maybe things have changed since last @@ -534,7 +522,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) if (retval) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); m->wchan = 0; if (!m->busy) goto err1; @@ -567,7 +554,7 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) * If we Made it here then transfer is good */ retval = 0; -err1: mtx_unlock(&m->qlock); +err1: mtx_unlock(&m->lock); err0: return retval; } @@ -591,7 +578,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) revents = 0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (events & (POLLIN | POLLRDNORM)) { if (!MIDIQ_EMPTY(m->inq)) @@ -607,7 +593,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) } mtx_unlock(&m->lock); - mtx_unlock(&m->qlock); return (revents); } @@ -631,7 +616,6 @@ midi_destroy(struct snd_midi *m, int midiuninit) free_unr(chn_unr, m->channel); free(MIDIQ_BUF(m->inq), M_MIDI); free(MIDIQ_BUF(m->outq), M_MIDI); - mtx_destroy(&m->qlock); mtx_destroy(&m->lock); free(m, M_MIDI); return 0; From nobody Fri Jan 2 16:58: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 4djVJF2HqCz6LvmQ for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJF0ktNz42RL for ; Fri, 02 Jan 2026 16:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tk6dwxl5KF8GWLJNYwhrOt1i5dwxIMCG0qJEhyUr390=; b=VO9EpKxCqZD4bL9VUvx2ZSvZ8EuKcC+8a+WK+Oa/0RD/oJsOujh14yHuIkx5o+cekJyFGH 9dfVXBPDH1yvT83jo85CatPU8VRkVzuwD78KoQ0eVl2lk0l8uLArkzwUsdwDXXLAmZK4oi T5CKQi3C7c8Ve2Iv++0mODBS622j8bzfvGk8BvrjPTgAkTdojYv/cC0lp4088LeGsAgMQq czPb7o7jdSdWspAomKVjpeJpzXeMR5rcSnHzdDJL6hBdOqGN9FVJhkfF7TmaNzywqFVJ+T 747JgP/0/9gPORAE4iE3RfArJCqTGjQJR+ziDqXp5ueMz572PIuDv7ASzTtIlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tk6dwxl5KF8GWLJNYwhrOt1i5dwxIMCG0qJEhyUr390=; b=cGDGtiGR7uGsp4tfSYPzVQCeYOtlJhME5Yk7vhSyUHdQlnrXeSm2M6E5AQffnI0lyHeKBt RzLDav7ULOsii+AvLxNK6wpHT+gFodDt9z2u96T0TdmQi/8OjmB6KUrw8B3C1pdrsjoPPn LDH3ofKEruCYVnDgOH+9qw3qEdq4Ujn0I4cohhChDSQcUqlRUFPTOH2gqEmnf+teehUtAK +p5az6VhP36ciYcRFPHBU8Y/qB2ncHZTj5iWLrxGyOSj5Zh8dbhtHzlAh0iUIHzM74jXPL XP+U+ShnmTMEOu5LWuAYtVY7+XFRVZduXq3QqlL0GkpXkqnyNBLfPE5RdjBaUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373101; a=rsa-sha256; cv=none; b=xGQ7manG7ZZcQtWjPJv15zpoq+BOhOv0eTkw2eTuHE5PiWg57iZU/VjDxRhsPflNLvbn2u Sf50T8zFVFH+Nf2xZaQ6bdDniMTmDupsWC2zagNnvL00/S/MiLrH3Leeysj4rNBsSjp6iO qFHEmYCKSKIDeEYk1Kqx/Vyoi/Vt/WeJoxt2ZmNl7z6yYWNc/datA70iMoud8g40GXTjep htgW4jE9QHxzSJMBUOMMY6MoyvOrnwFLsUxpmzEB7DC1KKs5FIn+dHdycIpbGiTStelznB +VFMuNMsyhsAkyb54ScLjOnSTUdBDO6h6pyQgGtwC/xCE43YivXHC3NGIOa2TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJD73W0zBK9 for ; Fri, 02 Jan 2026 16:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 249de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e963472ef853 - main - snd_dummy: Initial MIDI support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e963472ef8533fb39b581e746cdc2ddc7447dca2 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:20 +0000 Message-Id: <6957f92c.249de.3911185a@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e963472ef8533fb39b581e746cdc2ddc7447dca2 commit e963472ef8533fb39b581e746cdc2ddc7447dca2 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:07 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 snd_dummy: Initial MIDI support Because testing the midi/ code of sound(4) requires a physical MIDI device, add some basic MIDI support to snd_dummy(4) so that we can test patches to midi/ easier. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54127 --- sys/dev/sound/dummy.c | 47 +++++++++++++++++++++++++++++++++ sys/modules/sound/driver/dummy/Makefile | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 74ca1d0c924c..aec76339ae17 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -40,7 +40,10 @@ #endif #include +#include + #include +#include #define DUMMY_NPCHAN 1 #define DUMMY_NRCHAN 1 @@ -66,6 +69,8 @@ struct dummy_softc { struct callout callout; struct mtx lock; bool stopped; + struct mpu401 *mpu; + mpu401_intr_t *mpu_intr; }; static bool @@ -93,6 +98,9 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; + if (sc->mpu_intr) + (sc->mpu_intr)(sc->mpu); + if (sc->stopped) return; @@ -294,6 +302,39 @@ static kobj_method_t dummy_mixer_methods[] = { MIXER_DECLARE(dummy_mixer); +static uint8_t +dummy_mpu_read(struct mpu401 *arg, void *sc, int reg) +{ + return (0); +} + +static void +dummy_mpu_write(struct mpu401 *arg, void *sc, int reg, unsigned char b) +{ +} + +static int +dummy_mpu_uninit(struct mpu401 *arg, void *cookie) +{ + struct dummy_softc *sc = cookie; + + mtx_lock(&sc->lock); + sc->mpu_intr = NULL; + sc->mpu = NULL; + mtx_unlock(&sc->lock); + + return (0); +} + +static kobj_method_t dummy_mpu_methods[] = { + KOBJMETHOD(mpufoi_read, dummy_mpu_read), + KOBJMETHOD(mpufoi_write, dummy_mpu_write), + KOBJMETHOD(mpufoi_uninit, dummy_mpu_uninit), + KOBJMETHOD_END +}; + +static DEFINE_CLASS(dummy_mpu, dummy_mpu_methods, 0); + static void dummy_identify(driver_t *driver, device_t parent) { @@ -354,6 +395,11 @@ dummy_attach(device_t dev) */ make_dev_alias(sc->info.dsp_dev, "dsp.dummy"); + sc->mpu = mpu401_init(&dummy_mpu_class, sc, dummy_chan_io, + &sc->mpu_intr); + if (sc->mpu == NULL) + return (ENXIO); + return (0); } @@ -368,6 +414,7 @@ dummy_detach(device_t dev) mtx_unlock(&sc->lock); callout_drain(&sc->callout); err = pcm_unregister(dev); + mpu401_uninit(sc->mpu); mtx_destroy(&sc->lock); return (err); diff --git a/sys/modules/sound/driver/dummy/Makefile b/sys/modules/sound/driver/dummy/Makefile index fb4127d35073..41dec7c83b4d 100644 --- a/sys/modules/sound/driver/dummy/Makefile +++ b/sys/modules/sound/driver/dummy/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/sys/dev/sound KMOD= snd_dummy -SRCS= bus_if.h device_if.h +SRCS= bus_if.h device_if.h mpufoi_if.h SRCS+= dummy.c .include From nobody Fri Jan 2 16:58:23 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 4djVJJ0Sfyz6Lvkh for ; Fri, 02 Jan 2026 16:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJH1kkVz42S2 for ; Fri, 02 Jan 2026 16:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+a5hoMkH8jQj2DW5ooxneGk3vAODxerVGa7ulJ2dsM=; b=xLMgiS8ZKGPK9PEz9Mfkt2pLpxopQZROxPT14upcvxjq+aNn96oAEk5HNA5XHL8WCY1iaT oVemUpJJEhUjzF/MHHcE0aUwHczukLkK+rD2EffLDW15UY7GKnCBSjvcRdyYGjKh/l++y4 hJ6Vj+Av33O5CMq4LuMmb3T+DwaFd9c6OmmRW0gWYLCXWYXrkYTpBt0CXr/MHhmA1jpzKo +ZaTgLhxuge9c+4l/PQlNJi9sSDtQbkrwYn3Y5l6BVDpT8v81jD+gh7c06EaCTSYYEinOW e//9XHUVj2VfLTnMEa8voS/4TxN0pN1j/rB0tF8Q53p6Le6nXP7Xs49l3u5o1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+a5hoMkH8jQj2DW5ooxneGk3vAODxerVGa7ulJ2dsM=; b=LycOzOlcSrW9uWredtvzaGxmC+5b1QjdAH3mOEuBDiXSOuqHN0ifGMggrmp+lxb+NMz/Si 182unbvMZe9uhHedTFg30mNxC4bZ+mB7i0bX/X5MHTPlk8aMEs3pDDteOrz9jlqCw/gGga KR8T8tliDcCm27aL7QhTdfm5bVfzmdDVL7z/VpmBQCX2kDKPAGgnE75RoDyeTQFk6txkLK HsWiwxjqOMqECBkyleN7QY7C/0aFap+CbITbUervl0zmU+7Y2M7FpbEXXurAnChy2Uz3z2 XbNSh/Mdv/yrDF7pF2weutgUir8PpoILA25voi4r/064b3SRDXLPt9lAAiMZJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373103; a=rsa-sha256; cv=none; b=rtbeSivh4h/yJQpCtMmiLxYp0/RnD5ashdAe1iTltUJ4xU/B4264yC6r16AgMujxZuXYop 7//xqUg/33M+Jm2Vh0lGoTGmdMD9mt7Og99xdMDcxO7HsJOYdtSYLb86rj2dxkev7wWOWT fHcTKc2VHU7lD5/A0XYnh5CgeDY0JlJNGp6LrgAqIL9oDA6y1I0UPILwXbyyGJq5jLB4Zw 4q3dI9E+qcBgMMIn2og3GrNV3OCKl6hId17yFUUQwPxmr0qMUhaVRtKbRmXc8STJ6qBeXS tqO27GTHM3Txr+NAvrXnQ4e/B5vGG+V8ONWw+kbFiGy0wmnBuTVH7AS19mM5OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJH1FN1zBH0 for ; Fri, 02 Jan 2026 16:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fb945a50e264 - main - sound: Update midi/midi.* LICENSE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb945a50e2649c9a1c3a9b38ffb84f53e37abd0a Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:23 +0000 Message-Id: <6957f92f.247c3.4f0fbec5@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fb945a50e2649c9a1c3a9b38ffb84f53e37abd0a commit fb945a50e2649c9a1c3a9b38ffb84f53e37abd0a Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:15 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Update midi/midi.* LICENSE Spsonsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 4 ++++ sys/dev/sound/midi/midi.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 0ed03dbc898b..901e098d4883 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -4,6 +4,10 @@ * Copyright (c) 2003 Mathew Kanner * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * This code is derived from software contributed to The NetBSD Foundation * by Lennart Augustsson (augustss@netbsd.org). diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h index a4e6c2801150..c012a9d96da6 100644 --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -3,6 +3,10 @@ * * Copyright (c) 2003 Mathew Kanner * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * 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 From nobody Fri Jan 2 16:58: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 4djVJK14N7z6Lvmv for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJJ3LJGz42Zy for ; Fri, 02 Jan 2026 16:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY3Dy1TDOfbv0IuD8RNMd1ZYDTsQHJY9BJe6vW12JNo=; b=oOcZko6bGAKGz5pDbucI5hp+20EYv5YPRDBfbEW9elXxh7zUbMIc/GWQxlQ0/kgWJeSyLo WRHFjbrZZP/Q4FRJvB4+YnkE2kOTbuB+cUV4AWxUZVAIIHoPoDjy9F6vFPRSTbmvOaUSgY AMT2LetHltp8lFxxOk/BWGKHHNEkuEFCVav1qw/VEz0e1TSI9D9kUIYzZL3y4kuj/QHla1 H2/kk8MwQ24VFJVjtY7lqCgxiFE73pc7RrfhjjB3RQERHSg8thJP8hPg7eYOeC4ru68GLu kkKCsSYvvtlLgI4ImHw1VA/db6BAbFgZxHNuyQJwDvNp3VwH0H09ACjd5ue2zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY3Dy1TDOfbv0IuD8RNMd1ZYDTsQHJY9BJe6vW12JNo=; b=Ank82lij8JkHlVDLruZIV5i00YZmm7BHPTYi9drNk7pzL5RVuxnicWRroc9Xq55aQOowN9 mvsQjoR74vEuoegad/7BOloJ89vUn6mkKYr4ZMTAECN0sKeFdjwBbhGkHff6GuxT66wFGW VbA53JaLNM+l1XGTuxfRbPCnQ1YJuqv/WiB+DGx7Sc4niKT+lgdStdmy4w719+mEZyIg6d L3a60XletUbBo55+/hXh4OxMbbduVugVOW844yKHsdUQB93QOu0iEu+O9SKwHAY6ha2HfJ 4GtCUhmLul0MZVtJF/IxCRJUDL72vAcvmFo7VklUlM2euarkvh63xfQrn5eTIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373104; a=rsa-sha256; cv=none; b=Fyon/YJR8U9rcuGrLjW/tO07YUmw7RIB0xsUTmGfCaeJ7UH+z+6FXwkFKSWVNjL+qX0yt3 cjrLn/x+4sxiTBgmgjqvvCHEEw+EA3VBf4BlPKJsZ7KOu2wBcVlsn9kxQVJIFG0xTo+lM5 DkNcLA1hDArw2BXuDrD3ij1f0woAUmv448thCobKTL0S1gbGIFciJwz/ydcPvxU1AKYIPv 2OFXX76aXBoygJjg/Gf+KyUCPTX41qBjDHPVvT/Y+t9Fw0TfyxsWuVrHPwYu97aYCML/hm GyXalk20LcrBciRMvTho7ADf/klVYVshamv27glZvSbF7eWr7hSSVw5ySwxfjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJJ1rrtzBMw for ; Fri, 02 Jan 2026 16:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 231b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d912ea5879cd - main - sound: Merge midi_destroy() with midi_uninit() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d912ea5879cd6b1042671ae3986d496c63be4d49 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:24 +0000 Message-Id: <6957f930.231b1.65ffa9ab@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d912ea5879cd6b1042671ae3986d496c63be4d49 commit d912ea5879cd6b1042671ae3986d496c63be4d49 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:19 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Merge midi_destroy() with midi_uninit() Also always call MPU_UNINIT(). It does not make sense not to if we are deallocating everything. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54192 --- sys/dev/sound/midi/midi.c | 57 ++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 901e098d4883..2567f7412eb8 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -97,8 +97,6 @@ static struct cdevsw midi_cdevsw = { .d_name = "rmidi", }; -static int midi_destroy(struct snd_midi *, int); - struct unrhdr *dev_unr = NULL; struct unrhdr *chn_unr = NULL; @@ -186,21 +184,15 @@ err1: return NULL; } -/* - * midi_uninit does not call MIDI_UNINIT, as since this is the implementors - * entry point. midi_uninit if fact, does not send any methods. A call to - * midi_uninit is a defacto promise that you won't manipulate ch anymore - */ int midi_uninit(struct snd_midi *m) { - int err; - - err = EBUSY; mtx_lock(&m->lock); if (m->busy) { - if (!(m->rchan || m->wchan)) - goto err; + if (!(m->rchan || m->wchan)) { + mtx_unlock(&m->lock); + return (EBUSY); + } if (m->rchan) { wakeup(&m->rchan); @@ -211,14 +203,17 @@ midi_uninit(struct snd_midi *m) m->wchan = 0; } } - err = midi_destroy(m, 0); - if (!err) - goto exit; - -err: mtx_unlock(&m->lock); -exit: - return err; + MPU_UNINIT(m, m->cookie); + destroy_dev(m->dev); + free_unr(dev_unr, m->unit); + free_unr(chn_unr, m->channel); + free(MIDIQ_BUF(m->inq), M_MIDI); + free(MIDIQ_BUF(m->outq), M_MIDI); + mtx_destroy(&m->lock); + free(m, M_MIDI); + + return (0); } #ifdef notdef @@ -601,30 +596,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) return (revents); } -/* - * Single point of midi destructions. - */ -static int -midi_destroy(struct snd_midi *m, int midiuninit) -{ - mtx_assert(&m->lock, MA_OWNED); - - MIDI_DEBUG(3, printf("midi_destroy\n")); - m->dev->si_drv1 = NULL; - mtx_unlock(&m->lock); /* XXX */ - destroy_dev(m->dev); - /* XXX */ - if (midiuninit) - MPU_UNINIT(m, m->cookie); - free_unr(dev_unr, m->unit); - free_unr(chn_unr, m->channel); - free(MIDIQ_BUF(m->inq), M_MIDI); - free(MIDIQ_BUF(m->outq), M_MIDI); - mtx_destroy(&m->lock); - free(m, M_MIDI); - return 0; -} - static void midi_sysinit(void *data __unused) { From nobody Fri Jan 2 16:58: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 4djVJL01vnz6Lvcr for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJK2wYcz42dc for ; Fri, 02 Jan 2026 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PQfazM+XK/40OpQNn2pU+cSIFukPogsGmVQtTbOo3o=; b=o6VuCGtb5zuuHtvEIJMjtvL8UN+GWOBI6PNyhaEkDbSH5Ro7LXqataYd8mpwKLxpSirq9G zqYTHmitnkRkz4wGBQ8jqZzA+7SFMNz+P4dORUW8rvgFaxn/5zYqYOHtK9Sg5g1lY7Vxfh cioIRYrMTxUVUf6PbK4iJzskVxEz8hbpbEmOSub1UY1GvV9+8+rI2W5fQl9DY/ImRlajq1 3eEYl6DQdJx1h+bkcdevEjP2f4dSr50XqoW1AENT6cR6k4eRNi/F6Q5yBinlbk067iBI7M lfgq1SUmycm6MOIN7rtO6Nb/CgsAZO31Puy9gyYyXgZLOGs1sS2ejije7e5pyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PQfazM+XK/40OpQNn2pU+cSIFukPogsGmVQtTbOo3o=; b=O1hkxd8PKycNClxLOQ/YOSHuBbmr8PoSaRmjKX71jkyhGYm1OPt29ODv+FWSNEqk6AsDkM ZTusFGyZBrSchLwlliT5wprjV08ngCyqEDUqpyjHLjOqx3lZtYNHdJrMSIyuWIwDZIIMnp Ku1ZBnZ6EarkGzXEl/ifNSNxTOKfYSjZZmRmti1/0djNp1EpIn9hotlmtdQOmT5W2KWi78 OoP2MXcwZzLJ2676GU6Zwr4dLqNUBTCiwX59tunZP5kRGvqKTGny5Zb+k0ZR9G7s3aJqSU TvWAdXVEx3Q6i1sj1u7LNu4u3qO3bMQNiHNPM9EZKAt9fWb5ghWDtt0PH8+4gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373105; a=rsa-sha256; cv=none; b=wCqz1PhkueiQQQ4Tp0ACtWHbhy34PTF+zb/TnqN/PZ7DWew9tAYG7RqxIJcFgKorXrC3Qf p5fcEErWYuHB+DGHQ3UA45yU+dLIIqwqKOFWV4Oz2OBa6xS64YW8pCJhSH9IgsjRx8Lebw mPT9WIHmkKPe3qSTky6+rFb2JUKoYZglCeSpaNoAHcbZu+VCD1bUVNBRvyiwC95/nJFNdE xtRWhC6W+MBJ1C1kq2kupESlygtwU8AHGhHEKLHza//7cG/j/pY2G6DASQ2V5R/QBNML2Q SPo+ZBNLfQoAuh4Xb7fPflDwK3SAqCzdGiCnufxq9ioAdooVPSvLgNIROGdRUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJK2WXWzBH1 for ; Fri, 02 Jan 2026 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d54c782fde63 - main - sound: Retire snd_midi->busy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d54c782fde63d3b17433551da0b7ec94bc2a5ed4 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:25 +0000 Message-Id: <6957f931.228e9.4bc769d9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d54c782fde63d3b17433551da0b7ec94bc2a5ed4 commit d54c782fde63d3b17433551da0b7ec94bc2a5ed4 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:22 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Retire snd_midi->busy Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 2567f7412eb8..aa039018e207 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -68,7 +68,6 @@ struct snd_midi { int unit; int channel; - int busy; int flags; /* File flags */ char name[MIDI_NAMELEN]; MIDIQ_HEAD(, char) inq, outq; @@ -154,7 +153,6 @@ midi_init(kobj_class_t cls, void *cookie) (outqsize && !MIDIQ_BUF(m->outq))) goto err2; - m->busy = 0; m->flags = 0; m->unit = alloc_unr(dev_unr); m->channel = alloc_unr(chn_unr); @@ -188,20 +186,13 @@ int midi_uninit(struct snd_midi *m) { mtx_lock(&m->lock); - if (m->busy) { - if (!(m->rchan || m->wchan)) { - mtx_unlock(&m->lock); - return (EBUSY); - } - - if (m->rchan) { - wakeup(&m->rchan); - m->rchan = 0; - } - if (m->wchan) { - wakeup(&m->wchan); - m->wchan = 0; - } + if (m->rchan) { + wakeup(&m->rchan); + m->rchan = 0; + } + if (m->wchan) { + wakeup(&m->wchan); + m->wchan = 0; } mtx_unlock(&m->lock); MPU_UNINIT(m, m->cookie); @@ -338,7 +329,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (retval) goto err; } - m->busy++; m->rchan = 0; m->wchan = 0; @@ -384,7 +374,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) retval = ENXIO; goto err; } - m->busy--; oldflags = m->flags; @@ -396,8 +385,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) if ((m->flags & (M_TXEN | M_RXEN)) != (oldflags & (M_RXEN | M_TXEN))) MPU_CALLBACK(m, m->cookie, m->flags); - MIDI_DEBUG(1, printf("midi_close: closed, busy = %d.\n", m->busy)); - mtx_unlock(&m->lock); retval = 0; err: return retval; @@ -450,8 +437,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); m->rchan = 0; - if (!m->busy) - goto err1; } MIDI_DEBUG(6, printf("midi_read start\n")); /* @@ -522,8 +507,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); m->wchan = 0; - if (!m->busy) - goto err1; } /* From nobody Fri Jan 2 16:58: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 4djVJM1bgrz6Lvkx for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJL4K1Dz42PV for ; Fri, 02 Jan 2026 16:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ba760gglGnGuAZHy0nEgJpqEG+GvPV5/sZWqaF9pCU=; b=e5cSUl5si7kc+25Kt/0Ijq8HKa8PIjvKC2h17tgX9r6ZcpAiKWBRiq+i7hOyQDPOZnRtf3 fwaZSlaF1y8qWDfW8uc8/rm2j+Uq0Wa4F3NDyjxYKHnZroxf06GEMtBzZqyo8IW90RDuNS QU8pmAZWW9i1Q3bpTRsIcTeBm8jJVeoYhyw1kErTYnSXwDu3SFM2lZMJ47EofkDyfcF5+w HTJQthSddKEVwv4vrLki7iQyMl9h6Y82s8ZHTQB+4aDAUiDaHPmvGij+54+zl68TGQ9DVC RaCiT8CLTsS5mTS4ckzJ6ZEXnZb1LGHzaDhefh3Vtv3SKgSQ1jMyRq7Ftjv70w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ba760gglGnGuAZHy0nEgJpqEG+GvPV5/sZWqaF9pCU=; b=DN+NxjdiMu6+V3AMcEqwc7GwE3NnhhYaxTwyfRbFhdCC17rwf5CQaqPHy6phvopiBvftqG rDxTIB1xAxqptdiWOt6yF6vXJqFz0qtkAQ944EZ7mZ/gNp8V3AScKtvvgH5RzxGzKI5DfA wsncoakhs/wOmMzMu70NmN8Ij9Le8Yy0yjRQjks1dF5yBUULd7YHu8fF+ydewPU79ueOYl Svt5B95TCN/DM6vMpxNop/5VXl46Fv8G5bFsa3QhKFV7TDaV7FHPlxPDNmzJe8ZIfixQ3z cE2Iu7nMyMfWBAn8iMGV13HW/sSp1J+aOjyyy9rvQJTI216QwgKi2bqbV4/1aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373106; a=rsa-sha256; cv=none; b=hlzrw96zf1hXbpnRnWWGos0eMt4jCqR2pp7ejXF8kXvh/0MpQ7gziZc6pd1nJ8hbb2kVfu RZ1XCpuDZ5qkiXvB7d/+pPvg5+KnE8dG0bRGZo4qiieLkzA8cGlbB1bf2Jeze8A8JilhZu GZe0XCyjlQbeKnw/lDE5wsKxeceT8354fJxTPuP+fDlQllVZSh/YusiY5KG7Xaf2fdNxcg wOPqqspiVkkr+hPG6l54jir3/mAd+2H+UiOKX8gclZ2Yd+WFELTrMK2pmpFl7f9ojVjJ3d afJ7BMq1wMbqMKUUFIqJZ5MxhVrPW7YkDCnhY6bBv5GKWcRzT2Y6kcVu4kktXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJL34QRzBSf for ; Fri, 02 Jan 2026 16:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d2baf9301be3 - main - sound: Remove dead if-statement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2baf9301be3093c5f53a7ce1de858a0c690cd07 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:26 +0000 Message-Id: <6957f932.23a72.2bd010b0@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d2baf9301be3093c5f53a7ce1de858a0c690cd07 commit d2baf9301be3093c5f53a7ce1de858a0c690cd07 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:24 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Remove dead if-statement No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index aa039018e207..f54b95daf280 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -432,7 +432,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; if (m != i_dev->si_drv1) retval = ENXIO; - /* if (retval && retval != ERESTART) */ if (retval) goto err0; mtx_lock(&m->lock); From nobody Fri Jan 2 16:58: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 4djVJM6vZbz6LvqP for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJM46nmz42Xy for ; Fri, 02 Jan 2026 16:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8SbiTB1u5gjtbEQXQ8hsn0fGKu7eS6d2M7UgPVqLc78=; b=xOd/E3b4KX+B+CxkEhCCS8ioYLDgjg04jyUCR23CYRdFS0Gxuff7J+bPXcKaGzTWsc4oxq tgoDcRfNEvZBrblraxXv8X+pTeZf9fdnstX+KR+ONDBp2PuT2JgfOMWE3dEQwPSTGXd/F3 EIrePkJJCKQWHjfWMWHSX1bcyv5FcYcOaZD6wG2q5l3QNN/soAkrTdynC1SFbKWCZGEN7M bretleLwKFbPtAuInPW6UhTIFTEDPp1mp02D6hvnGruckmDFMcB2r439mjvoh66U0jM42Y XqzLeWFszFxXPci/bSIe9/qZoqy32+K69Nr5kW+6RDxi4Zs+n9FJEtmnTl4KDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8SbiTB1u5gjtbEQXQ8hsn0fGKu7eS6d2M7UgPVqLc78=; b=uhI/D8VRC5Fr0+G6C0qTex22IHgGCLW2SRhYDgie66ynZ9yCtrVVrbg1GqnBtEob+K15/q 5WQR5k+XFB6EQYij3JKbz6RnU3TDcjlPLMAeGz+XPkuhIKfurbqNdJ0BkEoxYeZ8wZJdLH My4hYy2oAouiYrnLjzUx6e9ec0Kbl/I0XUHhO7nszHSHNhJdwvalyTzr5crPniyTbhmr4U /n4okuAB3FJVPU/oHypl/J+CZadUMda1jIcrtZRXSO2LCj9nqtOvuM//iQZoh2yOqsTLV6 63WznwNsKsosl28KN0Q+ckLMMnSbcQ4AbWHtgvoF4hZEWDRrM9NclSeYaHoh+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373107; a=rsa-sha256; cv=none; b=PMvoHbkTzIn0JOZGSYT2EvozSTLxeEo67pzl0iL4i1D1s1//r104xT32pZyWVVykSofEZi ROKhObI1IMmGrkvFOvKDHAO9Wr1XRuIMvnY0LQxZLmjJ5j2+znqprJ+b5esVJ9GGpniYHL ymKjQawttW2TPNytzMTuZoTNIg8TDEkBYuliaCv1zLP3BsyNGkT64fHwW90qeUWGT1O2AZ TaaZS9dDGVBXCEGWSpj8eYLXqAKlUKfajTni1OX55Izy4AGMX4M+8FhVAaH5B1fvGPQqng 6pOkYRJup+v32hq7C6d8oXiFfAo0eesl0icdg0OeDAneSvEYTSQjr80z4Xxz3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJM3fkwzBDQ for ; Fri, 02 Jan 2026 16:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2464d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d6121f7b508b - main - sound: Rename midi_cdevsw name to "midi" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6121f7b508bf889359e116da1efab08f848e129 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:27 +0000 Message-Id: <6957f933.2464d.47f82c2@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d6121f7b508bf889359e116da1efab08f848e129 commit d6121f7b508bf889359e116da1efab08f848e129 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:27 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Rename midi_cdevsw name to "midi" Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index f54b95daf280..c658c8001b94 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -93,7 +93,7 @@ static struct cdevsw midi_cdevsw = { .d_write = midi_write, .d_ioctl = midi_ioctl, .d_poll = midi_poll, - .d_name = "rmidi", + .d_name = "midi", }; struct unrhdr *dev_unr = NULL; @@ -109,7 +109,7 @@ SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); #define MIDI_DEBUG(l,a) if(midi_debug>=l) a /* - * Register a new rmidi device. + * Register a new midi device. * * "cookie" is passed to the MPU calls, and is normally set to the driver's * softc. From nobody Fri Jan 2 16:58: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 4djVJP2jq2z6LvZH for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJN5GN2z42W2 for ; Fri, 02 Jan 2026 16:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqQb3P9zVAG0tN0XQn2v4+3PoElmBE7DTjfXyysOkxs=; b=SaQCJ+7nxR9ErOrR5A0WMiY+uVDynlqCxumcuYAAGWQzyiCpw8N4/UaT6gWKRsNZQ3DhCs CP7fq0z3oTPtHLInJ3VGo+qivb6ehbLGVQ+7IRuFRraSGvWJVmtwpd52G9UJLW8Tx6LQpL L4U8+rXAU4DzqlFfw+guhUfNAtuPHSJ/I7zk73fMcRXPmsEerzFedew3UqEuBARLpyihX/ E0yViz787UZYX9RKl3FuTigyBS3r4SiDG9v98lN8+67TsX423FpGniyU6aKi/CPOjUrH4R fwOli+X2ihF73bm92YoR6zJaOsjFtubJDr28gwYO/UIK8l2CdYYuqa8xgCJIbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqQb3P9zVAG0tN0XQn2v4+3PoElmBE7DTjfXyysOkxs=; b=AFjhTOUitHiCTP4xSRsMbigPy4YJJ/8EDLo7Eh6boLHbJNJSoslvqP+NoJ/a0mI9zhb3cK oYRzLDGel19/fWX1SnNVgu2haZegSwfr4yDNO05MUvnIdR+fPdA5tLnVy/m2Wc7n8/Adbv CVeKMjJrEbfH2db7E5XFj7JCrjknAbksl0Kl7f316th++uhGEc2wnzKMwRA2ErBhR5hFvi HXq9PUTTg929j3TKaUVou99oJLXrisiQuZYa28hFDw1Sto0aFUk8qEW0Ah1ZK2FDHbuTt4 MRmkc7/aRboXJ8tliSnMZkGcKoYuLvMSxxF9Wg3Fzzb7D4fIyOt6XlWIfQGPWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373108; a=rsa-sha256; cv=none; b=RIHSlnx492rEYk7r9zLPEaGdsj2A3ip2QTP08kIpDFuDuCP+Gn4XCNVQMNkYAqxCdzkD4I VMsCANOEchaR9onhHbnlXd35EkHrxO0m+f5Wt1F18D0ATWD76GJl+c70fvmADiz4Fycd61 ZB6zTyE1uRcxO/n5UYuugInVQx1o6rSmw3ecVpOna1m7NIoMYYNJPU2/PpaRAKpuzTSjbN TYGNHv48Zm59micmE9REtLTZntkGxK0RpaaSQqnmz9tQntmT7teuAtgN+GoLQyQyWxSTRO uGpnXGbytr5EwuTFRAKaJzi1Fs8tCsOvIpkCCyw3mPBUqDpfZRXYqzAOC1bbWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJN4PGVzBSh for ; Fri, 02 Jan 2026 16:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24193 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c288595c4eac - main - sound: Retire MIDI_DEBUG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c288595c4eac14616f94c5b7eb84aad2eeeffc1f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:28 +0000 Message-Id: <6957f934.24193.62c224dc@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c288595c4eac14616f94c5b7eb84aad2eeeffc1f commit c288595c4eac14616f94c5b7eb84aad2eeeffc1f Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:29 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Retire MIDI_DEBUG Better logging will be implemented. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index c658c8001b94..9b61e972fab9 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -99,15 +98,6 @@ static struct cdevsw midi_cdevsw = { struct unrhdr *dev_unr = NULL; struct unrhdr *chn_unr = NULL; -SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, - "Midi driver"); - -int midi_debug; -/* XXX: should this be moved into debug.midi? */ -SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); - -#define MIDI_DEBUG(l,a) if(midi_debug>=l) a - /* * Register a new midi device. * @@ -126,7 +116,6 @@ midi_init(kobj_class_t cls, void *cookie) inqsize = MPU_INQSIZE(m, cookie); outqsize = MPU_OUTQSIZE(m, cookie); - MIDI_DEBUG(1, printf("midiinit queues %d/%d.\n", inqsize, outqsize)); if (!inqsize && !outqsize) goto err1; @@ -178,7 +167,6 @@ err2: free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); - MIDI_DEBUG(1, printf("midi_init ended in error\n")); return NULL; } @@ -233,8 +221,6 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); - if (!(m->flags & M_RX)) { /* We should return 0 but this may stop receiving/sending. */ mtx_unlock(&m->lock); @@ -243,14 +229,10 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) used = 0; - MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", - (intmax_t)MIDIQ_LEN(m->inq), - (intmax_t)MIDIQ_AVAIL(m->inq))); if (MIDIQ_AVAIL(m->inq) > size) { used = size; MIDIQ_ENQ(m->inq, buf, size); } else { - MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); mtx_unlock(&m->lock); return 0; } @@ -273,14 +255,12 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - MIDI_DEBUG(2, printf("midi_out: %p\n", m)); if (!(m->flags & M_TXEN)) { mtx_unlock(&m->lock); return (0); } used = MIN(size, MIDIQ_LEN(m->outq)); - MIDI_DEBUG(3, printf("midi_out: used %d\n", used)); if (used) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { @@ -304,8 +284,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) struct snd_midi *m = i_dev->si_drv1; int retval; - MIDI_DEBUG(1, printf("midiopen %p %s %s\n", td, - flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); if (m == NULL) return ENXIO; @@ -347,8 +325,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) MPU_CALLBACK(m, m->cookie, m->flags); - MIDI_DEBUG(2, printf("midi_open: opened.\n")); - err: mtx_unlock(&m->lock); return retval; @@ -361,9 +337,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) int retval; int oldflags; - MIDI_DEBUG(1, printf("midi_close %p %s %s\n", td, - flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); - if (m == NULL) return ENXIO; @@ -403,9 +376,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_RSIZE]; - MIDI_DEBUG(5, printf("midiread: count=%lu\n", - (unsigned long)uio->uio_resid)); - retval = EIO; if (m == NULL) @@ -437,7 +407,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) mtx_lock(&m->lock); m->rchan = 0; } - MIDI_DEBUG(6, printf("midi_read start\n")); /* * At this point, it is certain that m->inq has data */ @@ -445,7 +414,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_LEN(m->inq), uio->uio_resid); used = MIN(used, MIDI_RSIZE); - MIDI_DEBUG(6, printf("midiread: uiomove cc=%d\n", used)); MIDIQ_DEQ(m->inq, buf, used); retval = uiomove(buf, used, uio); if (retval) @@ -458,7 +426,7 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) retval = 0; err1: mtx_unlock(&m->lock); -err0: MIDI_DEBUG(4, printf("midi_read: ret %d\n", retval)); +err0: return retval; } @@ -475,7 +443,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_WSIZE]; - MIDI_DEBUG(4, printf("midi_write\n")); retval = 0; if (m == NULL) goto err0; @@ -491,7 +458,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) if (ioflag & O_NONBLOCK) goto err1; m->wchan = 1; - MIDI_DEBUG(3, printf("midi_write msleep\n")); retval = msleep(&m->wchan, &m->lock, PCATCH | PDROP, "midi TX", 0); /* @@ -514,11 +480,7 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_AVAIL(m->outq), uio->uio_resid); used = MIN(used, MIDI_WSIZE); - MIDI_DEBUG(5, printf("midiout: resid %zd len %jd avail %jd\n", - uio->uio_resid, (intmax_t)MIDIQ_LEN(m->outq), - (intmax_t)MIDIQ_AVAIL(m->outq))); - MIDI_DEBUG(5, printf("midi_write: uiomove cc=%d\n", used)); retval = uiomove(buf, used, uio); if (retval) goto err1; From nobody Fri Jan 2 16:58: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 4djVJQ40bJz6LvjQ for ; Fri, 02 Jan 2026 16:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJP615Tz42k1 for ; Fri, 02 Jan 2026 16:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUcdOGVxlXKzUu4uQh/f3UUVMqulVObJV1dpQ+V3pG8=; b=RTzVutFNgk2ZvUjUI96ZFUcdXI9VSB3xSDrtJe+mDeIcVBq5MnsU1VKtm6lo+9RisE3KxK k7S40K2IqrZQSFmzjydeCGuXuBvHLoyKwCe+glQwJhRuL2kT6TkuSlj0KuMHipdZfyvNXn 5y7JrBHaqCinL/Ij/AS48159qpfj9YmVLnRCtklclNZ7ZroN0mPc+3KPG9EjSDFUtHlomQ 635I9VIMZd2rLFOAfY/8rw/u1la3KRx/zpGMPCFbVwNNE4jLgO0SNigUlBPRFvYaaiwkpv ovrcvzGT1LESu1S3LwQnjXVwSe6AJT+QqC/D89zY/Labxp8ix0p0huNSqtWogQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUcdOGVxlXKzUu4uQh/f3UUVMqulVObJV1dpQ+V3pG8=; b=g5YZZGNlPPx49AjYILB/V1rj+PSnJbq5ihfJl5MhO8vqFVSwynNfHqI8bQEhqNCtCqGDOL 9+eIj17eSPPbcsDRkrxfZi+TXRo/WoTOSKjr4Uzw6sPUmLoQ+JwdRDB8v7aMhtRTl75shp MXZLUYbzz0cTbcp7M45h9w+Ka8FKuFRiArIENvSANbswPiYEzU9C4MxxXHRF9vJ5tMXTtS 3XXo4KIVYZVZzpQVGv1AcFXVJ+bK5dQ4f2yY3+bepM6RxRJw/aZUGFPebUb9/LE2WPDSYU qMth9nkamNuu7d7Bt87u8nYzfKiVwsmcWhqxQ3TjtpxmCxMGAEr/geGie1tJKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373109; a=rsa-sha256; cv=none; b=jND32lEshOvN1f0iARM6fbXJ4s3tdu9WbvS+zAeZI4W6iCrTx0Vdm2CCFf+TJYTKTfKDCj z6WvDBj5108vorHmAxIfq8bKfVlWzagcbqo2U45eQoRv/XpGGAO2jdlAVeEZsU7mrbauQk Myvmyjy5qBg06ODbH20kYJCPTw+PCP5KkLq93BAt4KetuLTi9aZcBN3WYdzG/IECuRD/FB Jyzr89Feuo5EHfQ9pwqkIszQXx8rl/9l50Q+uCkkPuqA0JqwhjtcumBErk4fVBSsK2Twkk 8FSDJxDo5Woc0XoNBs0dHiOBjUKeWhmvb1zOrPGLdPzBxeUnAeUb1xgNsa/NhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJP4xK8zBKG for ; Fri, 02 Jan 2026 16:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3b9e776498a7 - main - sound: Retire MIDIQ_DEBUG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b9e776498a7e3e96c1a351fdd561f25803718df Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:29 +0000 Message-Id: <6957f935.fc7d.23f0ecef@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9e776498a7e3e96c1a351fdd561f25803718df commit 3b9e776498a7e3e96c1a351fdd561f25803718df Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:31 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Retire MIDIQ_DEBUG Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midiq.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h index 17def1805363..27958ff4c23e 100644 --- a/sys/dev/sound/midi/midiq.h +++ b/sys/dev/sound/midi/midiq.h @@ -52,38 +52,23 @@ struct name { \ #define MIDIQ_FULL(head) ((head).h == -1) #define MIDIQ_AVAIL(head) (MIDIQ_FULL(head) ? 0 : (head).s - MIDIQ_LENBASE(head)) #define MIDIQ_LEN(head) ((head).s - MIDIQ_AVAIL(head)) -#define MIDIQ_DEBUG 0 /* * No protection against overflow, underflow */ #define MIDIQ_ENQ(head, buf, size) do { \ - if(MIDIQ_DEBUG)\ - printf("#1 %p %p bytes copied %jd tran req s %d h %d t %d\n", \ - &(head).b[(head).h], (buf), \ - (intmax_t)(sizeof(*(head).b) * \ - MIN( (size), (head).s - (head).h) ), \ - (size), (head).h, (head).t); \ MIDIQ_MOVE(&(head).b[(head).h], (buf), sizeof(*(head).b) * MIN((size), (head).s - (head).h)); \ if( (head).s - (head).h < (size) ) { \ - if(MIDIQ_DEBUG) \ - printf("#2 %p %p bytes copied %jd\n", (head).b, (buf) + (head).s - (head).h, (intmax_t)sizeof(*(head).b) * ((size) - (head).s + (head).h) ); \ MIDIQ_MOVE((head).b, (buf) + (head).s - (head).h, sizeof(*(head).b) * ((size) - (head).s + (head).h) ); \ } \ (head).h+=(size); \ (head).h%=(head).s; \ if(MIDIQ_EMPTY(head)) (head).h=-1; \ - if(MIDIQ_DEBUG)\ - printf("#E h %d t %d\n", (head).h, (head).t); \ } while (0) #define MIDIQ_DEQ_I(head, buf, size, move, update) do { \ if(MIDIQ_FULL(head)) (head).h=(head).t; \ - if(MIDIQ_DEBUG)\ - printf("#1 %p %p bytes copied %jd tran req s %d h %d t %d\n", &(head).b[(head).t], (buf), (intmax_t)sizeof(*(head).b) * MIN((size), (head).s - (head).t), (size), (head).h, (head).t); \ if (move) MIDIQ_MOVE((buf), &(head).b[(head).t], sizeof(*(head).b) * MIN((size), (head).s - (head).t)); \ if( (head).s - (head).t < (size) ) { \ - if(MIDIQ_DEBUG) \ - printf("#2 %p %p bytes copied %jd\n", (head).b, (buf) + (head).s - (head).t, (intmax_t)sizeof(*(head).b) * ((size) - (head).s + (head).t) ); \ if (move) MIDIQ_MOVE((buf) + (head).s - (head).t, (head).b, sizeof(*(head).b) * ((size) - (head).s + (head).t) ); \ } \ if (update) { \ @@ -92,8 +77,6 @@ struct name { \ } else { \ if (MIDIQ_EMPTY(head)) (head).h=-1; \ } \ - if(MIDIQ_DEBUG)\ - printf("#E h %d t %d\n", (head).h, (head).t); \ } while (0) #define MIDIQ_SIZE(head) ((head).s) From nobody Fri Jan 2 16:58: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 4djVJR32d8z6LvlD for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJQ6HSXz42hc for ; Fri, 02 Jan 2026 16:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jDDZVrZPtQG26AkAdCgSVfIFYnW7A/NWVLuqMvthBk=; b=N405KxCLn+dov+hR9kmEDwteMEecymqli71Tib3vkqY5/tbWqqJm6Z0c1/2a+0ZgLqhbjQ hu9GY2e9X1l1nJpgatHCIyR57+pG26ZhAb8GK4kKBq0QMWPWcsTcGcctVtpc679A+jg9Nc 6EsQvh1n0b5nCIumPwcB1nT+plAg0MSkclwW7DKXVcPOpkQISLkeIML1JYM9nhoDNUw5JT wqV35t/5eqP/fk1RPwE8qreSbuQGQYZ/dBapKIOsRZ/UbdkvizxsMAmxiEEtFhv0AFiDSk UsQtKyk0KsKX3uIaOOiihty3Muy0W8mI24MM2p2xxPjVBQ5c05N8pQmRwxwY5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jDDZVrZPtQG26AkAdCgSVfIFYnW7A/NWVLuqMvthBk=; b=l+bVpc/1jgfT3LyTLBJrbttWi1E1SuDGA0zZHVmLI0+s1E+mbDfqhlAh+5FAcm7VIT2Oat AeJoV3BZ26N0gbdlz0QUeojPshmmNkYcvTRdQsm3i5l8jby1CVLkdKBmZQKfugiqMhpcQz jsnzXsoC4L32/gi27GmDrFw38nxqtxnhBep0YwKZY6xjmXsV1OvbrfQdHLw/MHnNlm0xbq +4g0u7rFpKAWRZzhcMEJX75vqGl3/sILbK/ks2ny58s7oeZsYNNxByNyoqx70cWd9H2nX6 U7XbVK0RclkQIbg7ddShuB/5ET4BOJhAqBYeCMHwBuqyVaH6Zz7dCZ1MG3aoKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373110; a=rsa-sha256; cv=none; b=j/d/2bb8B667Qook6EUEpnkqvkqBQndzxXWq9okMfjtYr/Fc/Ema2IyhNmihRGBw6e4X2g 9wVYFkKlBuXqd1E5cFaA55T2j9Cs7TkYpnFLcJGCQiYIl+PHatbCN2loMujzV7bA2ff0ET ReQnfAO5k0Rf2xljV2yVa8D8Y143piEuOUGcWiWi3p061YzEcEnWP0GjbHv4t5P7jTjc/6 dduv8qScq+75Zyw1kDpi3Ig/23dK2gkb6Iq6Bg8VHF1Gc7Avbl6FYTci10CArxw+N6gMXX 03x+4vN93rtzOKS5jwx+v8IipLZo5XNqpX8Havar/gwZIjsbh/jAfEtrTvuZSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJQ5psTzBH4 for ; Fri, 02 Jan 2026 16:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24216 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b9db6c212873 - main - sound: Improve snd_midi->{in,out}q allocation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9db6c21287311b9e861893c065289d987a75804 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:30 +0000 Message-Id: <6957f936.24216.3c7bcf3e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b9db6c21287311b9e861893c065289d987a75804 commit b9db6c21287311b9e861893c065289d987a75804 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:34 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Improve snd_midi->{in,out}q allocation Currently we lock and allocate the buffers with M_NOWAIT, without checking if the return value of malloc(). This is not necessary as subsequent check below will eventually check that. However, for correctness, allocate the buffers with M_WAITOK (there is no reason not to) and lock afterwards. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54131 --- sys/dev/sound/midi/midi.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 9b61e972fab9..7f968b6210f5 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -109,7 +109,8 @@ midi_init(kobj_class_t cls, void *cookie) { struct snd_midi *m; int inqsize, outqsize; - uint8_t *buf; + uint8_t *ibuf = NULL; + uint8_t *obuf = NULL; m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); @@ -121,26 +122,17 @@ midi_init(kobj_class_t cls, void *cookie) mtx_init(&m->lock, "raw midi", NULL, 0); - mtx_lock(&m->lock); - if (inqsize) - buf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, M_NOWAIT); - else - buf = NULL; + ibuf = malloc(inqsize, M_MIDI, M_WAITOK); + if (outqsize) + obuf = malloc(outqsize, M_MIDI, M_WAITOK); - MIDIQ_INIT(m->inq, buf, inqsize); + mtx_lock(&m->lock); - if (outqsize) - buf = malloc(sizeof(uint8_t) * outqsize, M_MIDI, M_NOWAIT); - else - buf = NULL; m->hiwat = outqsize / 2; - MIDIQ_INIT(m->outq, buf, outqsize); - - if ((inqsize && !MIDIQ_BUF(m->inq)) || - (outqsize && !MIDIQ_BUF(m->outq))) - goto err2; + MIDIQ_INIT(m->inq, ibuf, inqsize); + MIDIQ_INIT(m->outq, obuf, outqsize); m->flags = 0; m->unit = alloc_unr(dev_unr); From nobody Fri Jan 2 16:58: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 4djVJS329cz6LvlH for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJS03tVz42mp for ; Fri, 02 Jan 2026 16:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WxU0yudeuaJhnx+zwo3ajLUYUXBil5Npcj+kfnPK0o=; b=miHCvZGYwJC6WbhUpaXpAV6My4hqYY3RzXgaH+tLjP+eF/yIso7X6t2MgBa3b2IT+0+WiS 8tv8ptLoZ1eH072EPEWzWfxg8KkRwpMv3WA+kk+iiEKmDBtIZX5xySS+vyTwqkbALEEXdQ W6x9P9qiIYbdIkx87sq/dGaxQUXOGWNz3Zd5052uhEE+3W87/8zqo5YRTZWYBr2l/Cakbh NtKcqho4MAv2pcXwdkZAJ7loWNaVNaKowSoCMhpfdzIN32pe5rr7ZTwXHGq46rRdUv8ItB dP690DrOFgRWhzALQREs4yfw2/3Ui97H71iw+eYpxQJSL982qXGRSFtDT1s0aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WxU0yudeuaJhnx+zwo3ajLUYUXBil5Npcj+kfnPK0o=; b=WX7CkKOQ2Uhy9vPOcNjeTCG3iRVEKxu2GoyS+jEpZPNC9zf5LZubV8uf92eIg7yW7h1Rws xA7c+Or8CIYEktIr0t+gsw2T9Vlgrm3njWy/6H6tQYP69/J3oM/43jhkIE46dypYy0HPbu Dz22ufiZjrtxSothfPojh/LQJpExRcLR+wBETqMZ9s2fk9/k7MMae0+s9y9lO16OJzgVUl KSL1SynWgJD9v1uiPj1A8gjy3vGQLpdr6t3Bl1LeD1g8v4p8jc+O4Q3B0xCSaRPQcgskWp qeLrz+8hK1VAzP9jvklOYBpOgQqsVs1MNeZb3RkmAIauGQ+ld70IJml0W9no1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373112; a=rsa-sha256; cv=none; b=dZJLRLE7WtiFmwVw6z85AH3vn4ybCfKjc51H1DQdcKgIc9lgqImH3Ph+Iy6f3U2ubBO9u9 NTBHdZyp5+TUeGshnGwhC8X88n2P7XLYNqygrVX8pQeUbeCpK/mX8oUdxDTfwHc40RsrxX kRYf+d+cwmRxYu8iW3liR2FpLn50deUzpEEs2f5BqXCvH8kk980RIEObdmju4GKGZdtLp3 d0R+uU1aRRryd1+jAXz3sLe+QwkPeQi+DXSBOuFJyLWGp2Bj9aEDNWCu4jrCAuuPVkKiaI ycHLESJ2RX2AELQPv7GbdqKTdD2SrNeAxzKLB89HcAMhATYvU9jz0pr8Ksg8dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJR6GmxzBSk for ; Fri, 02 Jan 2026 16:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2396c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: bafa8c951d8c - main - sound: Move sndstat out of pcm/ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bafa8c951d8cfaec75e774af03d7ab6fadb448b9 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:31 +0000 Message-Id: <6957f937.2396c.39bd476c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bafa8c951d8cfaec75e774af03d7ab6fadb448b9 commit bafa8c951d8cfaec75e774af03d7ab6fadb448b9 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:41 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Move sndstat out of pcm/ Needed by follow-up patches that will add sndstat support for midi/ Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54140 --- sys/dev/sound/pcm/sound.c | 1 + sys/dev/sound/pcm/sound.h | 4 ---- sys/dev/sound/{pcm => }/sndstat.c | 4 +++- sys/dev/sound/sndstat.h | 37 +++++++++++++++++++++++++++++++++++++ sys/modules/sound/sound/Makefile | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 29dac6b576ae..1e4b2eebdcaa 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 3ba6eb3692ee..de9af6bd5324 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -167,9 +166,6 @@ void *pcm_getdevinfo(device_t dev); int snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand, void *param, void **cookiep); -int sndstat_register(device_t dev, char *str); -int sndstat_unregister(device_t dev); - /* These are the function codes assigned to the children of sound cards. */ enum { SCF_PCM, diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/sndstat.c similarity index 99% rename from sys/dev/sound/pcm/sndstat.c rename to sys/dev/sound/sndstat.c index 8f414e07757d..eee9e0b18108 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/sndstat.c @@ -40,13 +40,15 @@ #endif #include +#include #include #include #include -#include +#include #include #include +#include #include "feeder_if.h" diff --git a/sys/dev/sound/sndstat.h b/sys/dev/sound/sndstat.h new file mode 100644 index 000000000000..d6735f74af31 --- /dev/null +++ b/sys/dev/sound/sndstat.h @@ -0,0 +1,37 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SNDSTAT_H_ +#define _SNDSTAT_H_ + +int sndstat_register(device_t dev, char *str); +int sndstat_unregister(device_t dev); + +#endif /* _SNDSTAT_H_ */ diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 169b1a2730ec..4b38e614f689 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -15,8 +15,9 @@ SRCS+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h SRCS+= mpu_if.h mpufoi_if.h SRCS+= mpu_if.c mpufoi_if.c SRCS+= ac97.c buffer.c channel.c dsp.c -SRCS+= mixer.c sndstat.c sound.c vchan.c +SRCS+= mixer.c sound.c vchan.c SRCS+= midi.c mpu401.c +SRCS+= sndstat.c feeder_eq_gen.h: ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk ${AWK} -f ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} From nobody Fri Jan 2 16:58: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 4djVJT2bxMz6Lvfw for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJT0Gjrz42kN for ; Fri, 02 Jan 2026 16:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jNoVoaS/8v9vIQXHC7nvaPLD4teb3RPvJJmCPYCUWsQ=; b=RL1r/ttrU3+PH4bmvFdmE/5V+vCRNA5HWgYwTK4me23qRnBK8cmBUIaWW7UaDD2ivL5e06 zEvHcYWshOD6bZ8qd5h/HC9la9l5e5/xa6ZJh0zNzPY24jl7RppNuhOBuT9sk4IXQdw1CM cskTQvid41ZB3hZNW+M5Wg14oABqqUJ4lhqPrWhnLyVZZjlXKLYTRHz9hw+CW5We6Rc5Ez lOHYMNryc0GcF1yKVxMNCZ+jRRxfRHUMzeLsIHiTF4Z+JAtZ4qRe79v0VLpWoqqPHJc+et +7MTNZiSmCOtOyLnLd7S3M3JD8l+wzO5Ls7QzIGTe/afPdeMXVKKpVxfnuPG7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jNoVoaS/8v9vIQXHC7nvaPLD4teb3RPvJJmCPYCUWsQ=; b=hH0JzPhv9z1DEGOFfTKfE3eNeygLmjteIsR3i+wuaBGCZ13p3N4OB/3fGXnGuCgyT0DBRo xbMm8yRWnppR9+X5QtK/aspzhHVCu/PIgnH/KTm41K8bTMn+gi7z3qoParB9p/myfAMSpG wLzAKqXGDbeP7JT/VRdGBKuBiVu0Wk+KpmLPOEUPJFI/7TOaEh/P6nWjuu6mHS1k3iWHuD IQH1ZPmguIHCydVPh3JFmPYIpgQyV2CBYi7pE6FROfF7Moex6peagqQHd3NGEcQGhU4q6n Xp8JrsXCTAZF2IM5c6gSBzy7M6Ig7pPXJkgIUj13Y91yTQCX0VSrQ4pKAaE+Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373113; a=rsa-sha256; cv=none; b=JkTdoOxMawbSu9B0zf1ostQrVe/aqDDCQzY6ZuSmsXC0aAqm5gQvw/QKFVC8zYkRPZ03fJ 8IG5WVmtUAjSi/MSCC0txWSN66xxyoOiSLxNUSB4E/A7Kg10beSep45YbChhN8zhBa84Km Upd0uzXftAmveCoVYRiJStGZqVqM9YqaB9hGPXkkk1foSEGTUPh/Ee89K7ite6lfwb7gIs BKrMfvxiYYfQmTN6ZxOhvb1VD2BBxIqBL7J4CjXz28vRJvTGjnodS0tq9rXgkwF7Nl27O8 vlCYfB1VthVZTvLwbLntBOgULccgvqWWYJ61ZzIojNuNE3+ol3DpNNjGNkegzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJS6r8WzBDR for ; Fri, 02 Jan 2026 16:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2aa16666e2fa - main - sound: Take device type into account in sndstat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2aa16666e2fa5c98be8d330cd0c32c9dc3801ba7 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:32 +0000 Message-Id: <6957f938.230c4.28fbb48c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2aa16666e2fa5c98be8d330cd0c32c9dc3801ba7 commit 2aa16666e2fa5c98be8d330cd0c32c9dc3801ba7 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:46 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Take device type into account in sndstat sndstat will be extended to work with MIDI devices as well, so separate functionality based on the device type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54141 --- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/sndstat.c | 84 ++++++++++++++++++++++------------------------- sys/dev/sound/sndstat.h | 7 +++- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 1e4b2eebdcaa..8ce369bfce5e 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -427,7 +427,7 @@ pcm_register(device_t dev, char *str) else if (snd_unit_auto == 1) snd_unit = pcm_best_unit(snd_unit); - sndstat_register(dev, d->status); + sndstat_register(dev, SNDST_TYPE_PCM, d->status); return (dsp_make_dev(dev)); } diff --git a/sys/dev/sound/sndstat.c b/sys/dev/sound/sndstat.c index eee9e0b18108..b0ac7f7d0824 100644 --- a/sys/dev/sound/sndstat.c +++ b/sys/dev/sound/sndstat.c @@ -52,9 +52,6 @@ #include "feeder_if.h" -#define SS_TYPE_PCM 1 -#define SS_TYPE_MIDI 2 - static d_open_t sndstat_open; static void sndstat_close(void *); static d_read_t sndstat_read; @@ -75,7 +72,8 @@ struct sndstat_entry { TAILQ_ENTRY(sndstat_entry) link; device_t dev; char *str; - int type, unit; + enum sndstat_type type; + int unit; }; struct sndstat_userdev { @@ -688,22 +686,26 @@ sndstat_create_devs_nvlist(nvlist_t **nvlp) return (ENOMEM); TAILQ_FOREACH(ent, &sndstat_devlist, link) { - struct snddev_info *d; - nvlist_t *di; + if (ent->type == SNDST_TYPE_PCM) { + struct snddev_info *d; + nvlist_t *di; - d = device_get_softc(ent->dev); - if (!PCM_REGISTERED(d)) - continue; + d = device_get_softc(ent->dev); + if (!PCM_REGISTERED(d)) + continue; - err = sndstat_build_sound4_nvlist(d, &di); - if (err) - goto done; + err = sndstat_build_sound4_nvlist(d, &di); + if (err) + goto done; - nvlist_append_nvlist_array(nvl, SNDST_DSPS, di); - nvlist_destroy(di); - err = nvlist_error(nvl); - if (err) - goto done; + nvlist_append_nvlist_array(nvl, SNDST_DSPS, di); + nvlist_destroy(di); + err = nvlist_error(nvl); + if (err) + goto done; + } else if (ent->type == SNDST_TYPE_MIDI) { + /* TODO */ + } } TAILQ_FOREACH(pf, &sndstat_filelist, entry) { @@ -1154,22 +1156,14 @@ fail: /************************************************************************/ -int -sndstat_register(device_t dev, char *str) +void +sndstat_register(device_t dev, enum sndstat_type type, char *str) { struct sndstat_entry *ent; struct sndstat_entry *pre; - const char *devtype; - int type, unit; + int unit; unit = device_get_unit(dev); - devtype = device_get_name(dev); - if (!strcmp(devtype, "pcm")) - type = SS_TYPE_PCM; - else if (!strcmp(devtype, "midi")) - type = SS_TYPE_MIDI; - else - return (EINVAL); ent = malloc(sizeof *ent, M_DEVBUF, M_WAITOK | M_ZERO); ent->dev = dev; @@ -1195,8 +1189,6 @@ sndstat_register(device_t dev, char *str) TAILQ_INSERT_BEFORE(pre, ent, link); } SNDSTAT_UNLOCK(); - - return (0); } int @@ -1388,20 +1380,24 @@ sndstat_prepare(struct sndstat_file *pf_self) /* generate list of installed devices */ k = 0; TAILQ_FOREACH(ent, &sndstat_devlist, link) { - d = device_get_softc(ent->dev); - if (!PCM_REGISTERED(d)) - continue; - if (!k++) - sbuf_printf(s, "Installed devices:\n"); - sbuf_printf(s, "%s:", device_get_nameunit(ent->dev)); - sbuf_printf(s, " <%s>", device_get_desc(ent->dev)); - if (snd_verbose > 0) - sbuf_printf(s, " %s", ent->str); - /* XXX Need Giant magic entry ??? */ - PCM_ACQUIRE_QUICK(d); - sndstat_prepare_pcm(s, ent->dev, snd_verbose); - PCM_RELEASE_QUICK(d); - sbuf_printf(s, "\n"); + if (ent->type == SNDST_TYPE_PCM) { + d = device_get_softc(ent->dev); + if (!PCM_REGISTERED(d)) + continue; + if (!k++) + sbuf_printf(s, "Installed devices:\n"); + sbuf_printf(s, "%s:", device_get_nameunit(ent->dev)); + sbuf_printf(s, " <%s>", device_get_desc(ent->dev)); + if (snd_verbose > 0) + sbuf_printf(s, " %s", ent->str); + /* XXX Need Giant magic entry ??? */ + PCM_ACQUIRE_QUICK(d); + sndstat_prepare_pcm(s, ent->dev, snd_verbose); + PCM_RELEASE_QUICK(d); + sbuf_printf(s, "\n"); + } else if (ent->type == SNDST_TYPE_MIDI) { + /* TODO */ + } } if (k == 0) sbuf_printf(s, "No devices installed.\n"); diff --git a/sys/dev/sound/sndstat.h b/sys/dev/sound/sndstat.h index d6735f74af31..3ac0cf48f5a8 100644 --- a/sys/dev/sound/sndstat.h +++ b/sys/dev/sound/sndstat.h @@ -31,7 +31,12 @@ #ifndef _SNDSTAT_H_ #define _SNDSTAT_H_ -int sndstat_register(device_t dev, char *str); +enum sndstat_type { + SNDST_TYPE_PCM, + SNDST_TYPE_MIDI, +}; + +void sndstat_register(device_t dev, enum sndstat_type type, char *str); int sndstat_unregister(device_t dev); #endif /* _SNDSTAT_H_ */ From nobody Fri Jan 2 16:58: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 4djVJV4WD1z6Lvyr for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJV1MkXz42Ys for ; Fri, 02 Jan 2026 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1MWR9Env1y3LAfqSEheG9whVR+Xw5+mMit2m/ulhf8=; b=Ue35J1KliOAAE5Z4Fo9dyA61GCpqRSGT/lCLSBTRmuD8w2wo7QXwdrY8VNyJFLSfbvMeZH xLvENT8bueSH7m8MBCuINqEZ7i7WgY6vw0776JWaPrEFdgoqWyn3/u3BPZHneTjAUrszyX Df8ooMKG6tnSOTRrpF24UyH3O46JztFtqrhMvQTfbjnzLH48CeukLXg3qdxd75wN1j1Lmv tSZboLnTtAdRWadoDVpFtQ0BUPlWq+e3A8zYmY7xsBrDQcJjkSkc9i4HyqTTNUd4+UxBlC UWoIdzpjGiBqToe2EYxDFyG9AMAANuXLvIY9wj2lvxODMKiE/QDCwPLwgMqoQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1MWR9Env1y3LAfqSEheG9whVR+Xw5+mMit2m/ulhf8=; b=yfBjNLfm4bCGd8CXpBOxuEmS9/VeMfKnmBnmO6jXKesS+2e3N2iLWDWNTj8y6pdP5y75DH 0uGmFPzoeaoGbuh2BgFQ7Ybl48e3sOkHaAWrn0HCRyGG8+8HPLxVhPo8V+M4CS72LMSy7m VQOeEA22x9xqwyHO75cRZVCgjs7j4ulgb0WifE/Hmut9oNiNwWyKvJcj9XVbN9nKuPS3i1 7F5kx4nsuOcqhRpY4EaBG1sPkmi9GuzKJLQ6n1snu6vpzY1BOvTAABnE9pXLCFFv7TOcKK IkGhqCTALSiHndi2euQLv1duk605MHgAQndJp4NbIOvYL3OsDLGi2qNJ1wLD5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373114; a=rsa-sha256; cv=none; b=VklgbGIOifxSwYWyDwJhdn2mOIypntGxwpzSTQtS/VBvzrXCpGqqFZT6sSckwiC7vwD1Hq x1/NR6bawsDBFbafxpTADhuL0oExHoytYWRD9aljP2QkzJjYl3EjZD2mJAYvp6+SUWy7Ht iA+WUfTwhjhRL5uIdYdbwGHGace5CNLn5uvEfFrbzQnUVHnf0cVPXWaID5FolFf/CImakq WDXqbocl9VCYgypiM+uN3I4aIjHz1toC+Nbyabc9hF9rb4MM+YdAw2HSp6YjvEbwGjopOq J8amc7H35NKWOsRW5/QmGPUwv11yUzXBOcrK0qsMuoTFMILJozguppe9LOc+xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJV0sgrzBH6 for ; Fri, 02 Jan 2026 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 792251295cdf - main - sound: Do not check for NULL before free() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 792251295cdf6c3e1cbb1aa6291434539632912f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:34 +0000 Message-Id: <6957f93a.23ae5.1c447d64@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=792251295cdf6c3e1cbb1aa6291434539632912f commit 792251295cdf6c3e1cbb1aa6291434539632912f Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:52 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Do not check for NULL before free() No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54174 --- sys/dev/sound/dummy.c | 3 +-- sys/dev/sound/fdt/audio_soc.c | 6 ++---- sys/dev/sound/midi/midi.c | 6 ++---- sys/dev/sound/pci/cmi.c | 3 +-- sys/dev/sound/pci/envy24.c | 6 ++---- sys/dev/sound/pci/envy24ht.c | 6 ++---- sys/dev/sound/pci/es137x.c | 3 +-- sys/dev/sound/pci/hdsp-pcm.c | 12 ++++-------- sys/dev/sound/pci/hdspe-pcm.c | 12 ++++-------- sys/dev/sound/pci/via8233.c | 3 +-- sys/dev/sound/pci/via82c686.c | 2 +- sys/dev/sound/pcm/buffer.c | 19 ++++++------------- sys/dev/sound/pcm/dsp.c | 3 +-- sys/dev/sound/pcm/feeder_eq.c | 3 +-- sys/dev/sound/pcm/feeder_format.c | 3 +-- sys/dev/sound/pcm/feeder_matrix.c | 3 +-- sys/dev/sound/pcm/feeder_mixer.c | 3 +-- sys/dev/sound/pcm/feeder_rate.c | 37 ++++++++++++------------------------- sys/dev/sound/pcm/feeder_volume.c | 3 +-- sys/dev/sound/usb/uaudio.c | 6 ++---- 20 files changed, 47 insertions(+), 95 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index aec76339ae17..91a198e3d9f6 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -132,8 +132,7 @@ dummy_chan_free(kobj_t obj, void *data) uint8_t *buf; buf = ch->buf->buf; - if (buf != NULL) - free(buf, M_DEVBUF); + free(buf, M_DEVBUF); return (0); } diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index 84867cb3d781..33269dc302fa 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -250,8 +250,7 @@ audio_soc_chan_free(kobj_t obj, void *data) ausoc_chan = (struct audio_soc_channel *)data; buffer = ausoc_chan->buf->buf; - if (buffer) - free(buffer, M_DEVBUF); + free(buffer, M_DEVBUF); return (0); } @@ -508,8 +507,7 @@ audio_soc_detach(device_t dev) struct audio_soc_aux_node *aux; sc = device_get_softc(dev); - if (sc->name) - free(sc->name, M_DEVBUF); + free(sc->name, M_DEVBUF); while ((aux = SLIST_FIRST(&sc->aux_devs)) != NULL) { SLIST_REMOVE_HEAD(&sc->aux_devs, link); diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 7f968b6210f5..542282d81842 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -153,10 +153,8 @@ midi_init(kobj_class_t cls, void *cookie) err2: mtx_destroy(&m->lock); - if (MIDIQ_BUF(m->inq)) - free(MIDIQ_BUF(m->inq), M_MIDI); - if (MIDIQ_BUF(m->outq)) - free(MIDIQ_BUF(m->outq), M_MIDI); + free(MIDIQ_BUF(m->inq), M_MIDI); + free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); return NULL; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 99925d236c08..b5465fed5a8b 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -1009,8 +1009,7 @@ cmi_attach(device_t dev) if (sc->reg) bus_release_resource(dev, SYS_RES_IOPORT, sc->regid, sc->reg); mtx_destroy(&sc->lock); - if (sc) - free(sc, M_DEVBUF); + free(sc, M_DEVBUF); return ENXIO; } diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 3adb22254b72..50864a9067fd 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -1611,10 +1611,8 @@ envy24chan_free(kobj_t obj, void *data) device_printf(sc->dev, "envy24chan_free()\n"); #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_ENVY24); - ch->data = NULL; - } + free(ch->data, M_ENVY24); + ch->data = NULL; mtx_unlock(&sc->lock); return 0; diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 2396a340cd84..3aca8f92f708 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -1522,10 +1522,8 @@ envy24htchan_free(kobj_t obj, void *data) device_printf(sc->dev, "envy24htchan_free()\n"); #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_ENVY24HT); - ch->data = NULL; - } + free(ch->data, M_ENVY24HT); + ch->data = NULL; mtx_unlock(&sc->lock); return 0; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 4e8c7911e95e..45b953efc3fc 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1886,8 +1886,7 @@ bad: if (es->reg) bus_release_resource(dev, es->regtype, es->regid, es->reg); mtx_destroy(&es->lock); - if (es) - free(es, M_DEVBUF); + free(es, M_DEVBUF); return (ENXIO); } diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index b64cec281388..5a8f2ab57d6c 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -677,14 +677,10 @@ hdspchan_free(kobj_t obj, void *data) #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_HDSP); - ch->data = NULL; - } - if (ch->caps != NULL) { - free(ch->caps, M_HDSP); - ch->caps = NULL; - } + free(ch->data, M_HDSP); + ch->data = NULL; + free(ch->caps, M_HDSP); + ch->caps = NULL; mtx_unlock(&sc->lock); return (0); diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index d78820732639..678693960e5e 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -668,14 +668,10 @@ hdspechan_free(kobj_t obj, void *data) #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_HDSPE); - ch->data = NULL; - } - if (ch->caps != NULL) { - free(ch->caps, M_HDSPE); - ch->caps = NULL; - } + free(ch->data, M_HDSPE); + ch->data = NULL; + free(ch->caps, M_HDSPE); + ch->caps = NULL; mtx_unlock(&sc->lock); return (0); diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 6c59397756e0..90e966b864e3 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -1385,8 +1385,7 @@ bad: if (via->sgd_dmat) bus_dma_tag_destroy(via->sgd_dmat); mtx_destroy(&via->lock); - if (via) - free(via, M_DEVBUF); + free(via, M_DEVBUF); return (ENXIO); } diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index fe34583b1a25..144f0ff21fb6 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -601,7 +601,7 @@ bad: if (via->sgd_table) bus_dmamem_free(via->sgd_dmat, via->sgd_table, via->sgd_dmamap); if (via->sgd_dmat) bus_dma_tag_destroy(via->sgd_dmat); mtx_destroy(&via->lock); - if (via) free(via, M_DEVBUF); + free(via, M_DEVBUF); return ENXIO; } diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index eb2cbe667bf3..1db9e5661dc8 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -129,11 +129,8 @@ sndbuf_setup(struct snd_dbuf *b, void *buf, unsigned int size) void sndbuf_free(struct snd_dbuf *b) { - if (b->tmpbuf) - free(b->tmpbuf, M_DEVBUF); - - if (b->shadbuf) - free(b->shadbuf, M_DEVBUF); + free(b->tmpbuf, M_DEVBUF); + free(b->shadbuf, M_DEVBUF); if (b->buf) { if (b->flags & SNDBUF_F_MANAGED) { @@ -188,8 +185,7 @@ sndbuf_resize(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz) printf("%s(): b=%p %p -> %p [%d -> %d : %d]\n", __func__, b, b->tmpbuf, tmpbuf, b->allocsize, allocsize, bufsize); - if (b->tmpbuf != NULL) - free(b->tmpbuf, M_DEVBUF); + free(b->tmpbuf, M_DEVBUF); b->tmpbuf = tmpbuf; b->allocsize = allocsize; } else if (snd_verbose > 3) @@ -225,14 +221,11 @@ sndbuf_remalloc(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz) tmpbuf = malloc(allocsize, M_DEVBUF, M_WAITOK); shadbuf = malloc(allocsize, M_DEVBUF, M_WAITOK); CHN_LOCK(b->channel); - if (b->buf != NULL) - free(b->buf, M_DEVBUF); + free(b->buf, M_DEVBUF); b->buf = buf; - if (b->tmpbuf != NULL) - free(b->tmpbuf, M_DEVBUF); + free(b->tmpbuf, M_DEVBUF); b->tmpbuf = tmpbuf; - if (b->shadbuf != NULL) - free(b->shadbuf, M_DEVBUF); + free(b->shadbuf, M_DEVBUF); b->shadbuf = shadbuf; if (snd_verbose > 3) printf("%s(): b=%p %d -> %d [%d]\n", diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 62db4592f206..c1e836691ac7 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2582,8 +2582,7 @@ dsp_oss_syncgroup(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_syncgr out: if (ret != 0) { - if (smrd != NULL) - free(smrd, M_DEVBUF); + free(smrd, M_DEVBUF); if ((sg != NULL) && SLIST_EMPTY(&sg->members)) { sg_ids[2] = sg->id; SLIST_REMOVE(&snd_pcm_syncgroups, sg, pcmchan_syncgroup, link); diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 08e789f6a5ad..4cf9d4f6695f 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -353,8 +353,7 @@ feed_eq_free(struct pcm_feeder *f) struct feed_eq_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 3226aebf9580..0747b54cbbae 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -90,8 +90,7 @@ feed_format_free(struct pcm_feeder *f) struct feed_format_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 198fe86d994f..cba537c84efd 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -317,8 +317,7 @@ feed_matrix_free(struct pcm_feeder *f) struct feed_matrix_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 74ab633bf3c7..8c58e1c8ef33 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -100,8 +100,7 @@ feed_mixer_free(struct pcm_feeder *f) struct feed_mixer_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 63d7fe11003a..aee164840c4a 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -714,10 +714,8 @@ z_resampler_reset(struct z_info *info) info->z_size = 1; info->z_coeff = NULL; info->z_dcoeff = NULL; - if (info->z_pcoeff != NULL) { - free(info->z_pcoeff, M_DEVBUF); - info->z_pcoeff = NULL; - } + free(info->z_pcoeff, M_DEVBUF); + info->z_pcoeff = NULL; info->z_scale = Z_ONE; info->z_dx = Z_FULL_ONE; info->z_dy = Z_FULL_ONE; @@ -1029,10 +1027,8 @@ z_resampler_build_polyphase(struct z_info *info) int32_t alpha, c, i, z, idx; /* Let this be here first. */ - if (info->z_pcoeff != NULL) { - free(info->z_pcoeff, M_DEVBUF); - info->z_pcoeff = NULL; - } + free(info->z_pcoeff, M_DEVBUF); + info->z_pcoeff = NULL; if (feeder_rate_polyphase_max < 1) return (ENOTSUP); @@ -1154,10 +1150,8 @@ z_resampler_setup(struct pcm_feeder *f) * adaptive mode. */ z_setup_adaptive_sinc: - if (info->z_pcoeff != NULL) { - free(info->z_pcoeff, M_DEVBUF); - info->z_pcoeff = NULL; - } + free(info->z_pcoeff, M_DEVBUF); + info->z_pcoeff = NULL; if (adaptive == 0) { info->z_dy = z_scale << Z_DRIFT_SHIFT; @@ -1333,8 +1327,7 @@ z_setup_adaptive_sinc: if (info->z_delay == NULL || info->z_alloc < i || i <= (info->z_alloc >> 1)) { - if (info->z_delay != NULL) - free(info->z_delay, M_DEVBUF); + free(info->z_delay, M_DEVBUF); info->z_delay = malloc(i, M_DEVBUF, M_NOWAIT | M_ZERO); if (info->z_delay == NULL) return (ENOMEM); @@ -1517,10 +1510,8 @@ z_resampler_init(struct pcm_feeder *f) ret = z_resampler_setup(f); if (ret != 0) { - if (info->z_pcoeff != NULL) - free(info->z_pcoeff, M_DEVBUF); - if (info->z_delay != NULL) - free(info->z_delay, M_DEVBUF); + free(info->z_pcoeff, M_DEVBUF); + free(info->z_delay, M_DEVBUF); free(info, M_DEVBUF); f->data = NULL; } @@ -1534,13 +1525,9 @@ z_resampler_free(struct pcm_feeder *f) struct z_info *info; info = f->data; - if (info != NULL) { - if (info->z_pcoeff != NULL) - free(info->z_pcoeff, M_DEVBUF); - if (info->z_delay != NULL) - free(info->z_delay, M_DEVBUF); - free(info, M_DEVBUF); - } + free(info->z_pcoeff, M_DEVBUF); + free(info->z_delay, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 3e9e3484fba8..fc4ed1bbb0a5 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -193,8 +193,7 @@ feed_volume_free(struct pcm_feeder *f) struct feed_volume_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 65c1327ee0f2..86fb5228a990 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2704,10 +2704,8 @@ error: int uaudio_chan_free(struct uaudio_chan *ch) { - if (ch->buf != NULL) { - free(ch->buf, M_DEVBUF); - ch->buf = NULL; - } + free(ch->buf, M_DEVBUF); + ch->buf = NULL; usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); ch->num_alt = 0; From nobody Fri Jan 2 16:58: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 4djVJW59gJz6Lvyt for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJW2K8Wz42km for ; Fri, 02 Jan 2026 16:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMFL7x1kV+fyZRnu35ftxm6UZa/7Ch4MOFnk+QIbW2E=; b=cuoQwB9vRjjJMZvwbDMPriRSu9/epBThHiJkNnRFoL01fRfLdD1nj/3Hn0txojA6376cQE 4lEm91gp2xiApTj7IDtJM1AdlfI1RS3A8O/8Nt8/yi8gjj6SQY3daKVBDD7sacRPohlWX5 GdZ1xJpBiX5+mkRiGWR0FOEwvhrImPBW7lSVYZdwtWqdUQaGEtBd1GpPwrzKr7caKDgYo7 YrVm00Xg4cX5nlwNBGe8fiOVg2pHkZywTkSd1eBKycMaU0jFhaTsWNSb9i2S7JcocfBLkt W0BEyjP/5RcXBphFieSaPHdeS4vMpG/18y3eqW29FFlVIZmEkkdWJNekNeeCvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMFL7x1kV+fyZRnu35ftxm6UZa/7Ch4MOFnk+QIbW2E=; b=f/cnfOvzFnYc31RNBKatVS+NXY+HyN+lejJdBfjSiDIGyV0xVp6ul38u+XzdGydKArg0ca LNZ4igrf44+0oUyyvwD8qEXD9q6/IzIlQ83tYoCKtnzVmLhYZSB5YqV8O1qY07o647bkYR N/YcfwREQqF28YSMapdAmRouCBOkiZX2NOgt+ANOibFplXyKFJhKNQpdAyAQqqQF4LQ+GG cJW6jlyUtK1p24xXzs0KJXUkhtLLjnn5pc2B0P9D2W44n4gxgDMsid7NEZtsHJFCgyYehp NpEJNeSy1WE0lfUSwqllpHH3x53idQgUgsqL0O7KSTxDJ5AujxPRhW4xfDfhPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373115; a=rsa-sha256; cv=none; b=Qlrz/599wBkT30VOxVgA/AZBCjuyWa3lNSppSE/XRjddEMwMJXYwTrie6bZaPHhZn2Z6BR mV0j4d/z1VlcZhl3eVYYDnC84HF4EsFMp0Sy4mwaaxvqYaZu9Lm5oJwtnUNaIl8yWzTxRq 2J6HkSsEGj64t3KOnQliEYHiW3s87KqCuproqXnmjdUYFE7GhdemsAyhb0mT8mJTykDlyR BuksODjoZIA11Gx3R8N4LDJxK+cwns276vkaaDmczToMzZ+REbAwXg8WMbt4bTHkm8qwrC 4IlI0yzhZ6NNcKzWMftbADitM4245H2kas+G8Sh+wyb4L8F4E8x24HV0KbAgXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJW1d61zBH7 for ; Fri, 02 Jan 2026 16:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22957 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4a2d1532e841 - main - sound: Get rid of unused midi/midi.c defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a2d1532e84135a50ba8414ceaafc0c3a1bfe94b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:35 +0000 Message-Id: <6957f93b.22957.74268d0b@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4a2d1532e84135a50ba8414ceaafc0c3a1bfe94b commit 4a2d1532e84135a50ba8414ceaafc0c3a1bfe94b Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:55 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Get rid of unused midi/midi.c defines No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 542282d81842..e0a782bc9a22 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -185,19 +185,6 @@ midi_uninit(struct snd_midi *m) return (0); } -#ifdef notdef -static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; - -#endif /* notdef */ -/* Number of bytes in a MIDI command */ -#define MIDI_LENGTH(d) (midi_lengths[((d) >> 4) & 7]) -#define MIDI_ACK 0xfe -#define MIDI_IS_STATUS(d) ((d) >= 0x80) -#define MIDI_IS_COMMON(d) ((d) >= 0xf0) - -#define MIDI_SYSEX_START 0xF0 -#define MIDI_SYSEX_END 0xF7 - /* * midi_in: process all data until the queue is full, then discards the rest. * Since midi_in is a state machine, data discards can cause it to get out of From nobody Fri Jan 2 16:58: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 4djVJY03Pmz6Lvwt for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJX3VFmz431n for ; Fri, 02 Jan 2026 16:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSDbGNN/QcIMXmmW3yi7DYNs3NK7P6nvl8TVtwjYn9M=; b=Cy8fSkCkT2wXz/x5iPTK4f3z1P9qHtS+gNXM3gQkBFfscf2LpZ1Z8IseHM8TJz/pQPkdDL jbBNmuTbUrwZ1NPnwGF5YAkT8N6Y0XMebIsKixB4ukf5TIOpW5+R1ImM8bAlF6xH6hmjlb ReuZ2FvB5kfoFIiH14AaI36kVnWHGvilI4AaVDdVKfxRLaINB3VlZJjrDDutCmh88TZjKs QfUjpF44YeagZqy3C2/xCycO/eettqpOug6Hvez0FqSnqFNY5pCGwqatfMbR3/lJMZsb+9 wvee3uOcar48EfnNk3ppSQRhsUST9tub7ZgKy0nADzWnPH5ShVXgtpfWIYvQCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSDbGNN/QcIMXmmW3yi7DYNs3NK7P6nvl8TVtwjYn9M=; b=nX6+SzzGMOsN5ZYIiET+rqK1XWXVg+hzIPZ1Pv+z5RLWKwI77c/A+wA74Pux+wTBWraCdy pu56vPnuQaghNxAcw0sOYZBubU6LJtuMo1dDCMq65fK81o+8CTgKw40j6G2Pi+Jf1LubM1 mdiS9rVMkwQybi4qqpvbPjLXO+kXZxwWIchGq8G1xn417IpXtkMHzrGS2DYTPci96UURbR QtyJVwNHieNCVvyJbRKTXbh9XuGaGhyVyD7qp5YIblxB/3UWrRjspQXxxvbw/d7rpKy+Gm we3JYMdvl5x05LZuGivoazJIpWSainlGyGskzugutbNNcNLnykey8PLe+GqtXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373116; a=rsa-sha256; cv=none; b=x1jiu0rUZC4+udNtTmBkWDTVccrZPSbrXs38j29EyrG6yomNurRSaVrx0ACKhfMuv0oU0D XLMBIUddE9HkFG2KoIQaeJvIu4uJkD0ByLAqxRGrixORWaMMwL3txt+q4yDE13RiMXETRZ JUj9S2j5Z73nWY2h80Lwcw+J1LVdRzS43ADb9/4EuiwY4RDt2bobpWhD73j7FKCJZ+v4cB uFN9fc5jBclrI4ZvsB09OhFrMw2eyk+EAyQ2Zl7Em99ERxQgikUeSTjfPI8lQjFH1tj+Hf PfVgqXNDk84ymen8Q2eBzvjECiWSRJYQJ2V9n+JH6s6z3Lrx9T628J3rvaKxqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJX2PpPzBQK for ; Fri, 02 Jan 2026 16:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2295b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e3b57ceffef0 - main - sound: Retire mpu_callbackp() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:36 +0000 Message-Id: <6957f93c.2295b.31c31f60@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b commit e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:58 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Retire mpu_callbackp() It is the exact same as mpu_callback(). No functional changed intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 2 +- sys/dev/sound/midi/mpu401.c | 8 -------- sys/dev/sound/midi/mpu_if.m | 6 ------ 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index e0a782bc9a22..bde3c5447705 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -242,7 +242,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { m->flags &= ~M_TXEN; - MPU_CALLBACKP(m, m->cookie, m->flags); + MPU_CALLBACK(m, m->cookie, m->flags); } if (used && MIDIQ_AVAIL(m->outq) > m->hiwat) { if (m->wchan) { diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 21141a0c8e3c..107a53119cdb 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -76,7 +76,6 @@ static int mpu401_muninit(struct snd_midi *, void *); static int mpu401_minqsize(struct snd_midi *, void *); static int mpu401_moutqsize(struct snd_midi *, void *); static void mpu401_mcallback(struct snd_midi *, void *, int); -static void mpu401_mcallbackp(struct snd_midi *, void *, int); static kobj_method_t mpu401_methods[] = { KOBJMETHOD(mpu_init, mpu401_minit), @@ -84,7 +83,6 @@ static kobj_method_t mpu401_methods[] = { KOBJMETHOD(mpu_inqsize, mpu401_minqsize), KOBJMETHOD(mpu_outqsize, mpu401_moutqsize), KOBJMETHOD(mpu_callback, mpu401_mcallback), - KOBJMETHOD(mpu_callbackp, mpu401_mcallbackp), KOBJMETHOD_END }; @@ -235,9 +233,3 @@ mpu401_mcallback(struct snd_midi *sm, void *arg, int flags) } m->flags = flags; } - -static void -mpu401_mcallbackp(struct snd_midi *sm, void *arg, int flags) -{ - mpu401_mcallback(sm, arg, flags); -} diff --git a/sys/dev/sound/midi/mpu_if.m b/sys/dev/sound/midi/mpu_if.m index 835d887f703a..07371a0dd726 100644 --- a/sys/dev/sound/midi/mpu_if.m +++ b/sys/dev/sound/midi/mpu_if.m @@ -44,12 +44,6 @@ METHOD int init { void *_cookie; }; -METHOD void callbackp { - struct snd_midi *_kobj; - void *_cookie; - int _flags; -}; - METHOD void callback { struct snd_midi *_kobj; void *_cookie; From nobody Fri Jan 2 16:58: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 4djVJZ71jDz6LvlZ for ; Fri, 02 Jan 2026 16:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJZ4MGLz42p4 for ; Fri, 02 Jan 2026 16:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMSuajuZ7T0drQK/tTgOoeZvG15ribkm0UiyzgUq0Co=; b=v+/62xNZhal8VzDTRNqBc+nfZ7OQzBn5ZdTu5VZzWYmFeTsulOdTNvG+VNcaOd7hyIxZJi rlmKEN3Cbxzj3cAqb+dKU1R0Zic4jD+f94iSMHOUCPkdNlaLVOogrcxc5+UZJF8A8ynv7F RRVZmDZJP5FEdyVTyWbnQ72823pb28qcXDfx4Ug6s6Mv+sTX5my/VnpAScU4NkuT8QjIlb UZESLizlXBMNM/mGNC8oncO9bVy1jYalsMTvfJA+jN109tiFgM+LQqcePymhHfIZy6hLFK aIqIt5D44figGXHYfjxrKTUoRrMfiYK/ejQJxyScASv0fJ/yNXuNDqy6KhQa0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMSuajuZ7T0drQK/tTgOoeZvG15ribkm0UiyzgUq0Co=; b=ttHSFRdThkFv2KT1lgAZQsFxQ/EGTErsYCz5w1wU7Kqew95IgFaiRbUeKQNJhDElpljKo3 Er5Vf1m8sO7xNXx7FCcxGmGTfzLsgfgFGILOBrlrYc52FjwF122VSZINxyC7jcmhud0a2O IlLJuLGXlP5NRdhzBX6oGUGGCLyaSQsTCDr6l0Pyubsubf4YNKiBScF2EfXX6+KlDoQ6Pv D1LGgqhdjemTtSrFkShF/QXzRlke0wswG3Rr4KQRHUHfPYyJTMdvuEkQEZZux1OxWrzIbl 9sfo8nBz1BKwk6notcGHEm4eeyjlQAqwLeyMmwndnuPStu2bqhcNM74WRLMuAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373118; a=rsa-sha256; cv=none; b=lm+EYlDU3ZImZxTbAHkyhaNFxM5MQWp5M1dJjlr+eP7tRiON1FrtsgoQZ9DPSxf2XnTJi3 GLaWlhdT5W0C59aYf8HTofX7X02P6A7PDNh40Q56pPgUgqj4qPABlTLUnQ9qP3SeJv/FkF QiHsTn/pyRB5d4gruSYhyDMtGpd81fhKDGIiK5XvuwRUgJ2aIlJGC4mo08FMtcslAK3aVH 3yyw/aLeHcBm9bNzFl86njBs8TfKnedDld+gALUgHf5JlsUH85dvwChReKEe+RJMAfLNcz B0JzN+Fnfg07o8VnUIBASRTMV6JUBk3+Gu9ny3XU+OToixGeFQXQA7s4GuN1eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJZ3ftxzBH9 for ; Fri, 02 Jan 2026 16:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25101 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3f8a85a085c7 - main - sound: Get rid of unused MIDIQ macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f8a85a085c710f50b8bcd4efe915268882129d2 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:38 +0000 Message-Id: <6957f93e.25101.70be8125@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3f8a85a085c710f50b8bcd4efe915268882129d2 commit 3f8a85a085c710f50b8bcd4efe915268882129d2 Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:03 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Get rid of unused MIDIQ macros No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midiq.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h index 27958ff4c23e..80825974283e 100644 --- a/sys/dev/sound/midi/midiq.h +++ b/sys/dev/sound/midi/midiq.h @@ -83,7 +83,5 @@ struct name { \ #define MIDIQ_CLEAR(head) ((head).h = (head).t = 0) #define MIDIQ_BUF(head) ((head).b) #define MIDIQ_DEQ(head, buf, size) MIDIQ_DEQ_I(head, buf, size, 1, 1) -#define MIDIQ_PEEK(head, buf, size) MIDIQ_DEQ_I(head, buf, size, 1, 0) -#define MIDIQ_POP(head, size) MIDIQ_DEQ_I(head, &head, size, 0, 1) #endif From nobody Fri Jan 2 16:58: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 4djVJY53l2z6Lvnr for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJY3qvRz42yj for ; Fri, 02 Jan 2026 16:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZC6Y33wjwlCt03IWxel1a961XUa20doqujLLsdKw+U=; b=uMZQKVPyLpnlPDwYyJ9474XGlxf5albcZaFtVxcUmbox0t4V/T93HbMP1lkwQXOaM68JKO MqOgPfAVwnn1ZfNvZV35PwDDERK4NjfPcum7MJQ0AYGYR7RaAFUtO2t2com4CpviPaQDTQ IMPjaULlieY/DHZyW7auUZr9OS2YwNKbvXIJsTkFsXBRLmRJFaBKxnnWKTt+n8Y5vR1A6Y OdR3YH0l0ogrdqWVDYlPyj3NQwob6WEo9Oyyojl4sK5v2qe4GS3SND57CpImbX6BOq/K13 r60oouhS+lYIwOdAWrwJIzU5kg9TVLLL9Q2dii7J2rL7EWr+afcT+WCDblxUMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZC6Y33wjwlCt03IWxel1a961XUa20doqujLLsdKw+U=; b=RH7e0NJ5vc5YxSbMQDrTg1L1MQF3JQsB1r38T6phYfZKmfPIsQKqlpcWZY1iDTWr/hlLQ4 5krahbzfuM8OkQLvwyZYJQpljWhcLVUxcZAcTCE50xF9GJkljfmmgjOSgHnkuOZrazLJnS RfMYi/AIPQUwy2Lk+2JLnocnesSimqCKrc6O8ATOEl5vM8UR1m+MOFP4RxG/Kwu1dgF7Ie cQ0Be1QXyVBgWl9YEdCRFTgEktspDje/+j2jzNgFKkPdPHkCULaiJOKJnE0g8FM4g0gSGq gb0GGYu1SVygx/W5u1BfwJrIMv3iL5NtcxeQmoWMxxeMSZJQE/D7xgUlY417qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373117; a=rsa-sha256; cv=none; b=MDu/98eMj+uJVXvNdAqiYsr3YObVWN8zdsMHB13UEUQDLhuqGg/iJ+yWLxSpvRxdCJGWCh 3ygr7SzofftApA1NJjMpQtxFGnccaDgS8f+IaXiTsSle5DqE0eCUHixVedF/GmQl4PPits antrM3E0GvsZbxlqKn4yTnuuniRm8sVK20lK7VY12XuMyZsHkP94lexEfrqK1sL9Nyzxed w8kqJ/ZDhhxxNBjyNAHzNZlMn7SPTbfBQmax3I0I6vg6OrFWWAgsZT1w3AqSH//DzT6woQ hm5epb9e0arwpRHCIX8NbRqlltm3W0Lespfn41o4iUhzP2kIPEMDPBEflqUpIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJY2qfpzB3j for ; Fri, 02 Jan 2026 16:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3094c5e388df - main - sound: Make mpu_if definitions static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3094c5e388df296f1b84579f70a5583ddc3bc26a Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:37 +0000 Message-Id: <6957f93d.24a18.4fe65319@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3094c5e388df296f1b84579f70a5583ddc3bc26a commit 3094c5e388df296f1b84579f70a5583ddc3bc26a Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:00 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Make mpu_if definitions static No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/mpu401.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 107a53119cdb..500e15c79497 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -203,7 +203,7 @@ mpu401_minit(struct snd_midi *sm, void *arg) return 1; } -int +static int mpu401_muninit(struct snd_midi *sm, void *arg) { struct mpu401 *m = arg; @@ -211,13 +211,13 @@ mpu401_muninit(struct snd_midi *sm, void *arg) return MPUFOI_UNINIT(m, m->cookie); } -int +static int mpu401_minqsize(struct snd_midi *sm, void *arg) { return 128; } -int +static int mpu401_moutqsize(struct snd_midi *sm, void *arg) { return 128; From nobody Fri Jan 2 16:58: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 4djVJc1Yqgz6Lvry for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJb5H1Fz42tC for ; Fri, 02 Jan 2026 16:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByKp05yvDADXnTrMMQ/bXKRkkuZ86Vehf7cK/2VFCmU=; b=hcbCdBcRCMWgqfzT2666khMg84JH0SxVW/yuNR1FYL/ji2fIkRP19Y5MOCN20G5yGwa4Bu CdTLygo5HgPv+JNjZDgJegQiaC1rpW6rr66BJYc/+AAxPJ9LIsv/HPQN4YzEqRPXGVsZbN u5YsPDawMQSZJn2BDPbPxkLZUW5/sVuAClBFz3Eo+pDCI+m0QjdsxQ0gAIa14qWHFMVS0F DEfW5cxSaUH7vz7JPHXXY+JzAbbAvfF5aJzgiK9sPISvygUe6Wx7Axp4dk8irZeWmh4KRc EZnJ+U659UtcRnOFZiXIrQOqmxJFydoXl2b3piKGZyNcjAs1u5ahXUnDwyXqlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByKp05yvDADXnTrMMQ/bXKRkkuZ86Vehf7cK/2VFCmU=; b=TUFFW5O5PHek06+hFYN3WrGNzNX+Tm+nWfqtzlW80Ti0Ukhg0l1bkj+x2imzwIKbmHCuSs 0vndQrJ2pISmHQpb88erdxhSHN+VFzkG8VzpXI2QC7lQhnQgX/oNFouwEg6eguU8DB7MN3 tyYsDcQV5pG5mzLbT1zYBNfcx42WU72qLE3HZulZrnr0OJmmZRk8GD3W3FgB8UZIipBx23 J+fuEgz4S0Sxpb+ZJJ87Iq/5jnIvfu0zSdMkLohBWTk3kiSJoMmtrLmTcP2KPdg/p+tMII DT6ypxRt4fX/vgoKJP9+3U6QcfFv/LJJqe9U7XMPqTSCMY9q5oxfjP4Ht3sCHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373119; a=rsa-sha256; cv=none; b=oqVB5i+BOqejCmNTHU1ZY6b+rEBVrQU15cz8FCDGTC/gPnZMh5ZE5uDlL9/FGMKzuA2Zgg AhnfNtmMGZ/w8BHn7TnJ1GxWMwnsvaBnFP+XHI8cUumpfFG5B54vbZcYxw8GkWNXQp5LU7 4hp5srUb4SrNIM2r9QFdFKyIVLBKKppe8w0WXE5ZNTrlX96SI51xutjpzzNh6F/C3pJZ6d Kb3cW6bznrXpSXmoKmxzYtWi3uhMTDwelJn94c8JBl+BN65bembuA4qjylhZH5dnzyGkhc fmGl12S7xbyhnMk7pv++rTCtCcQDg07Oq0HsYcaqiQchJVwQDx7JQIp8Ufj6Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJb4VYQz9v3 for ; Fri, 02 Jan 2026 16:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fd1312d3629c - main - sound: Allocate mpu401 with M_WAITOK List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd1312d3629cda9691c67af6154946cd55467076 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:39 +0000 Message-Id: <6957f93f.247c7.330441a7@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fd1312d3629cda9691c67af6154946cd55467076 commit fd1312d3629cda9691c67af6154946cd55467076 Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:06 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Allocate mpu401 with M_WAITOK Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/mpu401.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 500e15c79497..d3fb6b214d3e 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -142,10 +142,7 @@ mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr, struct mpu401 *m; *cb = NULL; - m = malloc(sizeof(*m), M_MIDI, M_NOWAIT | M_ZERO); - - if (!m) - return NULL; + m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); From nobody Fri Jan 2 16:58: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 4djVJd2zPnz6LvgJ for ; Fri, 02 Jan 2026 16:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJc66Q8z42pV for ; Fri, 02 Jan 2026 16:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uJ2WFYbOjBumabQWDOlw0qYDdfp3VLZhw0m/21Q6vTs=; b=AXXW90m5vc2BwtYXwfQzzG8cR/UBO88zOucvmCbM6uMw1JNv3v6CVXOulK7UdsP1YgjdaN EUnrwX9SinjKwopj7HSuiVvTWVoP/EhKOQeSX2tLT3r+kUhypdyxr7jWuYjkSMZu0p+Ktv w7IBuEkZih45PFnRSaBM3VwHoIexqU4XVyn9uUepqYTqRopH5oUNQuiJZdl1iYYOppIUom +BE+i3DpxedkEbrqsgIp9PxW9cMG3WvUL3kZXUjE/tf+M/qPOXY59cltRSnpTR7IFThOWa KPIZPnagIl6LKglbKyw0AYUyNsjBzi/U09ZeQI+UHneHtYSKsvRM9fs1czdadw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uJ2WFYbOjBumabQWDOlw0qYDdfp3VLZhw0m/21Q6vTs=; b=hntRZeiY12ckTyJLcZOXjxBKifij3CH7tZkih2nttzg+bkASeREbahmck8LSYHtBkvUXxY T67oVFlXi3trGWI/S3rwM9v1//1Xv8rBrsza/5sedQxdsl3I2YMSELt2wJTSiS2DE5oWeU orzmj4rztaUTYl4L73s2PtrNwKW6U7gkWPpUiQFaHxAf1Lv6eOUkGRMaRoqPtWZw8NEbre HNUq+eZERdS4JHN3hW61LOiJnzi4DvVzI9PMf05oLXTwGUeL24QlWDHBh2sP7P9v16CmLp ebbR0JCXbKL8T9yatx7nyJmJDKIJyJjArhKY0UxBcMeM5TV7ZzpcW4L7O2FM3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373120; a=rsa-sha256; cv=none; b=olBpKlqJdjvOeTWqEOhPyIGem9tIAbe/IH7K60Nrlh0neiPYs2ZeKNtpTQ9uphk6PUeCmQ tQ0cs6n8w9albBAA0xU26AooEiqpdPbkXUryZAUlTORNSRKM8tg+PLL0oUk7DPOSysv3BB LKBW6mHHmzWPGxzSBTyZKbSf8dtVHGVh+ZVrrGjez3uLIN9cbMjL6/FKr61x6we0hUrSsX oK7bsvP8HzrXP0R7DUuY4PbdPyVlaDSI2RW26ZnuXrYURamOxvgHqTY4fH8U3MLb3kpxFT Esm5ANPZuAZfNlNpXYHb7vXSiAxSxcgGpoLDAroARH/Add8OJrbRZ0LzoUPUZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJc57GrzBHB for ; Fri, 02 Jan 2026 16:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a9c3bb39bc91 - main - sound: Retire unused snd_midi->name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9c3bb39bc9181b8762e67c40d00886474e9ae06 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:40 +0000 Message-Id: <6957f940.228ed.621c4769@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a9c3bb39bc9181b8762e67c40d00886474e9ae06 commit a9c3bb39bc9181b8762e67c40d00886474e9ae06 Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:08 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:07 +0000 sound: Retire unused snd_midi->name No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index bde3c5447705..c86f5fb41b14 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -68,7 +68,6 @@ struct snd_midi { int channel; int flags; /* File flags */ - char name[MIDI_NAMELEN]; MIDIQ_HEAD(, char) inq, outq; int rchan, wchan; struct selinfo rsel, wsel; From nobody Fri Jan 2 17: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 4djVpM3R1sz6Ly5d for ; Fri, 02 Jan 2026 17:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVpM1vGkz3G9n for ; Fri, 02 Jan 2026 17:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4M5fqhf08AJjwq8mwAM7UQRpscb8N2gOhKCSE5PcyQ=; b=cMRLeULh7GabLSJiVL4G8ockzETZ9WzbUtygtinBb8T+zHEJ83QcPSr06H/vKltiIvq/ee WxD2rDB8ivY66okwllhvJsBIhmgvfJtF9Vgr28MlDjaIL35fk/gTvtpXWppane7UEp1zl2 MOC4V+AEcL5t5n0szoKP+zCY0vk8KOeOTRTeDG80WcuIxP2sZZfmosxcbG9ypYDpxlMi5G tK5pOe989uHjS63gcVANJqiQbJ0Y1Cs/hv7HWtkCxrNIdCMhtQ30WwjqosCobMIdNyeZmo mD/PdTUr3I/os6r0UU1+DpZzrEuFPo6gzd95kABLU5cNQWxhdcCnToVydETldw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4M5fqhf08AJjwq8mwAM7UQRpscb8N2gOhKCSE5PcyQ=; b=idNGzoZymZNlUop3WXM8jcJb5nqbkmLmzlYlpbJGgX/CfXczfresX6jBun0ROxfpyjLLXX k8Wm0b6ChVj6DFl9luFPtbH5lM3bwWK/FuF4Q7UMbWIY8Yw7FQppXO2L2iADd4rVhYcI6J 31cgX/zD7I5gxZTa3DnTX4hqSO2sWNd9JZb5d8lPyEINjqXBfK5vtepcos23WTELHzKzZf JHk2uyr0dfsIWvKKq4flCktXjR1EOsw/iuz2KN6llWS3crmBNbPyVNdrBt/bY84tRLPrZs KyzLH866OX9JOiRcYYDFrMLZaRvbYgqXkQC7r5kxqR6dkWZ/2cO2eKcwx/xvyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767374459; a=rsa-sha256; cv=none; b=ozeCHhk2mi1egEhK+zCLmmEl09CXOe6KPjSq3DTv6tRPZn07DQpae/i6s9kNaTzaWTlrSq UQ3yrbkNSFYr0Cd8L7EgMEsQA8z1GFL8//SWv1xyboKvuULDJItQFt2nOhOXTQ9h9ps4Di hyHODZDZLoatmpBe1MD4dD1ZxMJdKe5cSWhD77FpPbzRP7tqadTPQ82ECZbQRkQrhHDU/6 HCTA2hDODPnJzhBNLbHQRNVZqKewbLQDaQQw+wNcwiHdcuwvthru8UP89GnM0362pbo5ej RGrMs/bwWClRZlffh7vZ84MeR/PT1ePii5ePtoSZLs8BPRni6IOgFgAOzWhYGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVpM14GFzC4Q for ; Fri, 02 Jan 2026 17:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:20:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0794365d5d3c - main - sound: Merge chn_intr() with chn_intr_locked() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0794365d5d3cc93940b873553382288a2a2c88c4 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:20:59 +0000 Message-Id: <6957fe7b.27212.60e2349c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0794365d5d3cc93940b873553382288a2a2c88c4 commit 0794365d5d3cc93940b873553382288a2a2c88c4 Author: Christos Margiolis AuthorDate: 2026-01-02 17:20:41 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:20:41 +0000 sound: Merge chn_intr() with chn_intr_locked() There is no scenario where chn_intr() is called with the channel lock already held. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D53854 --- sys/dev/sound/pcm/channel.c | 20 ++------------------ sys/dev/sound/pcm/channel.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 7c3f0e3dc9f0..011dc1427c2e 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -581,30 +581,14 @@ chn_read(struct pcm_channel *c, struct uio *buf) } void -chn_intr_locked(struct pcm_channel *c) +chn_intr(struct pcm_channel *c) { - - CHN_LOCKASSERT(c); - + CHN_LOCK(c); c->interrupts++; - if (c->direction == PCMDIR_PLAY) chn_wrintr(c); else chn_rdintr(c); -} - -void -chn_intr(struct pcm_channel *c) -{ - - if (CHN_LOCKOWNED(c)) { - chn_intr_locked(c); - return; - } - - CHN_LOCK(c); - chn_intr_locked(c); CHN_UNLOCK(c); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 0b17c4a130a7..6415f5c88984 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -298,7 +298,6 @@ int chn_oss_setorder(struct pcm_channel *, unsigned long long *); int chn_oss_getmask(struct pcm_channel *, uint32_t *); void chn_resetbuf(struct pcm_channel *c); -void chn_intr_locked(struct pcm_channel *c); void chn_intr(struct pcm_channel *c); int chn_abort(struct pcm_channel *c); From nobody Fri Jan 2 17:20: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 4djVpR2j12z6Ly1J for ; Fri, 02 Jan 2026 17:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVpR1CmDz3GNT for ; Fri, 02 Jan 2026 17:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WnDHfat/TnE7bJc1quwdyrhLiOBl39Km79WWD6J9Afk=; b=a27+FJZzJ29ffAUVezpsXzYbeufc9tW3xWyqG9XZdPuRXs4NvE0MxqPMUXy2Z5vlKk9j2P G98V+qKilzvEXHMZzOtri+dwKaHKSZdYLlZVkDBkzBIZTCpywDQThrgDK1uK/QKBRLR9Tw 3xsD+6FNvWq5IW/Qz1RBvkRIrLNS2TreNXMdvnvnQqFhGqmwpAuGJ27UTW3vWg5Gn99B+F Hc6agYA72abitmPaI1s7Hz3b+p9IqXV7AM9ACiuNsbOmv9EvJIl+P6u5yj3FJqUUAd/LrO 6rd88lK7IH8bnG3504okMO7ihToUdo78psS+FTeLfpstpGRwWE4ojAgJyxmrxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WnDHfat/TnE7bJc1quwdyrhLiOBl39Km79WWD6J9Afk=; b=DFK4R7gA1yYErKcJiUCNf54HhEvnhVPR3+tE9PrQ4b/q0UVu+A/RNtDP+qsHIpvudJuVbF v3fZYx5t94xd9XPpVHXvievp2Ov1bKKglSIt1UqOQI3RLQU50oG14U9T/6pzUvOhkPkKty JXPO64Sicmix2Qn4ObaesiOTF6CS/uzwqMiktgBKnxTFrvHkMF/2EFVo0h8ZMhthWs4t+T XHK+qphrb0puX7rgo2/RJju0EqIATLTh8Efclh0iNFFHT/eFikJOFEk0f4aLN70hG3wfFU zQJxmpo0z+3KX7hpz7U3FmcARBBDDIBZunHk4qrOOtjgP3SO+Xk+dJYPBx2WuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767374463; a=rsa-sha256; cv=none; b=lUSdM2FX5M5d7mTGBzpZPwv+da2GLg45MAl8xyPsp9iCRoYY1zk/+N7wW7dnPSMHhLuTQf GXXRvQ+8cEHomtCV4aDPNeo3Q4GvII0FdB0uosZXxjpygAPHqNmfwrLEqjBQbXjktys47V QAGbhrdP2t2SB+iLknrVxblwl12RXxLw5M+NCsh8NugyX6g/O0Hl9qFFrrJNAvfsIszQcd GjONmI/+wkKHaTO2SiqUHqDNJJH3KuY+AXaTNdg2Qb4cjyHvMZastiVtIY6e4ZGhuQRoMv xTvuq6Vu6zApbQDMJoIEz3gQ8BBgAPvngLKz92/IQUKLlPZdHV2xYy2qiGB3lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVpR0p4XzBPv for ; Fri, 02 Jan 2026 17:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27998 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:20:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c234740c9d34 - main - snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c234740c9d34c2b953c6010f6a01b0aca9648c08 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:20:58 +0000 Message-Id: <6957fe7a.27998.5f730eec@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c234740c9d34c2b953c6010f6a01b0aca9648c08 commit c234740c9d34c2b953c6010f6a01b0aca9648c08 Author: Christos Margiolis AuthorDate: 2026-01-02 17:20:36 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:20:36 +0000 snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan This is a layering violation, but it also makes the control flow confusing; snd_uaudio(4) should have its own lock to protect its structures. Fixes: 5cc34a83e1 ("Revert "sound: Merge chn_intr() with chn_intr_locked()"") Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54102 --- sys/dev/sound/usb/uaudio.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 86fb5228a990..0987ca12d933 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -232,7 +232,7 @@ struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - struct mtx *pcm_mtx; /* lock protecting this structure */ + struct mtx lock; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; @@ -1390,9 +1390,9 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, /* Unsetup prior USB transfers, if any. */ usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = CHAN_MAX_ALT; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); /* * The first alternate setting is typically used for @@ -1415,9 +1415,9 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, return; } - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); next_alt = chan->set_alt; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); chan_alt = chan->usb_alt + next_alt; @@ -1474,7 +1474,7 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, } } if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, - chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, &chan->lock)) { DPRINTF("could not allocate USB transfers!\n"); goto error; } @@ -1527,18 +1527,18 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, #error "Please update code below!" #endif - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = next_alt; usbd_transfer_start(chan->xfer[0]); usbd_transfer_start(chan->xfer[1]); - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); return; error: usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = CHAN_MAX_ALT; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); } static void @@ -2664,7 +2664,7 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, /* store mutex and PCM channel */ ch->pcm_ch = c; - ch->pcm_mtx = &c->lock; + mtx_init(&ch->lock, "uaudio_chan lock", NULL, MTX_DEF); /* compute worst case buffer */ @@ -2690,10 +2690,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, ch->pcm_buf = b; ch->max_buf = buf_size; - if (ch->pcm_mtx == NULL) { - DPRINTF("ERROR: PCM channels does not have a mutex!\n"); - goto error; - } return (ch); error: @@ -2707,6 +2703,7 @@ uaudio_chan_free(struct uaudio_chan *ch) free(ch->buf, M_DEVBUF); ch->buf = NULL; usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); + mtx_destroy(&ch->lock); ch->num_alt = 0; From nobody Fri Jan 2 17:46: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 4djWNK1HJdz6M14p for ; Fri, 02 Jan 2026 17:46: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djWNJ6QqGz3KlN for ; Fri, 02 Jan 2026 17:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767376016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBv2dhup/T3/gJBYAcqLlEYFa8qhyQeHX56UxL8Eh30=; b=DN0qduoqaBKPJGXfJU34IAqqXl9UOnBQGS7eWtcEtANBqufp8C/28DJOiGoFAxo8MMYR9j uhWPs824CRaBTPMUaYlJTF5G8q4Tvxig9gPBpn54Zs2RYfFNacgKgBjI2NivF0ac5X8Dl8 Nm0E9xwz9hkEDCpWwa01noA3YYfzJJtfcqciq6vH0dxMSQ8hSuGpWsHODy3BzSI7eL+iR8 syyLDs9zMmgbicWvkS0aFssZXkaZn9uc83P+HWL5NwDUBx5xIXRj6aFrC7ztYR5pNX8M5o RyKnfucb4kAMkgFHIXqXJTsqIVksvAwzMomTwBLcpEo6XfDJZF9gCyPohpGvkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767376016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBv2dhup/T3/gJBYAcqLlEYFa8qhyQeHX56UxL8Eh30=; b=qZWyDrsBIha5x8rqFAgSr6Iu7EXxWKMXUimgASH5IWZyhZqkLsjL+RDv46/A0ur8ZICqBS ksD1B7kSdoxgtYviBPH3I02KljYIPmgX7D5yrx9WcfqL05rDKXLbzk8gw8dlDc/5ED4/8O 3o1+5ZSJBe+gAczUK8+EJnmiGiufOBVL0fey5Qowrxk76h/v2OR8vPP7ZAbAamD+caKxsb l0hK15LWfApXQThL376IdSHE4pMNAPbV/YzkQD2R84Y37fJzppsQQ+bs4MW5H+Lcnqv6Qh 38xxMS3ZsoGbV3ox2h7Uz31wiuz008CWz4uMpU1VKL/Xk4MUNhgbqvZjkY+GCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767376016; a=rsa-sha256; cv=none; b=n62eCTI8Cll6DunG8+2DOmC6ts9ZxwXGyjWnpBgFifX7m5IWRJdjcV22g1h/Cf6Ek0DWlA u/QBC8E6YxVJZjY8Z14y1Ope+h+6lAEmVXiOz7VoLlCqggvyAqTr6tyCXsUozqQe/ipCzo 5bbcPAYv7QznAlrz+z11yXwlS0DLJ/4sHKlv2K4IOpS+pA2G5DMksp0AJRn3j9ZEijGZfO ZcQtqrmeOWGq52Watd6/FOvduIV0hHjOE+SmtSfMNSsOan+vvrs6EbHHnD43La5Purx7r8 9GIHlXnDCuIZEsbdtez/qeYHW32jUZzKP5SFEMcLXWmrOpW/QrGyAcaZl9zXZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djWNJ5mxmzCNw for ; Fri, 02 Jan 2026 17:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 279de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:46:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 8c7a7d7df508 - main - sys/conf/files: Fix sndstat path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c7a7d7df508faa75515d4f0b8ef58c30ad4ccc9 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:46:56 +0000 Message-Id: <69580490.279de.57b02f06@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8c7a7d7df508faa75515d4f0b8ef58c30ad4ccc9 commit 8c7a7d7df508faa75515d4f0b8ef58c30ad4ccc9 Author: Christos Margiolis AuthorDate: 2026-01-02 17:46:48 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:46:48 +0000 sys/conf/files: Fix sndstat path Reported by: CI Fixes: bafa8c951d8c ("sound: Move sndstat out of pcm/") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 474f337e569a..8deb2bd400c0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3199,7 +3199,6 @@ dev/sound/pcm/feeder_volume.c optional sound \ dependency "snd_fxdiv_gen.h" dev/sound/pcm/mixer.c optional sound dev/sound/pcm/mixer_if.m optional sound -dev/sound/pcm/sndstat.c optional sound dev/sound/pcm/sound.c optional sound dev/sound/pcm/vchan.c optional sound dev/sound/usb/uaudio.c optional snd_uaudio usb @@ -3208,6 +3207,7 @@ dev/sound/midi/midi.c optional sound dev/sound/midi/mpu401.c optional sound dev/sound/midi/mpu_if.m optional sound dev/sound/midi/mpufoi_if.m optional sound +dev/sound/sndstat.c optional sound dev/spibus/acpi_spibus.c optional acpi spibus dev/spibus/ofw_spibus.c optional fdt spibus dev/spibus/spibus.c optional spibus \ From nobody Fri Jan 2 19:09: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 4djYC6228nz6M6Lc for ; Fri, 02 Jan 2026 19:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYC56Q8Wz3V92 for ; Fri, 02 Jan 2026 19:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767380945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MUjs3pHdNvgjguH2qRMcW2yYwSiTM0n1IzZiHNdXjxU=; b=tXQFJCwKOnV13Bq91Js1vLU6wlw+hZWj/U34TQY98e7w44P7i4ivfxPqUUkOlxqFXABrU4 3Q6SZR7dBxtiU3hA9l1cSf7rQWtX799d1ZRj/xkNpmeU9eQLLvujLIw+zb1Kwj/ab+niGi Uo0l3DMvYCmAp1djpApuDLafAJ8TcDbVFkBE9c1UMNtNsvcv1HtfkRNmx1WkNTajuOIA8k 3ngzjzUMVOeH4FQxSc4mpyQ5DiQo9LrH/fdG1dTyfQkIo7JPHNlATw+xM7oejt8QWGErTj QsN/fHpV4Jvd3o/DvQ3qBVkI6MdUQtPstXR2/afiOPx6IAzrGNIpPHAME8f7ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767380945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MUjs3pHdNvgjguH2qRMcW2yYwSiTM0n1IzZiHNdXjxU=; b=Kpm6c/SqgKGIDcAxEiWChIh1lcYKtoiDsBb5OmtNBFy4sZhSWj9albrnf2maGxlH2GT2r2 fqxLTqSYcWf/NdnClT/As7Uc48GAFGA/Lv1k2pjIuRLjq+UXQUIMqJ9F1kiaeBFPABLhXN lyvY5n4iRe/pQL+Jc+31sDwr/OgIOgSkKWHjMy7OfHGL/WXkWDOmzmUNVxhpC5pKSK2fwt gUVUXZQNDF3dPO6hCx9qaRulgH4c6Qkaph6ioyDvDPQ6d8Z3QChTelF2/I+2/otEbkdpFa hcIlDEhaT5w+R6LLKChRTjtvQONtViY/0UOefh5xiZiqOVIRfeQFhlR/BwKLfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767380945; a=rsa-sha256; cv=none; b=sDhBDro0zTSptkQaGwkJ7/WFwfzc1R9FSzboIb0jffGxkWF5J3WjjjvxByLnRm5tU7KGxU ccc6GUDORoJnDTL6qkktOrmDR9gmfy7Rrd4yCs4dsF9IED0roaUaAmsvNZNAqruC0vJm40 D9AtUUDJR/A9bqpEf1jD/HvUSz9TdWx7Go/J/efNQjAVg30655XfuyAEYWii2BcSm0y+jK R1oVDAOMzYXSSVV5iMGkVHBk6RAMGm6mfmluQy/xOguSdrvgRi4qB0C55O0yMidwSMJQ0R jl+dmpxM+o4NNxNmFUB8hVCbRol5qYoBvQXiy5O4h2wZUpOv7ogUuVplMVvBrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYC55WHVzW9T for ; Fri, 02 Jan 2026 19:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:09:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Konovalov Subject: git: cb9c8e9768b8 - stable/15 - khelp: make the module compile again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cb9c8e9768b8e237e62aa3219b9ac5ffa46087c2 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:09:05 +0000 Message-Id: <695817d1.38ba7.3d305041@gitrepo.freebsd.org> The branch stable/15 has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=cb9c8e9768b8e237e62aa3219b9ac5ffa46087c2 commit cb9c8e9768b8e237e62aa3219b9ac5ffa46087c2 Author: Maxim Konovalov AuthorDate: 2025-12-16 05:47:02 +0000 Commit: Maxim Konovalov CommitDate: 2026-01-02 19:08:20 +0000 khelp: make the module compile again PR: 291165 MFC after: 1 week (cherry picked from commit 27554189e5122d780dd295b1a1a81f15f459accb) --- share/examples/kld/khelp/h_example.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/examples/kld/khelp/h_example.c b/share/examples/kld/khelp/h_example.c index 92f0c885bbce..07102d30be21 100644 --- a/share/examples/kld/khelp/h_example.c +++ b/share/examples/kld/khelp/h_example.c @@ -45,6 +45,8 @@ #include #include +#include +#include #include #include From nobody Fri Jan 2 19:18: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 4djYQK590jz6M6dq for ; Fri, 02 Jan 2026 19:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYQK4Wpxz3XDv for ; Fri, 02 Jan 2026 19:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+uCBPTIscPsCbD4cbvxcqT0/yukjv1xW18h/l4QojRc=; b=UlX2+x8ugPkefXRo11rcTIktwJV01F+0V5FWLCOfA6I1+LbfK5qwfjwk1WiUfEMeYfLKdH oA9uQuGjko2txP2ZDFxl59lwpOOIe9v31ZNWmxbdpGWxEw5QPi0ToEfh6cKpTAsdTuRr+f cr7fBEQ01TlqclFoW4jPhNSnaWZVtYg+JTjapAaRVcsgW0LC5eg7v0zi7f81j8JDHkyOIy 1xzXcgGxQEmqATLCOvQ1MxcjYiKRMJmmvPa6BcbbMeVrr/sGFa9m4lUCgnOjLcKqrsxf6c +wCJCL9v5jNqKASa32PTzhXggwBJ+NVHInkELnJIMDFtb9wesRwVTAMc7As1jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+uCBPTIscPsCbD4cbvxcqT0/yukjv1xW18h/l4QojRc=; b=pSV5C31Eegguof9VrRchv4KCBi89B4Pj4Yz0sHD/PZDCqrNUGgtPMQpNCm1HK2UPOXB6sB P1R3kz4QLqIK+LTRWr+FWNQ0CO4AKoxj3uYfPTcEA2KQICucuMza2eDLtLxK+yYLiOTSgh zuCkAoVbGkUyh0+nL5fkAKXtEKxETLA5Ah1gNmKHC2ZVu6J90lmyjgQfJhvPOcG0At9Kr1 +FGXZXfnaPnPVx2KBtOhRd3JbVKS74iuRr75H+ZbK85G/ZCje4wcOKWgviLIDEoSkqrk2u oNycKDPFfU/ewrdKAX9oDgLprGMG50yFO8JizFfpIuUWQcZFRh6TPQNSsrrXOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767381529; a=rsa-sha256; cv=none; b=MujVOt2xfO7C+BV5qI1M7GaPm8PX78aU+3k5bzW0v1SnEOH2qnDwLUCVvH/YIZtt1sLjDY 59F1qZhWDaN4SCJ831+C2hJ9V+6ih2lQ4BloYBp64F5cxvMwu4X7o2G5bSi1hTuO4y3pTr gisO3FhYF4+QMaNhfEkGsvst+Zg7KFFT5vd9kN8HcEr2JZj6Fd3OfUenUe44elNYQ+pPqd F9lpDmLGzFgQ1spluqXXCjG+2DZo9xdO4fO5iFg4C/8x/zXE4zJXaejOx60NmAFsbqnU/2 +DxIF5FdrZceGmQc2PJdbTJIzjcgDh8QSz1R9yWhfJmAy6CSLFjU9ZWZmF+jgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYQK45GTzWGq for ; Fri, 02 Jan 2026 19:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aac5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:18:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 1d0d0a8b4af5 - stable/15 - ipfw.8: fix documentation bug for setmark List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d0d0a8b4af525c3940647b10df45ec8efa6afb6 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:18:49 +0000 Message-Id: <69581a19.3aac5.70db39a0@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d0d0a8b4af525c3940647b10df45ec8efa6afb6 commit 1d0d0a8b4af525c3940647b10df45ec8efa6afb6 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:05:22 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-02 19:18:04 +0000 ipfw.8: fix documentation bug for setmark A mark set with "setmark" keyword is intended to be "sticky" and documented as such but in fact it is not yet, as current implementation lacks "sticky" feature and its implementation will be not MFC'd, most probably. Correct the manual page until the implementation improved. Discussed with: Boris Lytochkin (author) (cherry picked from commit a7b8a5d37bcb0009297962137bfb6c6570e5af12) (cherry picked from commit 9fdf49e8a501047b61a615ab1b4b133159ad76e1) --- sbin/ipfw/ipfw.8 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 249bd195b4de..c1df8399c333 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -841,8 +841,12 @@ When a packet matches a rule with the .Cm setmark keyword, a 32-bit numeric mark is assigned to the packet. The mark is an extension to the tags. -As tags, mark is "sticky" so the value is kept the same within the kernel and -is lost when the packet leaves the kernel. +The mark is preserved for a packet within a single ipfw ruleset traversal +and is lost when the packet is checked against the active ruleset +next time (see +.Sx PACKET FLOW +section) or leaves ipfw context (e.g. accepted, +diverted, bridged or routed). Unlike tags, mark can be matched as a lookup table key or compared with bitwise mask applied against another value. Each packet can have only one mark, so From nobody Fri Jan 2 19:21: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 4djYTM61g6z6M6pq for ; Fri, 02 Jan 2026 19:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYTM45PDz3XXC for ; Fri, 02 Jan 2026 19:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qk9xhfCOz4hB3Dz/juBUBrpV2h9afZgjLv+L3D4P69I=; b=xQuP1i4oeS9bRjskd0/FUnb1jzJLaXk/IYyc6Z4Fcj1j4c75DlpJyT0ivKib35a5v7S8Bs 8VNS/ji0jTcO4vG62abTq1dzvRY1mbV2qM7LeH4ySgF/3kNbni++E2sjnDSLfrAXxi9Y/M Oxb/99ocoZYMw6hxv0WsDGHhxpgNllsrPWkIKIdZ7aYe1CQMPaXx21n022E06PWFtyUSVl dhtGQg4jt3fp+QLNKJ6kvSJL+pYq9+h1htdoPYZmxnQdtsEsl5IDzjlOha8POj9OO7wLdQ sEUutaaiDhmqmclYkSDK1SgieCNH/TEil8TtjIAJjg1rdr7xiPqofRJS8aFPkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qk9xhfCOz4hB3Dz/juBUBrpV2h9afZgjLv+L3D4P69I=; b=SzzrFWC+IWYWZ4DxyHlCQ6vxHx7/IYECZHR8HrNvUDDsd1O8La7kvH7vn8rrgYBMUTUUw9 At0s3uCeSG82fKD8oA+4UsDhpMWhTzNAfiySRJrJibkt2UrYJfMGfCHPkII0xbaaNnZD1b siVCh34cvnFnu0SypyJc+64T5l1tKKuYViSdjhg4zDqfCz8VrxG+BKl0PKxcMQ0XtX0HTO 0HMn677cfaH56ehA2O1QL7TSJ9V8AiYukj5jL/8UGoL/dMZFMgGmxw5T+5nl79Pmto+yii a7SmTOVPRlhKbT5YLCBSjjDVhe3wFoX+gNDAfYtEJN20oVdMnolfCLTpSSOXJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767381687; a=rsa-sha256; cv=none; b=dA872uUc9a25GzMXdljsGZ3xf6nPdGjJsTtf9NWHI8gGY07uGqGObszoVQBsOuiEAXpaBm hWhrypN0ClqtD2MAA2XTIvfZS5l+DausdN+FuMzkNkm9in0dqV7PN1ZhUDtmtcRLbM5YjD n+xB8SNSE8mQon71voq3En2f6h55D+CUrYlgLWIT7xBG2Outi3/hny0UFvZFIbSl4t9NGy 4FIO0xCDEzAiwu2rBRs5ZgPuocVYbnIC0aplGDSuIY7/ZJCeVvrR+yWCgA6goEooWnYaXN SDqSXCZQCYgOwl0M67l2jW3mkX06+vaQBNz8HQ2D/rTn5H1wYLCPbi8q1GwOkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYTM3VJFzWsb for ; Fri, 02 Jan 2026 19:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39dc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:21:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: a3559f398824 - stable/14 - ipfw.8: fix documentation bug for setmark List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3559f398824e3e7b7d102f4483610881119ff47 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:21:27 +0000 Message-Id: <69581ab7.39dc6.4c735259@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=a3559f398824e3e7b7d102f4483610881119ff47 commit a3559f398824e3e7b7d102f4483610881119ff47 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:05:22 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-02 19:20:54 +0000 ipfw.8: fix documentation bug for setmark A mark set with "setmark" keyword is intended to be "sticky" and documented as such but in fact it is not yet, as current implementation lacks "sticky" feature and its implementation will be not MFC'd, most probably. Correct the manual page until the implementation improved. Discussed with: Boris Lytochkin (author) (cherry picked from commit a7b8a5d37bcb0009297962137bfb6c6570e5af12) (cherry picked from commit 9fdf49e8a501047b61a615ab1b4b133159ad76e1) --- sbin/ipfw/ipfw.8 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 94ad9e0958cf..1f0ab5916bd7 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -796,8 +796,12 @@ When a packet matches a rule with the .Cm setmark keyword, a 32-bit numeric mark is assigned to the packet. The mark is an extension to the tags. -As tags, mark is "sticky" so the value is kept the same within the kernel and -is lost when the packet leaves the kernel. +The mark is preserved for a packet within a single ipfw ruleset traversal +and is lost when the packet is checked against the active ruleset +next time (see +.Sx PACKET FLOW +section) or leaves ipfw context (e.g. accepted, +diverted, bridged or routed). Unlike tags, mark can be matched as a lookup table key or compared with bitwise mask applied against another value. Each packet can have only one mark, so From nobody Fri Jan 2 19:22: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 4djYV10hd1z6M7G5 for ; Fri, 02 Jan 2026 19:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYV04N8Lz3Xsc for ; Fri, 02 Jan 2026 19:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381720; 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=2noZ3JFPai9GTrEAsVUqeL2clXREKJgXIR2Uf8N67p4=; b=GMFB21FotR7+anbTxF3j7okeGoHgCqxfl7da+E0qy+L+bvDquhice19XvhoPcA+jDzcVGx QdvsACWGIem+Jk7cDXp2jau9MsAAerHLDDOrIDJDGNFVIn4+20C+ESz9cP6zRqQMt8xeP8 ytB+mJA97Oikn+rvyv6GbzjvqqcvHbfrBjfqCHTzkcUg3Mk2lPTO1e8eaXK75uDNhEGMnV vUSvHQVEQtDEHfFrh2vDv6DZQbjLiAFOe1fwkyvx7MH0KNjrg5RJzN023bwgoIf7IHH2v7 U0XzaP0YAi8+VUtTIcz28590Mpo9JASlgpbWv5igEQzx5X1XcaB9JkbI5tCbfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381720; 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=2noZ3JFPai9GTrEAsVUqeL2clXREKJgXIR2Uf8N67p4=; b=ffXHbQ2fWoOM5da99CczbJu0bL8X5rQo17J9BZVKlZ3D8KlkIoVJzJrjARywHuArUxwrN7 HecEnKKADjOQu1pk4vXK/i/ebHFSP5FTIdKb2+8Rr7aZh+EgP6SwKYFuyX8ZnC5VAYMOei FySWtKN9vqG8JHxfttY8YAFKGyu7mSgNUqs1TPv+lAcnKAVwwUUB8FeRCEYyDCzFKvA+Vv SFPr4/+hC8Nr+OzkDWH5tGbJURQ71/9hhGq08xHrdJiuzj+hjGU969gktePbAxswHG07wb 6rRCLjTeySvm//URAn98gyeMWJPCOtYdISCjCSuXjM30ndeloyOFG/sSaB5nXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767381720; a=rsa-sha256; cv=none; b=VJeoIXqFPgZZTNVPTuFaUfLsMyVQDy0p6+fTkjntcQ8/wvv1q2ANcTLXL3NY2FRRRt3zce QllwFQ3LIuVDgxjf8vQX80PmKBvBVCKXcDsqdxUWx/OhNk/4AYr9mm39V20A15n09/Eoo8 8it+OmU37YxohCkRKUdNML73ANR7UJRL3Dmz3/FqfYp2oJjpf1CoIc+dXuBwO8P/+D0jn7 UN6WhuEv9jjj4P7SIdKDO2+Br5Ac2qFLm9p9E9vFkjJTgXZQujPX2GU5ZNXNaPn7MII4R0 9aNuzr/UTBm1LVmmnZnE+jj6AjZKWuKk9lzz5eJ5ojvOR5fakrK1Y7u8IRpvng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYV03y7gzWpX for ; Fri, 02 Jan 2026 19:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 397c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:22:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Johannes Totz From: Warner Losh Subject: git: b52347f5b938 - main - jdec_dimm(4): add a reference to smbmsg(8) to jedec_dimm(4) and smbus(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b52347f5b93822ee970b6cf4b5d893d60c3ceee8 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:22:00 +0000 Message-Id: <69581ad8.397c6.791ebc36@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b52347f5b93822ee970b6cf4b5d893d60c3ceee8 commit b52347f5b93822ee970b6cf4b5d893d60c3ceee8 Author: Johannes Totz AuthorDate: 2026-01-02 15:03:24 +0000 Commit: Warner Losh CommitDate: 2026-01-02 19:20:45 +0000 jdec_dimm(4): add a reference to smbmsg(8) to jedec_dimm(4) and smbus(4) Add a cross reference to smbmsg(8) which is useful for discovering local devices and difficult to find otherwise. PR: 247749 Reviewed by: pauamma@gundo.com Differential Review: https://reviews.freebsd.org/D40839 --- share/man/man4/jedec_dimm.4 | 6 +++++- share/man/man4/smbus.4 | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/share/man/man4/jedec_dimm.4 b/share/man/man4/jedec_dimm.4 index 30e89b0afd0c..db11931ee183 100644 --- a/share/man/man4/jedec_dimm.4 +++ b/share/man/man4/jedec_dimm.4 @@ -24,7 +24,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 April 25, 2023 +.Dd January 2, 2026 .Dt JEDEC_DIMM 4 .Os .Sh NAME @@ -167,6 +167,10 @@ dev.jedec_dimm.6.serial: 0c4c46ad dev.jedec_dimm.6.temp: 43.1C dev.jedec_dimm.6.type: DDR4 .Ed +.Pp +You can use +.Xr smbmsg 8 +to probe for devices. .Sh COMPATIBILITY .Nm implements a superset of the functionality of the now-deleted diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4 index 250017defd36..c02cb4b3b176 100644 --- a/share/man/man4/smbus.4 +++ b/share/man/man4/smbus.4 @@ -60,7 +60,8 @@ between the internal SMB devices and external ACCESS bus devices. .Sh SEE ALSO .Xr iicbus 4 , .Xr iicsmb 4 , -.Xr smb 4 +.Xr smb 4 , +.Xr smbmsg 8 .Rs .%T The SMBus specification .%U http://www.smbus.org/specs/ From nobody Fri Jan 2 19:32: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 4djYk30jYpz6M7pS for ; Fri, 02 Jan 2026 19:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYk274lGz3ZcC for ; Fri, 02 Jan 2026 19:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767382347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9y01skbf8qyCZulZfc4Xdz5Z4db8lXg5t4b8kVAdyws=; b=sPg4TD3sYSWdrr7zA4X2SEJghcwH3Uu65Vb3iC9aFQfFWLEGmkV5U8A48pY3S+F6XJYfNG zPJnTUGuM7shwJo3+Ei1Xzpt+W2YpJctikFXJFLkOx0z0MkN3gMXTuF5JHuBeqAehNyktF OIhpi1Z2iXbKQKbJq8GC0IZYcT4Z7ZpL8a8zLpaDk+nfHZKoUHKe5i//lsWpGuGM/N7SoX aLDOYEjcHJ5gQ1kyRsuThtyxYaIp17DUz7GvFHKBu6KC626s/2b8T1w99q4u6wnHYigran U6IGzkgDfxdc81EiCUWVaG7m5T3+KFwz4iATSRNGDPoOsJ3+SHnmPMln3bq9JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767382347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9y01skbf8qyCZulZfc4Xdz5Z4db8lXg5t4b8kVAdyws=; b=LVCBIPksrWsfGureq+F62Hoy0pd+SoZiW9RMWQ27XPB0vgx+TO3sjHv63D51qonQnuZrAw SecBkn5wv6rNdN0I1UwPjv7rlV7Jyf0EMuZg92kQZ/++OdLAz+vYGm0wrPjyqdwg2gw+k5 7VaeOegdlJQEtF7orUjBjId0Hm6Y+45RW3ZtkwYTlVwZsQYiD5F2HxD9e9CaKtZnnEs146 HVnUKuSb0VOPbxWtUPIrbtaTfRS3JbM8HkNaF+R6qddY/zZlPWbFpPVE4MPha8YEawXX4x 4sNlzf3h3yYndBtmj8lmPc2S9lvS1IOZyIuXfF+ylxNbYBM9ec8eMAARCPpwMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767382347; a=rsa-sha256; cv=none; b=AQAQCDRHFlMBw7ChU7Z5wvmJwMPOYaN9bXjQ520wPR6CWwYSjprrUhQDaf6ohvOSuHLFMK MWyeOWg8gctV5KTPRrQjyAZ65grCukdtEKJUqLTY8cKmHpF5rZLfyJcHUzDBGcs0j+W4n4 HfKO+lwWz1xRXzKNq2YWNz2rtMZDbAvN+A1qy8Rp9sXB0F07JUVBIBuuF52x4k41serYe3 4VRZQfptu8Uk4Dw+RXYTaKgMsUX8YRGOf2D8AsIojShSgNjj7+y3ir1f49iot2m/INfUGb 7085mKY5GrD0c0rifQJ+/y/wIpexGko7n9J6JooNonaxo0UiUGgTMV266ptf0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYk26gmSzXGS for ; Fri, 02 Jan 2026 19:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:32:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: f70c6054a63c - stable/15 - MFC: ipfw.8: document how to delete nat configuration instance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f70c6054a63cbe5d874827f40329de7464b4eb42 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:32:26 +0000 Message-Id: <69581d4a.3acc1.382fde10@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=f70c6054a63cbe5d874827f40329de7464b4eb42 commit f70c6054a63cbe5d874827f40329de7464b4eb42 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:47:08 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-02 19:31:56 +0000 MFC: ipfw.8: document how to delete nat configuration instance (cherry picked from commit e51047118cb1d15abe8077a5b47b8063fa364ad9) --- sbin/ipfw/ipfw.8 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index c1df8399c333..c6eedbccb2f8 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd December 4, 2025 +.Dd December 29, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -104,6 +104,11 @@ in-kernel NAT.\& .Cm config .Ar config-options .Nm +.Op Fl q +.Cm nat +.Ar number +.Cm delete +.Nm .Cm nat .Ar number .Cm show @@ -3513,6 +3518,15 @@ For more information about aliasing modes, refer to See Section .Sx EXAMPLES for some examples of nat usage. +.Pp +To delete specific nat configuration instance, use the following command: +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm delete +.Ek +.Ed .Ss REDIRECT AND LSNAT SUPPORT IN IPFW Redirect and LSNAT support follow closely the syntax used in .Xr natd 8 . From nobody Fri Jan 2 19:34: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 4djYm41mq9z6M8Bq for ; Fri, 02 Jan 2026 19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYm414kDz3bjy for ; Fri, 02 Jan 2026 19:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767382452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yP8COOXJsile7P0V++UHXVr1ctYnlnUzbWEREwpsQE=; b=F/84+HuvQSmaJdv8+8RQFOFo1rlECraJjnbSuq6DsD+//mD24tLjgj4BjNnkxXbOlt8x48 VNZZOBfzOPu5pI3h90Koth/EvNnmpDfUXYAYdcuqYcKsTXq+ILxrWgF56LjfgXtZ+OgqHc ByCNmrTN8ZLt9zHJliNiAsXc/kJq2Zrqy4RYrpFVZwLEcvvh9LDvldZLfKI2VaBbs/i95X 2jo826m+O/bJT6CJVh5WqFt3vIlkd7bMSeB0ZcZJ2pYFvU6OHLI09fRa9Alb2nwoEdcxOT /R8/8CE815gtQS8zcN22NjdOcC4touurPS1jZvyw05R5r0cRtRUIUI0Qiw8aug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767382452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yP8COOXJsile7P0V++UHXVr1ctYnlnUzbWEREwpsQE=; b=NE48JcPvakpnFUmxMl5iN0DaVmnJgNsKoEbD3oOJj4SCjixfMPx1JadNFBYt7i/e/12tfr 1Rx6PhWvb1lwOd8RCFDf8rd/MPdjhIv6SAP/6/VLVbvh3dYOvc9YpYBPjANob6xNmMWT+S k/VVFI87qdnlWbbvw21TNkGkfllRXrNaIjiUxxhyyF4GqLk3eYYqdgAxNmLY8pzBhQ3y+S Tf5/MDky1caQrsFXGTK8a0vg6KltCjA+6nptVar2pQJ7zNOxHITG4SlTtEnQ7hBVMfcaPQ /SyodT8JyjcNwEAmgdvhjUpKyTON0V8MxrhN5cqHtD8d1QOur8qA/ozXGXliCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767382452; a=rsa-sha256; cv=none; b=MCyCEPmqs97C432pDysX6KP6FO0gsX2rmcQ4y/xAzwr6/FtN8OVcLfdEH8anovoqRtuhXn Ft5LBUIigg+i2EBT7S2D4C19AAYxi3tiRgmJ4o1/J8ySc/sYJOeitNZNqnDCZnjGZSp1M9 Q1oad9K7Y9BnAtaCdsohEmG27JGPrqibzCTvLzPA00xxlevRliqhrdNQDF/W9WJIDHSXww q7het5G+YSP7b549BIsux21M9ppUPNgdgkzSlC1ouVznvYbLJUOexNxlNwBU04daDBHtiP v8lZO7TWA9jN5lyR3EyK81byTbxHEKQ+Pqwk/6e1Jjpn12G2oblyi92jg8ShNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYm40h6mzXG6 for ; Fri, 02 Jan 2026 19:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bba2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:34:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 186ac4724746 - stable/14 - MFC: ipfw.8: document how to delete nat configuration instance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 186ac4724746b50acfa43e148ca99991aa1dbe9e Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:34:12 +0000 Message-Id: <69581db4.3bba2.2be39a8d@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=186ac4724746b50acfa43e148ca99991aa1dbe9e commit 186ac4724746b50acfa43e148ca99991aa1dbe9e Author: Eugene Grosbein AuthorDate: 2025-12-28 17:47:08 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-02 19:33:50 +0000 MFC: ipfw.8: document how to delete nat configuration instance (cherry picked from commit e51047118cb1d15abe8077a5b47b8063fa364ad9) --- sbin/ipfw/ipfw.8 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 1f0ab5916bd7..e9f05a7dba76 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd December 4, 2025 +.Dd December 29, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -104,6 +104,11 @@ in-kernel NAT. .Cm config .Ar config-options .Nm +.Op Fl q +.Cm nat +.Ar number +.Cm delete +.Nm .Cm nat .Ar number .Cm show @@ -3403,6 +3408,15 @@ For more information about aliasing modes, refer to See Section .Sx EXAMPLES for some examples of nat usage. +.Pp +To delete specific nat configuration instance, use the following command: +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm delete +.Ek +.Ed .Ss REDIRECT AND LSNAT SUPPORT IN IPFW Redirect and LSNAT support follow closely the syntax used in .Xr natd 8 . From nobody Fri Jan 2 19:35: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 4djYnk3mgWz6M8FQ for ; Fri, 02 Jan 2026 19:35: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYnk122Rz3bqv for ; Fri, 02 Jan 2026 19:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767382538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arM191cEwkSaBaPUSS+PGvovtlQIbhnL8WMNUzzIAO4=; b=uAzynPKRs2UPraVVuiSkfb3Pv0ophdkJSWk03JmJB5tJDo7Q92hJMgm/nU9IRYRpkSoCYZ ECzY40qobi/tDEcCX3q9/PrCXZ7sLdDz2k6aGHDlSukLCoU/G3TIEzBO491C0plUpVh/uK /BuyaztScLRrn62KKbuVeDUHLq30qaIdBAkTBvDlnYBUoh2A70kVHedueWSpJYqfz/FXeO TQURonRq/4tdAW19Fj88EgheybOBZADa+cgaupx8D9mX3FW5HgSrTZkg9iTJX0XVtI+THm xxIYh6macFytF+2kuS06sjsiZxc7exMyONKA5g4POSQjNgnOJpEIqF5L+s8yTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767382538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arM191cEwkSaBaPUSS+PGvovtlQIbhnL8WMNUzzIAO4=; b=QkeWqUagNYLzGUkPtn6zMKyaTljnbofTU18f2raX9cRVov3qbF/Tu/IeJImr/kBq4BfVTD fk9le2nf6+9yUXrW+KuSlP3+Tfk3Yl8DdOoM7NHUALeLZjAETLBEjAtAizObxrX1Rmv/Xp CcztIXpQcZ9pvM3Cak7X8zPXNuEk3/SVM+ecFeeT9lPhjKDam82haxtML7y3oh2hQw0GzY I6D3c9e4F6qlnhpPdwi93etz7tT4vu1QExWfx/N6cUqOSZjUPSrvjBtF5E/N73guu0WYAw wfjNe+5Kfne6DroFRhRQrrs67tYsD6GeigA4LD4XFScjaUBna7EUiMeOi6gZUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767382538; a=rsa-sha256; cv=none; b=UVxWceuBsDYtRAD7EcPFVD5Q22inqNszWZtDD0K5s7WABirs7ZBKsU16uVsYhOviXJg1RM a4HJ8YOPH7TRYhgG5AxCr+EHVLa1wyIEhJDza+UsCdnbJzYntYwt7InqhqJnmuC7mONXQf exJOaDxLR+GomeD0/c1XEFOHJyo7TwZCvTOt0tbABLoDQouZEqEnND2BWhLb/c38tODGUr aYsRy+KHwZmYpPNtKb7RpOcqhqy7/nLVH4YwD078PFyoQQvG6kNFh45mETqUyA5CVw9nBz cQm4JtaBIiYoRhfU2IfBcy9D5TAmYnSWFuvQH/8lDPwBEpWPjOuD3/+AoQbkZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYnk0MJ6zWq2 for ; Fri, 02 Jan 2026 19:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a162 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:35:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 7a5dfa03dc6c - stable/13 - MFC: ipfw.8: document how to delete nat configuration instance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a5dfa03dc6cb5bd0a161c7e2cc3d423cbd465ec Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:35:38 +0000 Message-Id: <69581e0a.3a162.5d9348b6@gitrepo.freebsd.org> The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=7a5dfa03dc6cb5bd0a161c7e2cc3d423cbd465ec commit 7a5dfa03dc6cb5bd0a161c7e2cc3d423cbd465ec Author: Eugene Grosbein AuthorDate: 2025-12-28 17:47:08 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-02 19:34:57 +0000 MFC: ipfw.8: document how to delete nat configuration instance (cherry picked from commit e51047118cb1d15abe8077a5b47b8063fa364ad9) --- sbin/ipfw/ipfw.8 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 4a9ded2b9867..4e3094b5ac43 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd September 28, 2023 +.Dd December 29, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -104,6 +104,11 @@ in-kernel NAT. .Cm config .Ar config-options .Nm +.Op Fl q +.Cm nat +.Ar number +.Cm delete +.Nm .Cm nat .Ar number .Cm show @@ -3351,6 +3356,15 @@ For more information about aliasing modes, refer to See Section .Sx EXAMPLES for some examples of nat usage. +.Pp +To delete specific nat configuration instance, use the following command: +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm delete +.Ek +.Ed .Ss REDIRECT AND LSNAT SUPPORT IN IPFW Redirect and LSNAT support follow closely the syntax used in .Xr natd 8 . From nobody Fri Jan 2 20:23: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 4djZrv1XF2z6MC9k for ; Fri, 02 Jan 2026 20:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djZrv0bMBz3jxG for ; Fri, 02 Jan 2026 20:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF86FyCzKxoatzUidsYaBOMXu1SKwhGi/3/L7Sx/2oQ=; b=R4i7lLCrTcMax4sqsreBZ53An8s/969MZyzi5wh8+w7FZS52md3alTgc13vKvHTyvEDtip uIg0Lkc0yTHSLhJNroBs1ToRt9Blj5tlYVh8V6VeLZpPX7adxtH4a6TKRrn1NzXgOoa6c9 axOR0v8bur5EI6zpDm7LlvFVr6G4BpflcGY6WCmVdpaDmV8EjPPVW8rwuXYajQzrij8nOy aZtOCnthv8W651eFcXREUFVxwuxSuFikiha0Nw6SDPOG9xHsHXTa7aEIQUoftbIfKu6fLQ p9VegI6eVcw6BsBqNGX5XhsEovOfPU6DtqNyXRgpoxbCSHUapPpqVVAAEo+PBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF86FyCzKxoatzUidsYaBOMXu1SKwhGi/3/L7Sx/2oQ=; b=kUbu+7t029utgX1ozroTk6d/MAndjpbNM2sasxb6QSZlLLrmJ1AEuhzaXxuomTE3xoIqS1 7Bg5kt8bqeINXrYo2ajcRisuGihAs1ydkdPBIgXYaD+pPPChun4DcO4Ho5aKgDNcUZytfp VCSiLLqPahHvz904EQH2ty/lqUtCn4nDAFUrMcrzRzOO9yVsY/iBBZIoF1OBycM/75adut J4ufZABLb+O6SxcDEPpBGTpYRd9D006VaNvqH0aHEuzVWDR7TyQMkpPQqq6J80cMOC6/6v qJNobWu9Buq855l3W8Y8DCd4Bg5+GNoj1FoXQaqY0jHp4Z2jrDLcXdm1QJ9lYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767385407; a=rsa-sha256; cv=none; b=PS3im8DGXR0oqcftvYuNsMP0LYHliXzoOTNJWWwMi+G7+YpvJEs4B4mqfK75zus+a2WjeN fprWg+l2Uww3xPXrSa9Bg4x42ZY7+HxzreIXcvCfaNkBE2JKbfFs5YwsUz2heHkXRaCpGs p9+X8LRB4hweMqI5XKngQNxOq2P6UBUpohS2XP9LMAAuiLVUv/MdlorM0iEO6sWECwWPBh 7lxKUVgnvfucCHKUhBxxMZYlcQ6zYjBp4oaeiMI+N49ky0y8xbLlcNe92kwf5Q0dqbZXAu +H+CMBHiznyzTBQjftYgNDpD9pNlfUGeKeyqAZIU8iEDTLcKQ7FV8yefkGIvwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djZrv02xxzYrF for ; Fri, 02 Jan 2026 20:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:23:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a6afa194f382 - main - Makefile.inc1: Indicate that no-clean builds are on 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 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: a6afa194f382e4f81277fdc7e81e229d3c8caf5f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:23:26 +0000 Message-Id: <6958293e.3fc68.4a377a20@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a6afa194f382e4f81277fdc7e81e229d3c8caf5f commit a6afa194f382e4f81277fdc7e81e229d3c8caf5f Author: Ed Maste AuthorDate: 2026-01-02 20:16:00 +0000 Commit: Ed Maste CommitDate: 2026-01-02 20:16:00 +0000 Makefile.inc1: Indicate that no-clean builds are on by default PR: 292130 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8966f96de9b9..a6181b78125b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2,7 +2,7 @@ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir -# -DNO_CLEAN do not clean at all +# -DNO_CLEAN do not clean at all (enabled by default) # -DDB_FROM_SRC use the user/group databases in src/etc instead of # the system database when installing. # -DNO_SHARE do not go into share subdir From nobody Fri Jan 2 20:32: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 4djb3s6XTqz6MD2v for ; Fri, 02 Jan 2026 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djb3s5vsDz3mFN for ; Fri, 02 Jan 2026 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8V4l5Y1S1gQiiaXiLIedMyhkkrvHd/h+cyGbwDFkbfw=; b=sBwBODCIEvE8YOJqy5T12Ovx1F+6mK3A1kzHo+1bOPNBG+DML7LfOqTEKHHDuAYVleTRt3 gFayTDiUvFV3XSSKi4Ya1uPZoyJK2S4wq5CZ8od/wcZFF73dVP5Go0NJCuPtXSxOvuLxBQ Ij+QFiWmwTdVROu1qyyBMUia11ieG4yu1Jcpl4lPY7AdBuANW4dpraVlDvLMdE/2IX7lUC GpbVmdpaoJ5/HxAPLihH+1Md+WLonxxWvMS0J6SQjhJpYmcbGr5eYzFbQH0I5VvYaPW5id 2+Ph5c0N1KVkWOUjwwlBrEZXswQR8F97p9GXxCK8xWioRoJ8sbvz9s70NVz5aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8V4l5Y1S1gQiiaXiLIedMyhkkrvHd/h+cyGbwDFkbfw=; b=VPa7CHq+AuWpd3KOFnZ+1+KV1Ertzwm8w5W7NdadGPmqNorSKp5ksl8/8qvxemFEYo6a3r R6TyEk2MGxM0FMdrpvtJcBEXCDYHbj79mPpT/JtdPmjJEIkRldF5rV//jfLE2geIgbCCpG 0hTEa31XpcGVf7XC4McnhepBTujRf2cYCJNuju6Ch9dMCrljQWjkjt9KXm/H94Dm70zLq4 kJ0fiic4JZbRLh0LOyQJLI45l2VOsmNjyg4ZvJ3ExF5yZ/YhwDuj6k92j7nsehdc1HaDXd aUI/H8w7M5YrVWqNakTVORW94dFCUNvh/m3DwlnYgQwkA7kFBsQKKRByXHFUgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767385977; a=rsa-sha256; cv=none; b=xo8zUZMjPSDM/mB9bsR/h5VE32GSN3jG+ivooy1kZrq9M6b2pniO/FLZHp3yZV3j7Cl+Me Rvr+1XJhvkxYbmf+zMFMKcTRAMMMjMZUfbeIAbxqP5M7CjVM9vW2Oe8vaejujfYCBmEBNs vpPhpoWUMXIqpP+8TTpEr/qzoYsjLM0ryeKInkcefqJ4fUNjBCJ8Rdk+P6L8AXlz1hqoWA KMvlA/lueTvO8ZqDfXDu9yTvRfNM0o894CU6hR4xT6tibY8lKUitP5g9GeIuBuOmJ0Wvuh pGG7PyrTiiylHEnsPlpg3d4AXxf0aF1jZX6y0BoYjt9ktN6a+EDr6m2cZI2lSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djb3s5SHGzZjV for ; Fri, 02 Jan 2026 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8c34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:32:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 62a7fdc13ab4 - main - bsd.sys.mk: suppress another gcc warning for libc++ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62a7fdc13ab45b48977424ef77bbc0f11f601e39 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:32:57 +0000 Message-Id: <69582b79.8c34.5ec67205@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=62a7fdc13ab45b48977424ef77bbc0f11f601e39 commit 62a7fdc13ab45b48977424ef77bbc0f11f601e39 Author: Dimitry Andric AuthorDate: 2026-01-02 20:29:05 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:32:36 +0000 bsd.sys.mk: suppress another gcc warning for libc++ Similar to base 63d1c3c43690, suppress -Wc++20-extensions for gcc. Otherwise libc++ headers will lead to many -Werror warnings, due to our use of -Wsystem-headers, which is not officially supported upstream. MFC after: 3 days --- share/mk/bsd.sys.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index c5f2c2bb783f..2757033f39b3 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -244,7 +244,8 @@ CWARNFLAGS+= -Wno-error=overflow .if ${COMPILER_VERSION} >= 120100 # These warnings are raised by headers in libc++ so are disabled # globally for all C++ -CXXWARNFLAGS+= -Wno-literal-suffix \ +CXXWARNFLAGS+= -Wno-literal-suffix \ + -Wno-c++20-extensions \ -Wno-error=unknown-pragmas .endif From nobody Fri Jan 2 20:51: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 4djbTd2WX8z6MF8b for ; Fri, 02 Jan 2026 20:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTd0Sqcz3qCF for ; Fri, 02 Jan 2026 20:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jzxj3jW6+9hUQ9EmGwxloxk4FsmUt+ElQLS9+TIdHdw=; b=hYkg75fdbjQGRngLxEmsccmNVHxGELZ9OzfXgUezyO1Z9fh+GofgW/jBWKcJZXf4fNLes1 JDA+aLdZm8rWENym7MzL5jEpAHcSOA0b+ncRBFbecGgO2KOZ9pC0WRSIJTSsfBOnUAKkTh zjhZPnqXe52DNDB3fknGYdLZihfYmizoFhveGCuQqEIdbbk7+Li9p4NN3/ZsabFGWm5b4g hYmIeNqgmM9jMO3etVu17SdTFGlMu0oyUu2Q4W06dH3J0mkBEdvmrXjqmGLjJSDITsGkww SCXqsf6QN84tkYAIwMWm7AAjdNEghPRdCdFzcIohTcb4tYPCMAlO27ZmWJkLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jzxj3jW6+9hUQ9EmGwxloxk4FsmUt+ElQLS9+TIdHdw=; b=XpH9Zhu+EvpD2hoPPihJLlm7vUDelE1QfZpRCYUPHZROijlFfwaBORO6fH09FKQuw/lehb XG2gTPFXxgi2p7gNWPwVMPkwTaa/9hqDJdjFyr11xy7MzKc38F2u+B2xN7iolvkrOixm6u xKXLcvw5Pj0IhjgkO7a/sOEXnkihp3ygf3lWee+mni5LkJoZpJzDdGxOX3saBP4fSczX8K XAIqmx5/NsY4tWSZJn44Q8p5WKNrfbgCwbxarwyoaR6i0gE8Bm5vfNPNCMQWjMsdbrGQwW csD3YXFWmOmeSf87jEgSWsVjPjbLbDFJLULlzS4285Ei8F9erQX3KqoZHw3zlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387109; a=rsa-sha256; cv=none; b=VSgaUcSsGgBH0KhuPEyzd/YMvcjY/ElGnNU46GpQbN7OuHlQLrpBekZJF3AMeq8Ns7pYm/ YuxMUuGlbjoFnYPVchP5nMGxY7EP51c/BYG1/fdleIcDYbWdBdTeNeSB1F93BFCBENzrel 8e325PrBC646JRKEO2u58iQOryPj4rfAm/FVqlUlCqYbiwKhOQ0b6aiaCyaepUMKLbHON7 CNW2HQp5GEe2GE042s5bBZYEvPAufM1AR+5wD44jwRmEDCQitgH72e+oiU9eLtT2+d/Yjd i6HFVpezFdXhl317xS4wAtJbK/YHu2HjihqUj3wvZsjmF7c1GIv4L2PHctD6TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTc6zHyzZd2 for ; Fri, 02 Jan 2026 20:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b891 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b93a3312cd8c - stable/15 - sh: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b93a3312cd8cde4b6026170fd9d64e2e113f5253 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:48 +0000 Message-Id: <69582fe4.b891.6afc5c69@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b93a3312cd8cde4b6026170fd9d64e2e113f5253 commit b93a3312cd8cde4b6026170fd9d64e2e113f5253 Author: Dimitry Andric AuthorDate: 2025-12-25 20:13:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:38 +0000 sh: avoid warnings about too-long initializer strings Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid warnings from clang 21 similar to: bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; | ^~~~~~~~~~~~~~~~~~~~~ bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 153 | {"==", STREQ}, | ^~~~ MFC after: 3 days Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D54362 (cherry picked from commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802) --- bin/sh/options.h | 2 +- bin/test/test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sh/options.h b/bin/sh/options.h index a059e19707b1..2ce2e6ebedf2 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -74,7 +74,7 @@ extern char optval[NOPTS]; extern const char optletter[NSHORTOPTS]; #ifdef DEFINE_OPTIONS char optval[NOPTS]; -const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; +const char optletter[NSHORTOPTS] __nonstring = "efIimnsxvVECabupTPh"; static const unsigned char optname[] = "\007errexit" "\006noglob" diff --git a/bin/test/test.c b/bin/test/test.c index a35c5b424d3f..5ba5df5d7e44 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -116,7 +116,7 @@ enum token { #define TOKEN_TYPE(token) ((token) & 0xff00) static const struct t_op { - char op_text[2]; + char op_text[2] __nonstring; short op_num; } ops1[] = { {"=", STREQ}, From nobody Fri Jan 2 20:51: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 4djbTb04Q8z6MFFZ for ; Fri, 02 Jan 2026 20:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTZ64Bvz3phN for ; Fri, 02 Jan 2026 20:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0//RNn1W8+H3Qu/ZLLEWSPMYNWrY9JGQGqRKji28vQ=; b=Eee/Jf8uJXfNR5Phgmj83xWPla5eA6gzk8UKHyCaWIPORmUK+tCQiQkJGZekHZr13DMATg CxWTBtXXm1rceGbfgFQse1dddDlJRU0wFUxM7TpGU3cvnP1r3KA6fkkDo40flJO0G45lpQ RNOU8FrzRCM0p82qnPqKCOjQs0zCMOQ4uwN7zPxAigPf/CuaudGmGMJnNMFzDxRIJ3Jkk9 tQiri6so0odQBxBXA77RisFU61MC4fRINZrIXBMU8SrJeqwZGdDwKgA2xZWoV1BlzzcaI2 NzkK5X+7iFIM/RXnJ+2k4yJ59fySYmyvsQ4b1cobMgqwyvlxso3xVK+avs+Rwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0//RNn1W8+H3Qu/ZLLEWSPMYNWrY9JGQGqRKji28vQ=; b=FjES22VQzbY0GzhmWjMuU94LDnkuQXaGEA+m7ZXvWvhgvOdU3qIJUD0zChomzH8oz+Xf2k AGVoymuwqiwBUTNeC9iMXu7buhnV4PBXm0wAH76G5SJNg3sX0WK/P6mgix5hvXlDrpqP9+ QjSEzlrro924pskBYCBatV0ma0JzrWMQ/1NyVja8ZFakPcEKUP6hAidSncv+MEnrsag90U DxN1Vj0hyvcQOY1w2CKo+wsOoxpPVstGO+e9zPoX/bHcqV1xY177b/wsuQ3l7ho5xH6bi4 XwM7hZp6UPgJmA4x4+WVWsTxlVDwRWF8yZaXmMJlSPZM8yJwewoc7wofkvUHsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387106; a=rsa-sha256; cv=none; b=VIq9W5LEyFI6r3Z74ITIP26GshTn9N2CN5+vEk860i9yHRyUwFcfLjlKwCFlBBwmDhf5b9 yb7xcBk48TwQGlpiCl3Lh54hOIXlPv83sABxE6PcclAZHh7OynlvX/uc1o3KJaXgfN9ecf Gkdi3fXvM4ZPGb9EHvUXV/iJ001/ug8RycLI8G4b44aoHc6taVVAqnVw3q/BgfRqtBru+b vf97yveEAvuQY3MRPQojM15G7ohADMhxmnk/nGfK3xodRcEc0NB91+BE3gjvtVc+224mhL WpCZAXXTZihh4F0rds9Btkiwka1rdOgoEIfjiZKpmHDFv47FU1TgjRuOWSgqAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTZ5WrGzZqV for ; Fri, 02 Jan 2026 20:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a94f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ded12d66a3eb - stable/15 - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ded12d66a3ebdac657c24746f9b13d5d332f3cbd Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:46 +0000 Message-Id: <69582fe2.a94f.17da59ca@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ded12d66a3ebdac657c24746f9b13d5d332f3cbd commit ded12d66a3ebdac657c24746f9b13d5d332f3cbd Author: Dimitry Andric AuthorDate: 2025-06-18 10:06:25 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:18 +0000 src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, this also comes at the cost of some performance, since the dynamic libraries are quite large, and contain lots of long symbols (mangled C++ identifiers). Add a WITH_LLVM_LINK_STATIC_LIBRARIES build knob that can be used to go back to the previous behavior: libllvm, libclang and liblldb are built as internal static libraries, i.e. only available during buildworld, and fully linked into the various executables such as clang, lld, etc. PR: 287447 Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50956 (cherry picked from commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a) --- lib/clang/libclang/Makefile | 8 ++++---- lib/clang/liblldb/Makefile | 13 ++++++++++++- lib/clang/libllvm/Makefile | 9 ++++----- share/man/man5/src.conf.5 | 9 ++++++++- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 11 ++++++++--- tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES | 6 ++++++ usr.bin/clang/Makefile.inc | 2 +- usr.bin/clang/clang.prog.mk | 2 +- usr.bin/clang/lld/Makefile | 2 +- usr.bin/clang/lldb-server/Makefile | 5 +++++ usr.bin/clang/lldb/Makefile | 5 +++++ usr.bin/clang/llvm.prog.mk | 5 +++++ 13 files changed, 61 insertions(+), 17 deletions(-) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 7eb2c99b25c8..56f6fd374fe5 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,8 +1,8 @@ -.include +.include .include "../clang.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= clang INTERNALLIB= .else @@ -872,7 +872,7 @@ SRCS+= ${SRCS_ALL:O} LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index a3ff8e367864..aa9e90b2f6f2 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,10 +1,16 @@ -.include +.include .include "../lldb.pre.mk" +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library when explicitly requested. +LIB= lldb +INTERNALLIB= +.else PACKAGE= lldb SHLIB_CXX= lldb SHLIB_MAJOR= 19 PRIVATELIB= +.endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -753,8 +759,13 @@ SRCS+= Version/Version.cpp LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index a4e9c628d99e..05128550827a 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,8 +1,8 @@ -.include +.include .include "../llvm.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= llvm INTERNALLIB= .else @@ -14,6 +14,7 @@ PRIVATELIB= # Work around "relocation R_PPC_GOT16 out of range" errors PICFLAG= -fPIC .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB .endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -48,8 +49,6 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif -CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB - SRCDIR= llvm/lib # Explanation of different SRCS variants below: diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ba8b79b7c5bd..724f664e2a11 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd October 22, 2025 +.Dd December 21, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -995,6 +995,13 @@ Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. .It Va WITH_LLVM_FULL_DEBUGINFO Generate full debug information for LLVM libraries and tools, which uses more disk space and build resources, but allows for easier debugging. +.It Va WITH_LLVM_LINK_STATIC_LIBRARIES +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. .It Va WITHOUT_LLVM_TARGET_AARCH64 Do not build LLVM target support for AArch64. The diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 91ea9534fcd6..1167d7f7b812 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -212,6 +212,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_ASSERTIONS \ LLVM_FULL_DEBUGINFO \ + LLVM_LINK_STATIC_LIBRARIES \ OFED_EXTRA \ OPENLDAP \ PTHREADS_ASSERTIONS \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index df51f6955d2d..f91651fd235b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -892,12 +892,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no +.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif .if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3864,10 +3866,13 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif +.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +OLD_LIBS+=usr/lib/libprivatelldb.so.19 +.endif + .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/bin/lldb-server -OLD_LIBS+=usr/lib/libprivatelldb.so.19 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif diff --git a/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES new file mode 100644 index 000000000000..7860ee862b1d --- /dev/null +++ b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES @@ -0,0 +1,6 @@ +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 1e9998061cf6..7ce07e2eac1d 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,6 +1,6 @@ .include -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" MK_PIE:= no # Explicit libXXX.a references .endif diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 3baf3d0baf0f..e35425b0d280 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -18,7 +18,7 @@ LIBADD+= z LIBADD+= zstd .endif -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index cbad6f2b3fcd..588dc5a198fc 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -81,7 +81,7 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 5042fa1fdf04..da4d83445050 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -22,8 +22,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 452bfd23bfa2..880d4de1c8fc 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -15,8 +15,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index c369fe8d5944..00f319a246fb 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -14,8 +14,13 @@ LIBPRIV= LIBEXT= a .else LIBDEPS+= llvm +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif LIBADD+= z LIBADD+= zstd .endif From nobody Fri Jan 2 20:51: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 4djbTc3YMfz6MFCC for ; Fri, 02 Jan 2026 20:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTb6lDCz3qCC for ; Fri, 02 Jan 2026 20:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egSu/i6K4w3B3h5V7QhObzq6TnV1OPe7T24w5l+peio=; b=VWMKHfM/Bq1mrf+nT1uGr0eDfgW36nMmOf2+ttOpJPUPPUhTGohOi3BrAyod8mQAsc/1/1 qWrQbad7nPyO/d5I21dI4/HKtoX4feIDuWJGt6IGjns13w72ReRBsCAc8EUrxYbTr92w7l 8AWJe/was7ut2dB71pZYa9RWhI6TKKDkuAWD4ZdYnTqcKb+tV6O/yqzjjCSAh9iTh0WmLm 7U9FnITCmYsPu0v+IV+3wSvuc5lMBggv4FEQzHd/BbTw7cxmIwueWvJvBYibfxkcBlgYBW Zd0zmpUAWKiEI3H0Xu7kZXIHb4lZrFzjYsRjL50Zpbu2h357golMX5kV8hBi6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egSu/i6K4w3B3h5V7QhObzq6TnV1OPe7T24w5l+peio=; b=cElwW91iJ4T2mXO+YV3gR22rq1EMP0bCNoWpMJndNfMG123V3lsJ+SYWdbdacYrW55vRdc 0NMnr6dd0/fCbMu6gRccYCH4QU2fUIPTuxduhG2AhrDgmahBRPFYa4AzFnxfZPGGRBuv4Q 8Rp1+q8GC5VC2N7ZslE2dTEOIZSCy78n226SzA4Q81vWO6pukyLo2uRPkgjkAWzKEHoX42 aiZgCWA8naRMGjaLBc0pevg4liaEA0Dnu2UDqXHSkyt8KfiP9PQ6Qt/33cKt1xN/0AYbJe 8CN8lE6TW0fz3R3KDSsuRmDwNJT+L+L5i74zVJcUzoPLhXQTOwSgh9KUEtNS6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387108; a=rsa-sha256; cv=none; b=WF7Hmp8amKWDhp1IlbR2fsdIgObaXmgo8lZQi0F3LN9oQ+COHyrNx1p25fNE7aoFFOSfB/ ejtddR0zmfhMNyEGi5q4ktaEG7nNEP+/kKR2tVfZRRO8sPzHvULcRUiDyS+4m8HfzPqXqz 2voXBLzZ/WivEOyNnXzsQyRNqiDTm+EsQl3pB5Vki6aPXKBSr7AeGwTOajjthM3cY79+M1 U8YLcqq9JW6l2xfmc+GFA9Nokq0eQdqOI9tTC2eRNnpLnisgSB4SbgbyarDguqftfzi31E iNKTjH5RianMzjnjxzNadQSLb1Ot1lAs3RWT2lTPNFsybXQNVkw77gUlZZGx1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTb6GzpzbDZ for ; Fri, 02 Jan 2026 20:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a2e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7c6a0ba19de4 - stable/15 - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c6a0ba19de410b54c3e853c692d3df0d8636538 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:47 +0000 Message-Id: <69582fe3.a2e1.60c5eede@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7c6a0ba19de410b54c3e853c692d3df0d8636538 commit 7c6a0ba19de410b54c3e853c692d3df0d8636538 Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:31 +0000 OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 160077a4d75186a979f28f0778259c66d8cac8be) --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f91651fd235b..d7131d01ef37 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -892,14 +892,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3866,7 +3866,7 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif -.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if ${MK_LLDB} == no || ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatelldb.so.19 .endif From nobody Fri Jan 2 20:51: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 4djbTf43lRz6MFdG for ; Fri, 02 Jan 2026 20:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTf17twz3pxc for ; Fri, 02 Jan 2026 20:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JNh549ephSVaEzj0tWE5jwLj7AYYjcD4jahlH3CF1sc=; b=NgmvUQVoByDRmRVaZ+gKw8opWxav55xu7YzQUEK+xxD+nymafOk4EhoS7Xvomyp50wF+S8 cBgSyiZkM6i6rOZGs2mgnRnBL03mJphEzfdq2PWs6/B7QS+3NpjAopBN3QvqtVIfy1kVWD x+3RRj2emPrLdIB828odWbg5JXPWgV0VR2DJWMOFwqI5tAn/SnQJWdTGCtdZnjmi0NWZKh 6nFAsMJb570u1qtKOeEH1pkh4+gKtppKnO2O7i3qLXHYtqwOYSOVY8MvbPW54l5SK2S/Wa x2+vM1YSHIsNPMTCsGBnAuPEHPbDHer7ETHDFUHEQ03Rbm7005CR6qbccUIl0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JNh549ephSVaEzj0tWE5jwLj7AYYjcD4jahlH3CF1sc=; b=Fz/zHqpF0qTS7beaTltA5EQpZ585t+Kwn4xbn0AUsEfnzNESL/jChjhroQntq+PHRRfejg T6bgoekAK99cqOmjSW3IY5An45PtHFAbtaWbVHCnh+6U4hQwA0IRpQ6c8cH1XeMy8+k2ie d4eXUzBmQUgYFpaA5W5Q9fmyK0F5T8T+ooGVyV/bfxlfVIj9PJWfmlu9QXXZ9nkQkdTGaq LZI7KBTRNDou8NN4mRLdtLsxw+NnMw/eEzqG/1yrfAlWohWKaiGxXAxSDEu9x4c1wiVf5U cDdWnRoc9qQ1RUrRg78TukMlDulMhX0AfKDMHa4cNH6mffEHCKT4hoLvvsLSrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387110; a=rsa-sha256; cv=none; b=bzqi1DSsPiK8jTQmywn2Kd02rHaQSvVEUxudWEbwyjLau7233w5NQdBc27xbgFPvqdSw5u YVZIvpxa1orR5VE7DpJt9X15iajudOLklo0dhGYWWZbZur8SL9Way75IrZLxxAca4JkeE+ K5IWvRkvV3OhjEpn8nU5CYLAS5magUbG+ATyGimlbKFB+BVOtAFYvZLF7BtmenlOr57EAm Q4rmphi0s67tjMvArU1GKtzaSDjfluvmeqrKskRjaV3ZQeM7ZHp7gTd086UvMEIwXfSbH+ 7vlK+QaRxzIVFn/HcxXqZru5TN2cQVlZHRiDgM4Xnv5Niai60b5kycYAU297dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTf0df4zZTc for ; Fri, 02 Jan 2026 20:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 219872681feb - stable/15 - bsd.sys.mk: suppress some new clang 21 warnings for 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 219872681febf00661ce99e1cc38332dbdc5c422 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:50 +0000 Message-Id: <69582fe6.9b65.75fd8f25@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=219872681febf00661ce99e1cc38332dbdc5c422 commit 219872681febf00661ce99e1cc38332dbdc5c422 Author: Dimitry Andric AuthorDate: 2025-12-25 18:44:34 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:46 +0000 bsd.sys.mk: suppress some new clang 21 warnings for C++ Otherwise, these lead to many -Werror warnings in libc++ headers, due to our use of -Wsystem-headers, which is not officially supported upstream: Suppress -Wc++20-extensions, due to: /usr/include/c++/v1/__algorithm/simd_utils.h:96:50: error: explicit template parameter list for lambdas is a C++20 extension [-Werror,-Wc++20-extensions] 96 | inline constexpr size_t __simd_vector_size_v = []() -> size_t { | ^ Suppress -Wc++23-lambda-attributes, due to: /usr/include/c++/v1/__format/format_functions.h:462:32: error: an attribute specifier sequence in this position is a C++23 extension [-Werror,-Wc++23-lambda-attributes] 462 | if (bool __is_identity = [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated | ^ Suppress -Wnullability-completeness, due to: /usr/include/c++/v1/string:1068:80: error: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Werror,-Wnullability-completeness] 1068 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n) { | ^ MFC after: 3 days (cherry picked from commit 63d1c3c43690ff3c3e76e1fb03c8640fe30a2663) --- share/mk/bsd.sys.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 2134886abcf5..50eb04b9fd15 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -93,6 +93,11 @@ CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter # Similar to gcc >= 8.1 -Wno-error=cast-function-type below CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000 +CXXWARNFLAGS.clang+= -Wno-c++20-extensions +CXXWARNFLAGS.clang+= -Wno-c++23-lambda-attributes +CXXWARNFLAGS.clang+= -Wno-nullability-completeness +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Fri Jan 2 20:51: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 4djbTg4vcXz6MFCW for ; Fri, 02 Jan 2026 20:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTg3CMtz3qHf for ; Fri, 02 Jan 2026 20:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387111; 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=PQVGD2/oXL4jwmC1yuBlxXE5OodTxLJuSv41YuisEL0=; b=MgcqAL6KN+/Gi/RdZU6G2cyCAY64T9DIGGmNrU8qQ+OvbD3bu2Ey133+jXY9zVTYQlKQ0s 054zJE895+GvwoOXryMiN1JP1EvwE5SAz5uksx43S3rN/aNBHKtk8tryZMQGWiJTEVhln4 fFzqwhl9ApXqaooUO+26GvJH1/o3d9tJtwLntLWos3BUJEbBa16NALf1IbhWfWFEqpNSFW VFxb6Ej4IgTuodhAn1/ZJja0KEFRKQR9v8rDyLP8jTpsee+Y/tp31bBLB2gd6HAl4EUaVQ SAZH+H6p6x+a84LBAj1KzfluczCdDdkV1A1q5ZGlzSAo+7XtosrZVmUhSrj8vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387111; 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=PQVGD2/oXL4jwmC1yuBlxXE5OodTxLJuSv41YuisEL0=; b=J1ZBVzzBe+/AiWFopAX67mmPfD6fLh8TRLmEXQpArGgbiqw2dx+nlrSyc0UuBtnwyPymqY N4jQz24Fw784ZIdbGGeGNkgrcAavazyoZ5k9lG3YXWALvyiz7on6MRLQi8dZXqTwKMwaiv 28xBBFWgXws2Tf4nD85m9nQU0JCqLwrJHtVetGHJCNU2hfvVzawUmYakgV4W95+YVYSvvG oXG27yyjwWGRKctxzaVtxEs7t2pzkDqW6a08oSVfKy9lPVgI2TeYdIoc4AC9Gp9ZP+5pvG gJZy153tSibKI2AFbFUzO4ljw7V6r9mfojX9COKPiPPWnbBxgNhKUkqgvS5bNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387111; a=rsa-sha256; cv=none; b=Iai1SpRZ30Yi0fPfBJs5Wg8KQ4454zBtR0hC+lojdBtQ5vjI6FpLwZ5cUPHB7fPpV9o1LJ buHgSscZIlmL2QqHMRTKRFOkISiCJq3DTdta6YLU5ZpSxO88qWw4J22bnEXtL+BbXYbDsk ov7UV80+qFT44lwZYP/E7WmEup2wgamwhhzcB+17werv84YZtJv15ZmLyqWnCSmw7T8dQ+ wyQLfDQCovP49fdYeTkDA5remh2qMV/jW3yjTCoebxrvU56J62WkaELwRFYU2a0er9Y1lX t/tIfRsqMgUQpbrGw+ocqyVE0fKBZ60a5rpa0Ust+N+CQkYGsETxoq8P7+hW+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTg1lXczZd6 for ; Fri, 02 Jan 2026 20:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Dimitry Andric Subject: git: 7d0243317f3a - stable/15 - compat: linux: use appropriate variables for copying out old timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d0243317f3a6ccddc9b71fd3ea96e877a043ec8 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:51 +0000 Message-Id: <69582fe7.bd11.efa1ab6@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0243317f3a6ccddc9b71fd3ea96e877a043ec8 commit 7d0243317f3a6ccddc9b71fd3ea96e877a043ec8 Author: Kyle Evans AuthorDate: 2025-12-28 22:02:04 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:53 +0000 compat: linux: use appropriate variables for copying out old timers We copyout &l_oval but do the conversions into &l_val, leaving us with stack garbage. A build with an LLVM21 cross-toolchain seems to catch this. Reported by: Florian Limberger Reviewed by: markj Fixes: a1fd2911ddb06 ("linux(4): Implement timer_settime64 syscall.") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52985 (cherry picked from commit 541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c) --- sys/compat/linux/linux_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index ed9133359302..230be9572b85 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -131,7 +131,7 @@ linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec(&l_val, &val); + error = native_to_linux_itimerspec(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } @@ -158,7 +158,7 @@ linux_timer_settime64(struct thread *td, struct linux_timer_settime64_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec64(&l_val, &val); + error = native_to_linux_itimerspec64(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } From nobody Fri Jan 2 20:51: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 4djbTh64MWz6MFgZ for ; Fri, 02 Jan 2026 20:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTh2kcCz3qHn for ; Fri, 02 Jan 2026 20:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ppJmqGAk+SRaSxIDfR7i3Ecs5LtZXtTWHOY/qh/zKs=; b=C8fNFH+q8MhYy3AtiFprlSW0FlGL/esWPsUrm21HEtWCzm+jOpIum9KeYHewbffPZFUqdY H/l0P2ozq5K0Xf/Y6O+1/h8ru1qRpGrwFZt42Izsc0vPeHBiucWxrUDxx4J/jSSFAT3zpW twN7CTKSXMtWybCj7Uo4CHGQ8LYootKISYBJUvs83Zpj1nTrp2GNzmOR0StTkLaUPaCE/1 Z7Y3eg6Izywda1bilysx4Axuqb7XkdAj+XOY9n3m1p+2fsT3lg6YjudVRk3PUzpTb1aQZk 5SezqotN32B8BHjQU/zC8VH/m3oYAgvwKq8L9qJg4wt7KF9y6ccJ3D6XQDhOeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ppJmqGAk+SRaSxIDfR7i3Ecs5LtZXtTWHOY/qh/zKs=; b=Di93qSATGAFlkV7lrraCLl1P3oKR4MOcepu358qcVe+sqQWE0ugrenyXHKYufVbYEjYIky HOgTrCscOxC2DnrsZSuXsZu+cs6FmzzA6IZ4ya0Ee1R30jU4pKP9QaLVLfUBFcE2tpYkUJ MAcyDcZrdoqYcQ9g2yK2NBcxbPiZJ+0y3vgOFWriWQbFBW+8dvD7iPHCo08lARvbKvCUBL a+k+DaBLYwDY4A6EaGjxMPu0CR307ybZMXIfWUAubtDfpI1UUqDPGsNaT3XXnUJPKKeRc6 9J0M6FMGIR9AV9gQMYjIl4Q51ocO04XpdAvQd+wHr+GjBDa3OFoblDGczhFpxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387112; a=rsa-sha256; cv=none; b=nf3u9cLd2/qBGwBn1Tur1p2N1+Hk62+AfHrDuLB+38T5mt976hfZx8CsiGOJxmqp4hPpOQ 9SMa9OQZHk9oSfbmV2Wt51/7TZfPMFYcBJ74TuMqDly1HudN2RsHtO4zHGod0pAGLl2HpX UL+jXygRgq8sJyLMr6aRObtc35H5JzpKRTNuDW2M6bsZHg4LIBUpdYZHNwABlPHnMFMuRU CBIMfFKN59/y0sG950q0kERAkktmtvMseeLdlAiXT41QVZmGhl82UKRlWsrOFjsjLwtht7 amLGnkAbomcCSVr4683kZtwefYANOxf/sWtvYIA1gusbCOCve1DXOKJyh5888w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTh2BNHzZXC for ; Fri, 02 Jan 2026 20:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b6a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: bc1740839883 - stable/15 - ncurses: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bc1740839883c36a05589e87b4cff42434bb1d7d Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:52 +0000 Message-Id: <69582fe8.b6a1.41f53fc0@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bc1740839883c36a05589e87b4cff42434bb1d7d commit bc1740839883c36a05589e87b4cff42434bb1d7d Author: Dimitry Andric AuthorDate: 2025-12-30 12:48:07 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:41:29 +0000 ncurses: avoid warnings about too-long initializer strings Increase the size of `assoc::from` to 8 bytes, to avoid warnings from clang 21 similar to: contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 702 | DATA("\033[2J", "ED2"), /* clear page */ | ^~~~~~~~~ contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 716 | DATA("\033[!p", "DECSTR"), /* soft reset */ | ^~~~~~~~~ Reviewed by: markj Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54371 (cherry picked from commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083) --- contrib/ncurses/progs/infocmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index 7932203ac2b1..f61633cfad80 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -687,7 +687,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; From nobody Fri Jan 2 20:51: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 4djbTk1BL2z6MFKd for ; Fri, 02 Jan 2026 20:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTj42zSz3q1p for ; Fri, 02 Jan 2026 20:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HnlqAUjMEHUQR1fI4F6V+LWh1Lez3FT+9gTCGV23uUM=; b=QiLjMY7UBsBNmfUtuoUnQMboDPcXVqBu7nJil9wvtviF6IzI8UpaCXhxg7ttp7P9yiOv0E aJ5p7JY9dk9HeqFG02OciS55qIXzwogI9dvhLpnYJIS72AcOowJUTZrBk2T1hFvuTAtvWr 4ehFQ+HDJ2UY3IA+20IOHcwhg1wZL7t06SP8y7g/Yq/+iMX01aFhgFNs2O5MNfc60z+6UP HennELDLx6GhE1H2EDIud7tfB7M+UCpKTRSor8ZEZyM3PyxdRP9u9oYI9xpkG3N/ddVHmb RYcKt0BVLAJBqGcVyjmmXqNP0V4S98qL4PuQdONC6fxpxp31yQ03JRKWK+hs3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HnlqAUjMEHUQR1fI4F6V+LWh1Lez3FT+9gTCGV23uUM=; b=tFQnR8DVLhtK1WnpEelWkLgxLcGx9f7AJ1RjtfizueqfTty1Y6B2hJz05MK4CHHSI1qJzK QYsxweNUVQmRi5oJT1Xybc2egpv7gA0ELhKlf6vJy/w1oKAjl7IH3GfG2LCIeNPlMKHc9B F7gB60RYDkrp9hwt0t7r/KLNVqGXngkKGRmhxAVdOmbaE1qAuRFBijfd7HlSU2GVxGYmhl oPHnLSHY23LD4Baw+XbCwlx53NywA2qR3hTcD0gtLsDsHMcbs1ygwnwBagHmOFSbSaR0kb v+t7F8LydhlCqdBINI+9V8lbH3fQ4psCulbyYJ37i6g5vkQm5b2Pyi92+ah8gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387113; a=rsa-sha256; cv=none; b=VuGRqXX/knBvhdoJoV5nHNC1q/6uqOPmQslyeg8O2ckVGGuiMGob4Yt7RG3yTYj66TcOIk 7IOZzlCned7KbF+EPxgjpS+qQeCLLzVHOZ99wNQ5CtBjSOVMgbr3LoJKJG8QhELm0vz5Cl holXKq5fhiofm3DYJZqaAWGxtXP4J/gqY+wBjhjBUC7J5tQxndhciJI7DkrS4gzMnyplNd AM0jgvi4EE1nbX2NPCTwi1jJB4rzt2yo1WGuCxXJ+cug+bGY5lf4ZZgJAis4ZlkbYscr/k 3dVKup2tnloSH5p/lCr9MVPYYjEmAoARK1UZk//D9tYqC1yteNzBqPjnKNd4Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTj30SVzZTd for ; Fri, 02 Jan 2026 20:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b627 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c17271f92431 - stable/15 - crypto: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c17271f9243159079f6f54fbf13a025e979ee79c Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:53 +0000 Message-Id: <69582fe9.b627.6847bd90@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c17271f9243159079f6f54fbf13a025e979ee79c commit c17271f9243159079f6f54fbf13a025e979ee79c Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:41:35 +0000 crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 (cherry picked from commit 710ec409dffed3306ced253bba85dbdc7758510b) --- sys/crypto/chacha20/chacha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c index 52f7e18c651c..b5f51bd10cc9 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -50,8 +50,8 @@ typedef struct chacha_ctx chacha_ctx; a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); -static const char sigma[16] = "expand 32-byte k"; -static const char tau[16] = "expand 16-byte k"; +static const char sigma[16] __nonstring = "expand 32-byte k"; +static const char tau[16] __nonstring = "expand 16-byte k"; LOCAL void chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) From nobody Fri Jan 2 20:51: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 4djbTk58N8z6MFgc for ; Fri, 02 Jan 2026 20:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTk40psz3pyS for ; Fri, 02 Jan 2026 20:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQNiZBUBQq2PH43ZCZ5xlhpEi67viKcECzpAZdQVgg8=; b=QU8MBu9l1nlVetuP2FmnohHIGJjWrkJbQom6CFxhH0EoRNvwFJ4tGU1ohn6dYnMPRLKD+d LtxfZHvnXa6NAH1TNH0NrKv5Z6qyLrVeb2/G2Xiz50Bh0OXF9bghl/w8cylWjU2Tnc3hwU 9xSykqkzqB58GgfoT5ymO/DJR8W2XGuuR3oXEnwbf3mqAiYn9bA5XD+dDACD6Yf5Evs+UK 18DuI6bYIlkpDe9gqWx3CJyEWXuAkrHIgCKEWobKq2NOObuhGnCGp4cBApeYmxJRkfkl87 Z7Qlr4P3OvNM/qXy53fIqgfqM/+xWs8dtyESdyidX2f2nCHKUWJaQeLI4AR8zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQNiZBUBQq2PH43ZCZ5xlhpEi67viKcECzpAZdQVgg8=; b=fzVOS4cAkALElDT6NCljbB17oMUpo4Y6Hro/MVXWbB+Avc1qYQgGSawDFNWEUjdwkZN0I8 6F8ZFKsckUpt/x7j5wN2kChEs001WxGVaHXu3TepIRnCCj6QNidSSC/PlF8aPtuKlRwfdX zk15r8RHVpnRXrpEUfRySviBm5wPvWF/o1Wn2GE3EB5h9hMENDp+3hIyRjN3tNZ7l6Pahc uZEgvPAtcXV+M1F5Jtz0tmhUDiDmqc8NRk7PvLkc5xPgVhVaBRMMX0DHaiXNT/c1N7KvGj tp7dZZoJBdLAl+E3muWmIEtlNLlM4bgKetUAjG7LC2uQUy9n90PYnVNUNyOQtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387114; a=rsa-sha256; cv=none; b=HiiwK6ddah9vh1wOWb8/wcbzfEMdVMpvE2gGjxxP+nCAWtPTFZjUp6hSxClL9bV7uk5yCg s3KhFYcu9NjEn95mFBwbDKrv8tdTY/2GvloidYTRTwFlTBqzJK0FrURb6TkX8ykOYhaC7w Fb2ipH8qsDHM2ucAh1FI1sO5rw2vT7ub9WPFSmz1VB2DSr6j271jcotlfB8NSTlZq1eMp3 U/YO6dhTiNWIpCDw2F4s5BuChZXXYxaLsN8+IQFHHKec6GrVANhmqpJJzeIP7xnzukc2+2 LUVhuBoRSo7SeIsovBUzyqZkXMroRPSa+44NaAtmln2+eHlTgY5uAu+pKQLkVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTk3PCJzZqZ for ; Fri, 02 Jan 2026 20:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b96e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9c0bedbb2064 - stable/15 - zfs: rename several printf attribute declarations to __printf__ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c0bedbb2064e9e02e2c20d1aa909360924033d7 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:54 +0000 Message-Id: <69582fea.b96e.2a316b69@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9c0bedbb2064e9e02e2c20d1aa909360924033d7 commit 9c0bedbb2064e9e02e2c20d1aa909360924033d7 Author: Dimitry Andric AuthorDate: 2025-12-30 12:50:24 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:41:41 +0000 zfs: rename several printf attribute declarations to __printf__ For kernel builds, we redefine `__printf__` to `__freebsd_kprintf__`, to support FreeBSD kernel printf(9) extensions with clang. In OpenZFS various printf related functions are declared with __attribute__((format(printf, X, Y))), so these won't work with the above redefinition. With clang 21 and higher, this leads to errors similar to: sys/contrib/openzfs/module/zfs/spa_misc.c:414:38: error: passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat] 414 | (void) vsnprintf(buf, sizeof (buf), fmt, adx); | ^ Since attribute names can always be spelled with leading and trailing double underscores, rename these instances. Note that in FreeBSD proper we usually use `__printflike` from , but that does not apply to OpenZFS. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54388 (cherry picked from commit bcd9ea853b14c85a61eb9079c59e966eed336578) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h | 16 ++++++++-------- sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h | 4 ++-- sys/contrib/openzfs/include/sys/spa.h | 4 ++-- sys/contrib/openzfs/include/sys/vdev.h | 2 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h index 93dd1196d977..fa55b3917669 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h @@ -52,28 +52,28 @@ extern "C" { #ifndef _ASM extern void cmn_err(int, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vzcmn_err(zoneid_t, int, const char *, __va_list) - __attribute__((format(printf, 3, 0))); + __attribute__((format(__printf__, 3, 0))); extern void vcmn_err(int, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zcmn_err(zoneid_t, int, const char *, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(__printf__, 3, 4))); extern void vzprintf(zoneid_t, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zprintf(zoneid_t, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vuprintf(const char *, __va_list) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2), __noreturn__)); + __attribute__((format(__printf__, 1, 2), __noreturn__)); #define cmn_err_once(ce, ...) \ do { \ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h index a9619d7d0219..4ae96c91a5f3 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h @@ -55,9 +55,9 @@ MALLOC_DECLARE(M_SOLARIS); typedef struct vmem vmem_t; extern char *kmem_asprintf(const char *, ...) - __attribute__((format(printf, 1, 2))); + __attribute__((format(__printf__, 1, 2))); extern char *kmem_vasprintf(const char *fmt, va_list ap) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern int kmem_scnprintf(char *restrict str, size_t size, const char *restrict fmt, ...); diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 2a4cc60c4aa8..db30b5a066de 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -1127,9 +1127,9 @@ extern void spa_set_allocator(spa_t *spa, const char *allocator); /* Miscellaneous support routines */ extern void spa_load_failed(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_load_note(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_activate_mos_feature(spa_t *spa, const char *feature, dmu_tx_t *tx); extern void spa_deactivate_mos_feature(spa_t *spa, const char *feature); diff --git a/sys/contrib/openzfs/include/sys/vdev.h b/sys/contrib/openzfs/include/sys/vdev.h index 510474d6c085..86f2235f03ac 100644 --- a/sys/contrib/openzfs/include/sys/vdev.h +++ b/sys/contrib/openzfs/include/sys/vdev.h @@ -54,7 +54,7 @@ extern int zfs_nocacheflush; typedef boolean_t vdev_open_children_func_t(vdev_t *vd); extern void vdev_dbgmsg(vdev_t *vd, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vdev_dbgmsg_print_tree(vdev_t *, int); extern int vdev_open(vdev_t *); extern void vdev_open_children(vdev_t *); diff --git a/sys/contrib/openzfs/include/sys/zfs_debug.h b/sys/contrib/openzfs/include/sys/zfs_debug.h index 4d4cd4c39e97..87fafec0c9e7 100644 --- a/sys/contrib/openzfs/include/sys/zfs_debug.h +++ b/sys/contrib/openzfs/include/sys/zfs_debug.h @@ -67,7 +67,7 @@ extern int zfs_dbgmsg_enable; extern void __set_error(const char *file, const char *func, int line, int err); extern void __zfs_dbgmsg(char *buf); extern void __dprintf(boolean_t dprint, const char *file, const char *func, - int line, const char *fmt, ...) __attribute__((format(printf, 5, 6))); + int line, const char *fmt, ...) __attribute__((format(__printf__, 5, 6))); /* * Some general principles for using zfs_dbgmsg(): From nobody Fri Jan 2 20:52: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 4djbTy3k92z6MFTS for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTy2QyDz3qY9 for ; Fri, 02 Jan 2026 20:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dsf0/OS9SonrxvsUDYBYrX6OOgCjIxmJHQRZyDVlGHg=; b=ii2DS0WecPUQ/2IDVTOM2n4wnlHL2bAuimhmsxz/2kJsA8hdGzAgalA8r2qZUzHYpC5phz yCHfnl0YrdFK2VfE22Hjv+Gm3b5gOXrlQRi0/9pR0rKmFcQjgmz1PCTfzLaxx4B2367+U6 Pa3JixVhOt01D9YDlSuzQ9FVIVHzQsyb9z4zWk7wQZ80QKBgDN8gSm7upFtMFn0nMd4wHq S0+yBSVAL1zp7KAr1l+OgTHU2Jr3xjtzjAtKRlDfHtm8YRqfsovNiDDyFIJ5eilffm018a SpHrhQrXWVELheEbLDLIFGFVY0yMfGDlJUcnNfNQOKrr0rXz4sdUjcIPfs/ZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dsf0/OS9SonrxvsUDYBYrX6OOgCjIxmJHQRZyDVlGHg=; b=NDLfWENcbQfZeI4XQGe9ZFrjvpJKMeoITjIokg5RBh9rX6Y+B6uNAlrLv7kXNeFQmB1npy WhEMlOCIjmK821R52rbPcJUyM4x8/MDHB8dvO+x3uGIbYlmWDYBMACtlhjEax4Jn/N6mG9 tvRnRtKctJBTd4UcCXISbz1MQ77wQcpre1wWNVk/PN70rNh1hyAz0y/4bKVQwTAhCHAAbG X1Si9ykP8nOOhB1stxH+h56HwHil3Z0mlnb0bFU5GGZhfXEMhPO+8NEX3nWfzI99pwgy4c GzMuVw5m+VmHpJxkDp9svV8Dk5C9pao25FxWczawnSbJnBzX40DgcWMyz8UhNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387126; a=rsa-sha256; cv=none; b=TQOUFKRfU1bduFgfEmp9v08CZvr3LhkKWCq5kAIosrpi0nDu9e7CISIyU5/jt38Y6xxMfT 4+IMcGMICIVPg66h4nf08Isrrs4eRrwMTihtBgz6Ss4xGfFMCTFtYhSdvtG3LasTljGuA0 K9mDKiIVidVp1Jbn0JMFMNRZuVxxlkm49hhahzbAaNTkC6GO4q41Zy/hJXoZm5pMlRsDnE 3ZJ9YudsD47fowfZtx0fVQE8b1C7KjdqfoTVIecePoPJUdzu2IixNLIioeTrZl9RmHgtQT syGe+ev6Tx4/xNF2jfew+MQKSE8VRTJT8tEFzjea8bs3/eWKWo0XFiuCyn3/Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTy1gmmzbHF for ; Fri, 02 Jan 2026 20:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a075 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 908ca4f6af8a - stable/14 - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 908ca4f6af8a95d6c6ae65caed4371f96afb6409 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:06 +0000 Message-Id: <69582ff6.a075.491e9700@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=908ca4f6af8a95d6c6ae65caed4371f96afb6409 commit 908ca4f6af8a95d6c6ae65caed4371f96afb6409 Author: Dimitry Andric AuthorDate: 2025-06-18 10:06:25 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:10 +0000 src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, this also comes at the cost of some performance, since the dynamic libraries are quite large, and contain lots of long symbols (mangled C++ identifiers). Add a WITH_LLVM_LINK_STATIC_LIBRARIES build knob that can be used to go back to the previous behavior: libllvm, libclang and liblldb are built as internal static libraries, i.e. only available during buildworld, and fully linked into the various executables such as clang, lld, etc. PR: 287447 Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50956 (cherry picked from commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a) --- lib/clang/libclang/Makefile | 9 ++++----- lib/clang/liblldb/Makefile | 14 ++++++++++++-- lib/clang/libllvm/Makefile | 10 ++++------ share/man/man5/src.conf.5 | 9 ++++++++- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 11 ++++++++--- tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES | 6 ++++++ usr.bin/clang/Makefile.inc | 2 +- usr.bin/clang/clang.prog.mk | 2 +- usr.bin/clang/lld/Makefile | 2 +- usr.bin/clang/lldb-server/Makefile | 5 +++++ usr.bin/clang/lldb/Makefile | 5 +++++ usr.bin/clang/llvm.prog.mk | 5 +++++ 13 files changed, 61 insertions(+), 20 deletions(-) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 9b9e0cbadcd7..56f6fd374fe5 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,9 +1,8 @@ - -.include +.include .include "../clang.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= clang INTERNALLIB= .else @@ -873,7 +872,7 @@ SRCS+= ${SRCS_ALL:O} LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 408ebc440686..aa9e90b2f6f2 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,11 +1,16 @@ - -.include +.include .include "../lldb.pre.mk" +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library when explicitly requested. +LIB= lldb +INTERNALLIB= +.else PACKAGE= lldb SHLIB_CXX= lldb SHLIB_MAJOR= 19 PRIVATELIB= +.endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -754,8 +759,13 @@ SRCS+= Version/Version.cpp LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 835da5545e81..05128550827a 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,9 +1,8 @@ - -.include +.include .include "../llvm.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= llvm INTERNALLIB= .else @@ -15,6 +14,7 @@ PRIVATELIB= # Work around "relocation R_PPC_GOT16 out of range" errors PICFLAG= -fPIC .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB .endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -49,8 +49,6 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif -CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB - SRCDIR= llvm/lib # Explanation of different SRCS variants below: diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index f7e523ea70bb..ad1ba48ffbab 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd October 22, 2025 +.Dd December 21, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -971,6 +971,13 @@ Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. .It Va WITH_LLVM_FULL_DEBUGINFO Generate full debug information for LLVM libraries and tools, which uses more disk space and build resources, but allows for easier debugging. +.It Va WITH_LLVM_LINK_STATIC_LIBRARIES +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. .It Va WITHOUT_LLVM_TARGET_AARCH64 Do not build LLVM target support for AArch64. The diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0c8eb737fa05..6395efc7469f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -213,6 +213,7 @@ __DEFAULT_NO_OPTIONS = \ LLVM_ASSERTIONS \ LLVM_BINUTILS \ LLVM_FULL_DEBUGINFO \ + LLVM_LINK_STATIC_LIBRARIES \ OFED_EXTRA \ OPENLDAP \ RPCBIND_WARMSTART_SUPPORT \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 42514dc61b8c..1fed797b8f24 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -877,12 +877,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no +.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif .if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3704,10 +3706,13 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif +.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +OLD_LIBS+=usr/lib/libprivatelldb.so.19 +.endif + .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/bin/lldb-server -OLD_LIBS+=usr/lib/libprivatelldb.so.19 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif diff --git a/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES new file mode 100644 index 000000000000..7860ee862b1d --- /dev/null +++ b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES @@ -0,0 +1,6 @@ +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 68e749ef131d..169958a9ea32 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,7 +1,7 @@ .include -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" MK_PIE:= no # Explicit libXXX.a references .endif diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 36c601bcbe36..cf4e5e0ce47a 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -18,7 +18,7 @@ LIBADD+= z LIBADD+= zstd .endif -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 6403835b10b6..240061610a58 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -82,7 +82,7 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index e51923545956..b6df20a07d74 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -23,8 +23,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index b7668c03e6e5..bab8e332a152 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -16,8 +16,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index f702082e31bd..bded98007542 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -14,8 +14,13 @@ LIBPRIV= LIBEXT= a .else LIBDEPS+= llvm +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif LIBADD+= z LIBADD+= zstd .endif From nobody Fri Jan 2 20:52: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 4djbV06Tvhz6MFhw for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbV03dRbz3qbh for ; Fri, 02 Jan 2026 20:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgDf4wLDSkkE75NAMmLgaN70i2hMWQ6zYw1RSxnNsxc=; b=H3vs9mprZSegKiaswWDwnelkROjH34/5s1kv0XLaRYNmpN0zep1bGYV6aQ8gN39B4kQEIC wc3nUCuFLCsvB4FnJXSIcMcX/9B0lNvhsQwvEqIuAqvV3K8HgJN1j4qu7/4bQTTTnvPneu gssPfnOjbMYIEClqCD5XMv/AMuHXP2nf6PBFAxOES1RStClbAsVz5+mbM6PILW7Rh+0jUi Z5XdNnYf6OcGXCt3MfcHVRwauMG8OBjnO672nIfz0uzfMOpJIGTMTdp3cPWhomMPGZ++W5 F80L4x6ODMhqhY41m4iQ4mUkT9rB7NK5ZU7o6F39fGHtdYVjf0ZE6bPMWRLyNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgDf4wLDSkkE75NAMmLgaN70i2hMWQ6zYw1RSxnNsxc=; b=ddhgy9oqVGX90ZQtzTW9fv/n8W8r8Pd6RBc1UMIWc80SEuWNRVh/csFo2eD6qicOIaJEhS b9BhH/gcFa5Mr9iSVAuyGistATZr4Vpid+bAcHdgEiHHTe//nDmBB4kWWJm6bGvzvGSjDs b3Eju0IfbuxFxYFjMsULGt562eUFhGtQ5AmXIW0ajIVV1+uaHSDKRBBSNVh/cz6H7tnlqk Y5l/Es6bF+FLXat/DaKoeOMa9Wy1D8L41Xwy6wdPTkr2jUI3AjXaEdHhoEGB+/lOfBUI2n sCi/viD6b2fV0w0llILTUS1Yq431MAJf5RxjJSDP7cmNDIMNLhfd2MQJIwOZfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387128; a=rsa-sha256; cv=none; b=PYtkU38WQyytkb3/gf4y1GuNGm/SC4/UncxYGnRbHFwUj25uLxTIbZMRNHv3EUxNexI2z1 kygiNUN4u1CaRpM0WaFdeHnTz5vf23Fue2pC5perYdU4Sc+3erkPjIcnGllNRv52tLfQK+ OqX7qGf4YkUeOy8PKux1GWEJ4ntc5/M+WQNmG4krpdxkDtQyV42V6YCCuVVKJFKft9JcC+ Ub7jVXulYn6rMNiKtd3lEIqN1Mn5p5jpuNukt3q0QJIavU+kgqYOJLjfcUW3gRqSTe4Dej rtJjwegtC4EkbxiN1BE69GXRdo4bfiINlEhvzLaetsKqB1X4DWpChGTC+XbIlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbV02wRszZdC for ; Fri, 02 Jan 2026 20:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b6a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3cd0026966d0 - stable/14 - sh: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3cd0026966d0174c7143ac1d8233ed81ffa68ddf Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:08 +0000 Message-Id: <69582ff8.b6a9.770a90c@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd0026966d0174c7143ac1d8233ed81ffa68ddf commit 3cd0026966d0174c7143ac1d8233ed81ffa68ddf Author: Dimitry Andric AuthorDate: 2025-12-25 20:13:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:28 +0000 sh: avoid warnings about too-long initializer strings Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid warnings from clang 21 similar to: bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; | ^~~~~~~~~~~~~~~~~~~~~ bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 153 | {"==", STREQ}, | ^~~~ MFC after: 3 days Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D54362 (cherry picked from commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802) --- bin/sh/options.h | 2 +- bin/test/test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sh/options.h b/bin/sh/options.h index a477f24e90ca..526383b5bc1c 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -76,7 +76,7 @@ extern char optval[NOPTS]; extern const char optletter[NSHORTOPTS]; #ifdef DEFINE_OPTIONS char optval[NOPTS]; -const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; +const char optletter[NSHORTOPTS] __nonstring = "efIimnsxvVECabupTPh"; static const unsigned char optname[] = "\007errexit" "\006noglob" diff --git a/bin/test/test.c b/bin/test/test.c index 1cb3eca8fe13..b8f6845c221f 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -117,7 +117,7 @@ enum token { #define TOKEN_TYPE(token) ((token) & 0xff00) static const struct t_op { - char op_text[2]; + char op_text[2] __nonstring; short op_num; } ops1[] = { {"=", STREQ}, From nobody Fri Jan 2 20:52: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 4djbTz5Y3Lz6MFTT for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTz3KTgz3qQQ for ; Fri, 02 Jan 2026 20:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3T6Ebx3GpxNpkZYRAaoS2f8NoHwhFQIZ/NJNGjxYG2A=; b=WRIjlxi2kbyQNdpVYNBVKmLVy28GkJpaDxFSaIXp0Vd6IlJEumZx2cN+bH2SGxA+FdQ57l uqDDFyNKBT1k5z+M59NS20PpPo+AAHAk+6/OAfQQjblCjnLhLHvC/iW2OcUCEWN+ZYh8ZT mtKj17bjBs9rp1EO2cYDBlJKMQ8mHjQXomTMaTp5bu6wgd30SveBNT3ZgEZd203r2+GP6E mtnAH+wkCl97ByMeAAQp7WDCt2ZcugRBjuB1KYRxZVhR5f0UBzrJUJNR1rD5QoERzDtqw9 Q24KtmZex8uyU9IJrzr/CReR+u4x6wFH0SnwN6cqYWzxaBDFwEkF+CpmJd8KBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3T6Ebx3GpxNpkZYRAaoS2f8NoHwhFQIZ/NJNGjxYG2A=; b=HvMTih5GIoQxl2d01589XZZW9tEjyfYh/Hd1uKjPdknhPPsizNR9nsoz7btqdakOsMRW7O 0fkMlC9wBgHZnEw5Q31N8IXWZQQFrAZ9lNrcOVKUmyE+OTSBX1CHLHVt2ri1oh4E5cmTwf gT3EGPTrtabkK1s+4nUM70jfdAOvy2wTBRfUZBTJDypzu3/byUDzZI5e38jj/N/TFV0CCp 3MiM1187HdcyWNTnNfj88qkdJz16NLW9ybDrdtogCn87usxkZ+KkiB5yhG2pvBgsxuQ1Q7 3v2HRCcATVJSdRRB+rzVuXTSdi7pxfrZ6koeroHuEnrUyxwP8lnTp9fLZ2Cq+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387127; a=rsa-sha256; cv=none; b=IoTbIPV84zUXqg5DO52at8ic3ypeS2KZeuWl62CXr3yuI7KP4vVcPhrCZQfTDSMiG6t4Fx GE6RfXZsFHm9h3dr+XCjHAQuko2E41gn3V9kGrA2I1uA7SE3oUiKfP0iu+d15scfTPokq6 B2wxnKZrfzWAIhNWtK5T5y9Hel0MZN9yQi69C4Q2f1N4nJ7aSOn0OrweNLB76b7uxFeHmy xnyW8yi8kDLWyoqBR+KBUtzc1ZMoKsvhn0AwH+jxm7PZ9FN+EIVcg6nGaPg9GUgOi5oCi5 XO30FKxYGHxDz+EkY9OzFcOSJiNzDdjQbLr7mHIhrtPzvf9aSJ6QfsdRR5N7lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTz2N3zzbHJ for ; Fri, 02 Jan 2026 20:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c027 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 41626383b651 - stable/14 - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 41626383b651d4229197c2f439d5ff940da025c3 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:07 +0000 Message-Id: <69582ff7.c027.1c31e3ab@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=41626383b651d4229197c2f439d5ff940da025c3 commit 41626383b651d4229197c2f439d5ff940da025c3 Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:21 +0000 OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 160077a4d75186a979f28f0778259c66d8cac8be) --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1fed797b8f24..8b2688f7e626 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -877,14 +877,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3706,7 +3706,7 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif -.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if ${MK_LLDB} == no || ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatelldb.so.19 .endif From nobody Fri Jan 2 20:52: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 4djbV15wl8z6MFj4 for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbV144gLz3qf9 for ; Fri, 02 Jan 2026 20:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387129; h=from:from:reply-to:subject:subject: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/XOdp3Vq5L4cKuxH7iz16sPpt6LG5v3Ckcpv1ZZFZw=; b=tAeJ/BiIn+++tSEwNcxcI1guhXgCmdBBjGshXhSrXZyx8gFehC811QrxLferuCmHXiycE1 soekoS0Ovv0FEDS1JzpWomc5f1PmvbAuOGS1GVmLb1w74gM30/P8oKbGPFLExF1fq6LDeY FcyxbJsjs7t97n7CXYySnncEENqy1hkyp04MgoVzPWj8bMXpIwl1e92a9kqL2kIK0yfSo4 IfP0Sn8ouvF4Ydhj70iaHsSOB7o3FiWq0QDx0XSuZuwRbIFKK00T4LChfkt9fhCvC/Rdo3 uq+eKF/S49AA4lMZBXkSnwWaPh+CN724x2RucHoVhq4RqArylIuUDhtK2WDwgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387129; h=from:from:reply-to:subject:subject: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/XOdp3Vq5L4cKuxH7iz16sPpt6LG5v3Ckcpv1ZZFZw=; b=AF/ITbOhxrHFszKsP1n1oeI5J1oIiLBwClgUFBKWOVqrw9Z1c6yrRaO+i+SLwOOkelGNYI eFdUE/XwLlN1mw5dlHWz4ojYta3FHyC6jwSxOZ6MS1OzOlYASYMSm6qXmWndBCZt0UW8J5 NUffVgZn/2qLy7l/TKRKRyHU5dWS8dU+tEDWonoElG7GOqWcDi6U+2YovohI7mov6H6XE8 BfmgbEnQlgRrnjZ44/YeQHOy/MTgVCQCspybxjSW0xoPsQEBFineBcliobF/qt5jRQ2Ez4 jYlm4OIMJ6HGW3uRNj2KSigpsohckXYxNM2KBsTye6UI1azGNzzemvPKIP5Izg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387129; a=rsa-sha256; cv=none; b=Tc+yGhD0uSudjAGzVRgjehcGerKfudAozWOV3rUM8xPze9OcNLvJQbETygXVyjpUAFsRtv d/09mnisQu/vWZ1TrVHuNKjOBLsuMKjAv1h00RuZQUyAPGMb8kPmSgOhKURkOQRUkJej14 rScBcPiA/Ih1Q71hBNuGm4bU0CduwulayagON5xfuE3kEEm4jWi9gN7zXI+yrzFjnWwo6t du+Ky2FuC+mMxOn/M/N8Qp9+9s02uEjv738pxuqUFPSXMkA3Wn4vJg85ECSDPwfAB9URnV edrDUxyW0Ej+TRznmzMomFgddAZVPVIQbiKs4WHrluSOYC2RmMNe/rN7qnC1/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbV13VSPzbHK for ; Fri, 02 Jan 2026 20:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b79a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c645b2f41833 - stable/14 - bsd.sys.mk: suppress some new clang 21 warnings for 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c645b2f41833063795f470e393c2b0f0961b1134 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:09 +0000 Message-Id: <69582ff9.b79a.c951a58@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c645b2f41833063795f470e393c2b0f0961b1134 commit c645b2f41833063795f470e393c2b0f0961b1134 Author: Dimitry Andric AuthorDate: 2025-12-25 18:44:34 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:34 +0000 bsd.sys.mk: suppress some new clang 21 warnings for C++ Otherwise, these lead to many -Werror warnings in libc++ headers, due to our use of -Wsystem-headers, which is not officially supported upstream: Suppress -Wc++20-extensions, due to: /usr/include/c++/v1/__algorithm/simd_utils.h:96:50: error: explicit template parameter list for lambdas is a C++20 extension [-Werror,-Wc++20-extensions] 96 | inline constexpr size_t __simd_vector_size_v = []() -> size_t { | ^ Suppress -Wc++23-lambda-attributes, due to: /usr/include/c++/v1/__format/format_functions.h:462:32: error: an attribute specifier sequence in this position is a C++23 extension [-Werror,-Wc++23-lambda-attributes] 462 | if (bool __is_identity = [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated | ^ Suppress -Wnullability-completeness, due to: /usr/include/c++/v1/string:1068:80: error: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Werror,-Wnullability-completeness] 1068 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n) { | ^ MFC after: 3 days (cherry picked from commit 63d1c3c43690ff3c3e76e1fb03c8640fe30a2663) --- share/mk/bsd.sys.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 061c6b36f84d..1b34b70504c5 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -92,6 +92,11 @@ CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter # Similar to gcc >= 8.1 -Wno-error=cast-function-type below CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000 +CXXWARNFLAGS.clang+= -Wno-c++20-extensions +CXXWARNFLAGS.clang+= -Wno-c++23-lambda-attributes +CXXWARNFLAGS.clang+= -Wno-nullability-completeness +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Fri Jan 2 20:52: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 4djbV2631bz6MFns for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbV24lxlz3qZ3 for ; Fri, 02 Jan 2026 20:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387130; 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=8M9ldwaIOsbFvxwTomTPmEPZVC00dyR0wMnjxXEEq/o=; b=m+1Xws1VP4c2djoWJGOj6YT1efmuXPtVbkg5kt5+H/rUMyrj0hVI/1Ja2BnSWKOuTd9TTl 05zB0eD2gVn1ZlEvv7Fu6JXgkWrbzl++7sT8ZH4AaBb7sqPQKdfrTtSKBiPPftIIKY2DSe tXkPoA9OwaMLtIVonuOh/A6s75BzoL6B8dni7lZQ8RHsw8XR8C6/gxi5gM49iTEKc0npG9 ADtzYvF5NsFGTV9W2CbUc5DOcTCVdvPeuFSJoH9I0KVvY11PAJEjld5Urxaia5ESFh/C3b Tu06KhHSIg2DJ1Gz+deMzsYJaXj0UeeFBkKifgHorT7uYZ7NmiLUtRFpSdnscw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387130; 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=8M9ldwaIOsbFvxwTomTPmEPZVC00dyR0wMnjxXEEq/o=; b=QGSwtemyVRkp0LYYSFY0OC06XVlqdulMGKGWmlAzP6olL9deHb0UtNSSLMbMuOlpyY31dP D2KydiI/pDV2uWG5EgNLtvxdQ9aGbqJ1GVjxGKQVpaRZ7sXi3rk6tUpyU0CKOIAHiiU1q/ 1GILJAuBA0KsfwOVYJbiG9/xWcuzfueW5Kr6ha7TukUIq/b1GW8+DOF9kZSsvnA2V+JOj/ 53yRtq1GGDne5fBuENyARkHdEBvSJkw0Lts7u5TthXaLUuShHb0v9UfDk/aHM9Gxzh+Fla nawjqKL9fn1m9lGH7DH+Jr0SJWzy9iwjxRszbwLlDC7bucI4i2i5FuhzVYWgDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387130; a=rsa-sha256; cv=none; b=OVZ9RAEjQk13bJmcvn+fuBatHLIVMt4/7Ve6kBdpxLLXfOVgK188W9dC5q/HxG1OjIoR21 HyeTkGn+6fnu+YrRh53ONcz63gRWsyuGbmO7s+fZrul9Ux/jmd8NG3kzFxkWU6zqWtbhTg c8i8MaCJkNypumxwsuBvpZYZBrriNK0+8QLWGNwN2dLGK9NNnavPsjRKf/CmckMO0W+a/H 0gISE2GI+lzH75+PK5G2cwZ6gCQYjUp1KHGcMUW6u+dfjaCkL4MTE8SE2CV/FaimQ4tKJ+ 658TSMXDJUKCaEAWJdTug2XAZEfn0YnsOJFVmfTMAbpQ80csud57UXo8bkWIWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbV2408HzbHL for ; Fri, 02 Jan 2026 20:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Dimitry Andric Subject: git: 0c5ac3e46e78 - stable/14 - compat: linux: use appropriate variables for copying out old timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c5ac3e46e789133a90e874b3e54e4fa9a2e665b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:10 +0000 Message-Id: <69582ffa.bb78.4a4ed9e2@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0c5ac3e46e789133a90e874b3e54e4fa9a2e665b commit 0c5ac3e46e789133a90e874b3e54e4fa9a2e665b Author: Kyle Evans AuthorDate: 2025-12-28 22:02:04 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:39 +0000 compat: linux: use appropriate variables for copying out old timers We copyout &l_oval but do the conversions into &l_val, leaving us with stack garbage. A build with an LLVM21 cross-toolchain seems to catch this. Reported by: Florian Limberger Reviewed by: markj Fixes: a1fd2911ddb06 ("linux(4): Implement timer_settime64 syscall.") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52985 (cherry picked from commit 541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c) --- sys/compat/linux/linux_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 2188006ec38f..2e0a8269c0f8 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -131,7 +131,7 @@ linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec(&l_val, &val); + error = native_to_linux_itimerspec(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } @@ -158,7 +158,7 @@ linux_timer_settime64(struct thread *td, struct linux_timer_settime64_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec64(&l_val, &val); + error = native_to_linux_itimerspec64(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } From nobody Fri Jan 2 20:52: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 4djbV41vSJz6MFdl for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbV36Z1qz3qfT for ; Fri, 02 Jan 2026 20:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pC9Ye1TFwNXev1vJo6wPww1JMN2n1CFxW9RNvC4LUAQ=; b=OOIip1Crv4K+kuJViBIzbWBrMvCIOubL+lpbOvwKpMTywfBLt4b2PqB8uhzSxANvxfyqFe cyHiZoBDEB1JWAXEKuJOG3oXbbWfZ1lODjTQzq4S/1HeABXNhIyLoZfryWqyLuvcmE9Lwe q94U31TF4G0nxj4pnQT/wHHX1wilobu8ayS0zuSkhw5gi1NJ0r3xW7KLRn60q//rZsWgxV j6cBcFuf3CnswBA6jLoXm1yBjM0z5Ud0TWnkPyW49TFeHOxdof7yUbLsbidWUsovEByNSV b4Ew7bBOJwKIsVJME1U3YvXoe81BzVgIOZWcwcCGBlSp4Is+YnUOBqBcsotnww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pC9Ye1TFwNXev1vJo6wPww1JMN2n1CFxW9RNvC4LUAQ=; b=bJZ3kvmq1Wl8BWmF3QHV//45brINaQrfMyw9WeJfTdJKoKNXX7hKPDl+ykl1fLX3Xub12g BwHMvsj2VhySXyEi21iC8t6aRvNWQGqzVHa38ka3fFeq7AKqpW4ZkCZ/DUPZdokHBOpqvM 8a8Gr/hZF0FoqfzWhhIU650b44NxmUndExaz48i630sl4Gky0qEdtLqvejtI57ZYVT+Laz R2BmW2ds5oUDKWxHohgCVKvizQw/BClnDLCME6vTLVJ5740v1LGDtpQkwaAaFb1oBNpRJI Pw13CBc0P75pDHNESUkpXeB/pTMI42Hmh37RG8lBSlzyHaegwR0fFUjE0D+dog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387132; a=rsa-sha256; cv=none; b=u0wej5+nMjJUs8HOd6gx3Hvr5i3ILuMILGXo+q0hENdAAJOfwPmDNfRoKrkFWVQjCOiB+2 d4bHoDPEPBzc/JFWxK8m0P3iSW1zhgcEpHAhl84hMmdftuatx1Ic1154W4w6aEJQsiJhuQ 2WLQGzLeP5H6SoziHSpgyLbgJ5Rukl45O/G81gF760A4BX2S0gZtoFVK3yOMjWfi4fv/XZ J3/nb2BT6eFPC/wKIdXiRpbRgwj018IVknGjgxA8ETZLCpJ+g1vi6e4ilzsB1maeGPnsta z3WbM+OefK0Pa89P5BoIwiPAUm2MWoCZSWmvrsxM9D9P55R0VX8i4FSGFnRRsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbV34X2HzbDp for ; Fri, 02 Jan 2026 20:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a7fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a7805f334170 - stable/14 - ncurses: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7805f3341705323f80c579173777f947bd8aae3 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:11 +0000 Message-Id: <69582ffb.a7fe.7da7ea89@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a7805f3341705323f80c579173777f947bd8aae3 commit a7805f3341705323f80c579173777f947bd8aae3 Author: Dimitry Andric AuthorDate: 2025-12-30 12:48:07 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:54 +0000 ncurses: avoid warnings about too-long initializer strings Increase the size of `assoc::from` to 8 bytes, to avoid warnings from clang 21 similar to: contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 702 | DATA("\033[2J", "ED2"), /* clear page */ | ^~~~~~~~~ contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 716 | DATA("\033[!p", "DECSTR"), /* soft reset */ | ^~~~~~~~~ Reviewed by: markj Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54371 (cherry picked from commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083) --- contrib/ncurses/progs/infocmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index 7932203ac2b1..f61633cfad80 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -687,7 +687,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; From nobody Fri Jan 2 20:52: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 4djbV53dPzz6MFlQ for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbV46Mlwz3qX2 for ; Fri, 02 Jan 2026 20:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0cGhYuc0bS9IJorScFaCJhCqaW9Pc0ckUnCkmW3O+s=; b=A8wC/wy8Wl7adLs72Bgi2RdAAZ5K76uvjbAnqmuCyLxZdqZ+tMl66HjENUJudkMQBpr5Yl EdSRhHcAxl6H31ozfrvgw/KH3R5TqxrOvQtCERvsAplmlNKIuK5AlyrPNKxrluQ0Mmp9I6 GwTKV8yQjqdlCtmOtysrlKY+hpIHtUahb9oVT5AwbIgP1PGpfgVh6kWXg13wkscL1+lUF4 YSivKcts/z42P0BVHaJIn3VH+sGsYjQXjkq6FKpxMxQC3ITWaGN3dK+ObiHQ11NMZ4SUAF NfJI7LdzoqDqpfPsGdtNhboLGsQqEQ4MRbWFqDxMz4HoGY3f0bikBUmi86NIYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0cGhYuc0bS9IJorScFaCJhCqaW9Pc0ckUnCkmW3O+s=; b=p3CBmudjoZf8UapRyuSisJyd96ZWURjlsReYH6Lhw5DNLcbW1GuV9+cqyPfu4pIxQay0Li vhJ3n4+5TBOII56TB/Jt2zQpivsd15OduQ3o+8v5cec+XdrFrJxXbhBkiZMC1ev8q/DKHm Ef/dsBFqXhp80C5A6QbxyfegAqn/xrQ6YJW6yPp1BgFiZcPpgHnLSbnvOCh5TxFmaXwadN Ii4LY3S8yfinm5qs0RRPNaJqcXOCFVwa7aB7aclbJIMRtPyMUXO3QEatJch54l2glh8nD+ L4U8N3S6+F7BI5/jRM07siL0xp7vRuTNwv5uhJHz7qAzMvDh4H+1egmMinNBaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387132; a=rsa-sha256; cv=none; b=lHg5E81NByBWtMnle3VfQJDGGWL6iz5uMb2pxhXN/Gd18r0EN92WK488Rvz8oREiAwAI4h BlPnEQHBSrr5YJOQRXkm6TKrtKye4lXP9nXZxwnUUfsNSWC3fAuFrScCLB4mmJByZnBW84 OaTendi1ZLB+V5vg9enA3yzB6JdTiGvgPO9b2KSsqwyH1Dbb0KmAd0n0AXDEKRlYQKdUb7 aH0s7iXgArkUclL8PRCdtTiudGW+Hsq3SLOMDP9qqf6HSuxepZbj/cwGruB/Vxo3930N7/ xQX2h5OAsU+L6gfto6AL1Q1KTBoC5pomqMLxwgx3me4A2ydrfMqQEzMqUAceiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbV45L7BzZQv for ; Fri, 02 Jan 2026 20:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id baf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 752d056fce33 - stable/14 - crypto: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 752d056fce33052d482eeb24756497fc44dac579 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:12 +0000 Message-Id: <69582ffc.baf4.4b7ec9ac@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=752d056fce33052d482eeb24756497fc44dac579 commit 752d056fce33052d482eeb24756497fc44dac579 Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:59 +0000 crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 (cherry picked from commit 710ec409dffed3306ced253bba85dbdc7758510b) --- sys/crypto/chacha20/chacha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c index e22c348d14bd..8ce69226635f 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -51,8 +51,8 @@ typedef struct chacha_ctx chacha_ctx; a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); -static const char sigma[16] = "expand 32-byte k"; -static const char tau[16] = "expand 16-byte k"; +static const char sigma[16] __nonstring = "expand 32-byte k"; +static const char tau[16] __nonstring = "expand 16-byte k"; LOCAL void chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) From nobody Fri Jan 2 20:52: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 4djbV62ZJjz6MFh7 for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbV56q0bz3qjL for ; Fri, 02 Jan 2026 20:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIaGYsF9bi8KqKpHsj2S9xNCeBq2sjZo9a3jvSR4rf8=; b=sT0yZtlZNvFspxNrmtOTwz8HXe5li5v2N/BE5sxacJiQgDotDOqz2nNKak5e7Y4jPeq9wk gcWxFLySt/kahliICicmT09nVtArUkHW6yj8TYhkn9MqWqq9PJY9tZel06lo3M1cpRmlvx o0mCRA9jAYM7Uu2s7qScuwDb4SEnSSEcm2cspacrjCCI6Q39xoOpAEbqWi6EPQozxEOHGL 0HAJriTAHFaajdbJdezVEAhdwSBvO38qG0VxhJ9ZW8WcVt4fU9G9aECBDy/WqBe96vuP41 XJ+xErkSE5svPaChIG7wQudCcj/0OL762LaDEkAZlre7P1aeBLk9lcS6zvtang== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIaGYsF9bi8KqKpHsj2S9xNCeBq2sjZo9a3jvSR4rf8=; b=f3uG7CLXH5gPPTYi8wn+sN5a7HNoRjFU4Lvt+DMSLDvuQnW5ivcYNhqUeR+YgB7c+HTYbA i3iH4s2XvMIRcFBI1mbHKEOW7M3b39oVMN1GLnEklIuLaCbFaD0XHrlIR0RxyBXt/9mZBp JcAdZJKsvi2Ioq4ecfDRrN238P5Qm4yoN5G7WCacW7knyCf9brY6jEZ6WhqAzuEoNoteXM FQqgdlAichOL92wBQCZ3mjF6V+es5yUg8RQ8f53fIpaRMGVSzsQjHS6Ymt/ee2HDh7HA0I Tq2fIYuQvdOpUBqby7/fYHRHt42a6rpN+CuwtVurcq6z6bbuknd88i134qdudA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387134; a=rsa-sha256; cv=none; b=eEeH4vApkCVkkb376RqMPI6QwricCddYliUmx0YM9gPv3PraxARHDLmjn3cCqCd8Ar/LsT BKn6xXcJBUataeIWySFBn8BicSu9+iuX5cF+BEJIdGk1sUiyuIF18PCXrV6i4UaHzY8YeD 54kyHCQBgbN0cfYlF6kTxAHq/i7trO5zY+RAmcBJMlBqVXCQlpJUhhmdA4P+/Z5gla/vjz KbRPCOZgYd6cwvohMcN4Todmqy3c59EKehp4txYnY7fgQUJxb1FnPO7qZr9Qj4rYfkt+AD Qq9fSEjjpdEGbVDppW9TyyWYAU62+cSplaiMc3EbCoqwkA7dH17jr2THN5btvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbV56Bq8zZQy for ; Fri, 02 Jan 2026 20:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c602 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1a0377015e78 - stable/14 - zfs: rename several printf attribute declarations to __printf__ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a0377015e78f6ed4b444133a8b5139a18737f42 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:13 +0000 Message-Id: <69582ffd.c602.65fce8d9@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1a0377015e78f6ed4b444133a8b5139a18737f42 commit 1a0377015e78f6ed4b444133a8b5139a18737f42 Author: Dimitry Andric AuthorDate: 2025-12-30 12:50:24 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:45:08 +0000 zfs: rename several printf attribute declarations to __printf__ For kernel builds, we redefine `__printf__` to `__freebsd_kprintf__`, to support FreeBSD kernel printf(9) extensions with clang. In OpenZFS various printf related functions are declared with __attribute__((format(printf, X, Y))), so these won't work with the above redefinition. With clang 21 and higher, this leads to errors similar to: sys/contrib/openzfs/module/zfs/spa_misc.c:414:38: error: passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat] 414 | (void) vsnprintf(buf, sizeof (buf), fmt, adx); | ^ Since attribute names can always be spelled with leading and trailing double underscores, rename these instances. Note that in FreeBSD proper we usually use `__printflike` from , but that does not apply to OpenZFS. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54388 (cherry picked from commit bcd9ea853b14c85a61eb9079c59e966eed336578) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h | 16 ++++++++-------- sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h | 4 ++-- sys/contrib/openzfs/include/sys/spa.h | 4 ++-- sys/contrib/openzfs/include/sys/vdev.h | 2 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h index 87fce4955bc1..21f05c67334c 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h @@ -51,28 +51,28 @@ extern "C" { #ifndef _ASM extern void cmn_err(int, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vzcmn_err(zoneid_t, int, const char *, __va_list) - __attribute__((format(printf, 3, 0))); + __attribute__((format(__printf__, 3, 0))); extern void vcmn_err(int, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zcmn_err(zoneid_t, int, const char *, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(__printf__, 3, 4))); extern void vzprintf(zoneid_t, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zprintf(zoneid_t, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vuprintf(const char *, __va_list) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2), __noreturn__)); + __attribute__((format(__printf__, 1, 2), __noreturn__)); #define cmn_err_once(ce, ...) \ do { \ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h index ae786f0e20ca..d365904727da 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h @@ -54,9 +54,9 @@ MALLOC_DECLARE(M_SOLARIS); typedef struct vmem vmem_t; extern char *kmem_asprintf(const char *, ...) - __attribute__((format(printf, 1, 2))); + __attribute__((format(__printf__, 1, 2))); extern char *kmem_vasprintf(const char *fmt, va_list ap) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern int kmem_scnprintf(char *restrict str, size_t size, const char *restrict fmt, ...); diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 76e4446d3942..f7866e564778 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -1064,9 +1064,9 @@ extern spa_autotrim_t spa_get_autotrim(spa_t *spa); /* Miscellaneous support routines */ extern void spa_load_failed(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_load_note(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_activate_mos_feature(spa_t *spa, const char *feature, dmu_tx_t *tx); extern void spa_deactivate_mos_feature(spa_t *spa, const char *feature); diff --git a/sys/contrib/openzfs/include/sys/vdev.h b/sys/contrib/openzfs/include/sys/vdev.h index 05d18a36cbaa..3171edf8472c 100644 --- a/sys/contrib/openzfs/include/sys/vdev.h +++ b/sys/contrib/openzfs/include/sys/vdev.h @@ -53,7 +53,7 @@ extern int zfs_nocacheflush; typedef boolean_t vdev_open_children_func_t(vdev_t *vd); extern void vdev_dbgmsg(vdev_t *vd, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vdev_dbgmsg_print_tree(vdev_t *, int); extern int vdev_open(vdev_t *); extern void vdev_open_children(vdev_t *); diff --git a/sys/contrib/openzfs/include/sys/zfs_debug.h b/sys/contrib/openzfs/include/sys/zfs_debug.h index 62fa34cd14e1..3668d1a422c1 100644 --- a/sys/contrib/openzfs/include/sys/zfs_debug.h +++ b/sys/contrib/openzfs/include/sys/zfs_debug.h @@ -62,7 +62,7 @@ extern int zfs_dbgmsg_enable; extern void __set_error(const char *file, const char *func, int line, int err); extern void __zfs_dbgmsg(char *buf); extern void __dprintf(boolean_t dprint, const char *file, const char *func, - int line, const char *fmt, ...) __attribute__((format(printf, 5, 6))); + int line, const char *fmt, ...) __attribute__((format(__printf__, 5, 6))); /* * Some general principles for using zfs_dbgmsg(): From nobody Fri Jan 2 20:52: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 4djbVM1XwQz6MFpM for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVL5HHQz3r38 for ; Fri, 02 Jan 2026 20:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cMNtbO683O0zrCUQYn4uE4uNM67htOoSnObmVWGfYkM=; b=JBlM46QXt0fPfpYkMvsDzAgGQp0th9+3/DnRz54QCzS8PH6bk39neg7Ztlq0QuUkjRfjlQ OKdOkibbgXc2YdcrcK7t2zgk3pzpfhV173BnOpKhwLuCeTA8TKep7SutQutCrzpRtSGnvm bK1XYghY+StYlgrBADV/YJWcIYoSw0nwfVk9XEK3lNQxfJ5RalMddog1evjovjWMkMeJGU la5WI0DhCurysNSHNQeQPk2D3n8pCbCDmPNx++r9+Wz4k0PAaRYJQTUrgWyUE9gOgOYbz3 iZgw/tXOgGpX5g0cuGZpRprshFIKCek5h8+Rm032+3zxEX+kxpHhQO3KTC6Vdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cMNtbO683O0zrCUQYn4uE4uNM67htOoSnObmVWGfYkM=; b=ZDSWupyYE51ipXuN7I1CctcLTi3E1cs+lH8u+196ZNSf/VgO1T288Zrjg1xQcE3nc7S5gv c1FjkaXCuQEodfy+t8Ti9e4GbfUmn0MeD43dK3z39MjP7FBv8pFc4UH6MdYgoyfil9znif rk1f3zAvNTlDof/DCrbQ7b1oy9doSY2QBTBCmbNnubFOzdqDqyyFDTk9UNzhnEmfIJZg9x iEFcsXdwqFbXfaFcNF8y/sZmBSr+5arjGD6zYWIiUf5xAbs9NXwuebiad7dW51vwbODt1/ CiOTYpoI+X80Q1/W6xNYAdgeKWX6GfVgEW/2Eor4SnAHoMINqxXcqLg3jQ7tww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387146; a=rsa-sha256; cv=none; b=H5zmXZE0o/94Li5y7OLKeqW9jMHMQsiCz00O6vJSl4oEXxXYUQDSf49id0Hxqu8gWBZEqH q3uo+zPl8FG/gzpgdp1QOO6zWlbo7M4lU/wxX7CDvE9v7CTJNfYX0YbQ4Sq/hHjnSHpLtG dsgKm5p9veN75d/hx7KfoYj7sIwCmPe2s0Wty4F6B7SQ1nWw+r+p52b5+E+P8vL5loX+5G BWptAK6wn+2SNqTuILlxk7y44wR0nMLBW0Cla6Jw43y5ooV8XrTiCwxUMRYi5iUPWasfvF WE2zt67VBJIupKJTwy3jWb4HspqqFj/qtU+Z6+bMK+IlkZaOWAUmo8hQf1hAyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVL4skXzZXP for ; Fri, 02 Jan 2026 20:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b62d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 6acae3bbe337 - stable/13 - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6acae3bbe3377aa59fe44c8646dfb778c034ca78 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:26 +0000 Message-Id: <6958300a.b62d.75918efd@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6acae3bbe3377aa59fe44c8646dfb778c034ca78 commit 6acae3bbe3377aa59fe44c8646dfb778c034ca78 Author: Dimitry Andric AuthorDate: 2025-06-18 10:06:25 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:48:56 +0000 src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, this also comes at the cost of some performance, since the dynamic libraries are quite large, and contain lots of long symbols (mangled C++ identifiers). Add a WITH_LLVM_LINK_STATIC_LIBRARIES build knob that can be used to go back to the previous behavior: libllvm, libclang and liblldb are built as internal static libraries, i.e. only available during buildworld, and fully linked into the various executables such as clang, lld, etc. PR: 287447 Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50956 (cherry picked from commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a) --- lib/clang/libclang/Makefile | 9 ++++----- lib/clang/liblldb/Makefile | 14 ++++++++++++-- lib/clang/libllvm/Makefile | 10 ++++------ share/man/man5/src.conf.5 | 10 ++++++++-- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 11 ++++++++--- tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES | 6 ++++++ usr.bin/clang/Makefile.inc | 2 +- usr.bin/clang/clang.prog.mk | 2 +- usr.bin/clang/lld/Makefile | 2 +- usr.bin/clang/lldb-server/Makefile | 5 +++++ usr.bin/clang/lldb/Makefile | 5 +++++ usr.bin/clang/llvm.prog.mk | 5 +++++ 13 files changed, 61 insertions(+), 21 deletions(-) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 9b9e0cbadcd7..56f6fd374fe5 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,9 +1,8 @@ - -.include +.include .include "../clang.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= clang INTERNALLIB= .else @@ -873,7 +872,7 @@ SRCS+= ${SRCS_ALL:O} LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 408ebc440686..aa9e90b2f6f2 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,11 +1,16 @@ - -.include +.include .include "../lldb.pre.mk" +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library when explicitly requested. +LIB= lldb +INTERNALLIB= +.else PACKAGE= lldb SHLIB_CXX= lldb SHLIB_MAJOR= 19 PRIVATELIB= +.endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -754,8 +759,13 @@ SRCS+= Version/Version.cpp LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 835da5545e81..05128550827a 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,9 +1,8 @@ - -.include +.include .include "../llvm.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= llvm INTERNALLIB= .else @@ -15,6 +14,7 @@ PRIVATELIB= # Work around "relocation R_PPC_GOT16 out of range" errors PICFLAG= -fPIC .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB .endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -49,8 +49,6 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif -CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB - SRCDIR= llvm/lib # Explanation of different SRCS variants below: diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 01721e786aa1..eb501901008a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.\" $FreeBSD$ -.Dd September 16, 2025 +.Dd December 21, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -922,6 +921,13 @@ Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. .It Va WITH_LLVM_FULL_DEBUGINFO Generate full debug information for LLVM libraries and tools, which uses more disk space and build resources, but allows for easier debugging. +.It Va WITH_LLVM_LINK_STATIC_LIBRARIES +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. .It Va WITHOUT_LLVM_TARGET_AARCH64 Do not build LLVM target support for AArch64. The diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index d8872f93bfcd..dbc0cf31671f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -212,6 +212,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_FULL_DEBUGINFO \ + LLVM_LINK_STATIC_LIBRARIES \ OFED_EXTRA \ OPENLDAP \ RPCBIND_WARMSTART_SUPPORT \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b79dde1dd41f..2c07c61011e3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1157,12 +1157,14 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no +.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif .if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -4327,10 +4329,13 @@ OLD_DIRS+=usr/include/c++/v1 OLD_FILES+=usr/bin/ld.lld .endif +.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +OLD_LIBS+=usr/lib/libprivatelldb.so.19 +.endif + .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/bin/lldb-server -OLD_LIBS+=usr/lib/libprivatelldb.so.19 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif diff --git a/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES new file mode 100644 index 000000000000..7860ee862b1d --- /dev/null +++ b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES @@ -0,0 +1,6 @@ +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index d5c9658b1d90..7d713c54d518 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,7 +1,7 @@ .include -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" MK_PIE:= no # Explicit libXXX.a references .endif diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 36c601bcbe36..cf4e5e0ce47a 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -18,7 +18,7 @@ LIBADD+= z LIBADD+= zstd .endif -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index f87677c2b384..8a8b11a438d5 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -86,7 +86,7 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 1a5c96b65806..d43fc3278e20 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -23,8 +23,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 0e9a9ebef7e8..529906abf5c2 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -16,8 +16,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 8c898b4087fb..3121648431de 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -14,8 +14,13 @@ LIBPRIV= LIBEXT= a .else LIBDEPS+= llvm +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif LIBADD+= z LIBADD+= zstd .endif From nobody Fri Jan 2 20:52: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 4djbVN0fNFz6MFhN for ; Fri, 02 Jan 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVM64cQz3r5r for ; Fri, 02 Jan 2026 20:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFgkSQXcUP2iEv/854h5kifVzCOOJj1X2lphLNXau4o=; b=oDPkl0gOegXr5ShtGq/e9L3hYQB2uPGTdLq7G7DFz1YRUXv5dVEYRW23PYWEJ2XhaZH95p XCZdTaK1AhL14h+uMu46ZNmclfQntgjab0U3MhEnjbL1OCr2hKZ0DVRNykysYPKSl+Vjpo toE3fwGZYFNUuA4oN4QxeUfv3KbDKFFw7qpiyQA9aldoqf75XjtygtszhBfXQ5V+YmDo+1 kc5Weywo52N9UMYpR+u5Os0Qy87BUJAuT+q4gk+nREJffTfR8f43uXoJGSXZsIYP6mB1vb zyE8JJA17ENqH/qLri1qDeCPoOKUZuYoTFKIxekRQ7rPc6HGpdhMxnUankPDBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFgkSQXcUP2iEv/854h5kifVzCOOJj1X2lphLNXau4o=; b=wj4GADiAhgWwO8BItmO5v6caaQe3e72v3v6FEq8dzzrrnH8H2518S9ayYvej8adgGToIgn PnJ/Xn+rUttJ2qBlFOUtlxa9qoZE6Sb/z1fEi4stXE7INojBshw0sQ09gftsA0t1WimCs0 vsm7okiWL+I8t5kLD0zIzaX/McD1A/PQ4uzytRjG6UsULSxhv0cchyAxoEm4ED4j9VLH3g gDePZF14sEout855vZuZJ6mt6Uuka2E3KplQ6pfEqsVLzQ85cdfqvAmIWMMuLQsMzL/pwZ itVmbO7tw1hR/gdkNlGu1VOO90/nXu77HvfNwTf4ffXcRod7jvcH2TPPXlVjfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387147; a=rsa-sha256; cv=none; b=eaaY7UEMeqHsdILHw+hA1EU4aAJa7lRETgaUg+gdpL3K6oLpThKwQ9o1HTlVFrzNV6jSlu i/A28ABhQUveNZv5UKqM3el2huU4BpWBP8MOBqgs7Plf69mjjfR0+H2m+3rOpajSayd4qv 88yLg0ZCJb+9tQAPLyV0WQkwgcEnKpNiGp7V2d7f1RzCXiYDjhwKNqzkMZLQuJbg5hRayW Po86XsVzIPH8qrU5t9bDa6aXKsOPz2ckracAXpG/rWXueawwspkisodUxKiNw3cdosLDHF Ts9Ym4OkbzS0mx2A1CGTuISwEGgEYWN/gPWPcjpnhFXm/ugOdNOAhLOXVMAKNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVM5h70zb3F for ; Fri, 02 Jan 2026 20:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a953 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d3a575622839 - stable/13 - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3a575622839c1998354dab202f0ca53216e41a8 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:27 +0000 Message-Id: <6958300b.a953.4d0fe580@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a575622839c1998354dab202f0ca53216e41a8 commit d3a575622839c1998354dab202f0ca53216e41a8 Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:49:35 +0000 OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 160077a4d75186a979f28f0778259c66d8cac8be) --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 2c07c61011e3..5e5d83456ce3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1157,14 +1157,14 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -4329,7 +4329,7 @@ OLD_DIRS+=usr/include/c++/v1 OLD_FILES+=usr/bin/ld.lld .endif -.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if ${MK_LLDB} == no || ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatelldb.so.19 .endif From nobody Fri Jan 2 20:52: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 4djbVQ3tSmz6MFhT for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVP72Hqz3r6K for ; Fri, 02 Jan 2026 20:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ee847Vsrq5GWkkOUYMTQsWthNkxPA3AqODljHkJzaqc=; b=x49NeYiYf1ELZPp7rd226pTGO72SI9MQlNOtKe+i1VgY9PAyp7pUkW0edj3JtIGGx7aNvm 3bEarenZQb2MX4ppn+gP2rDbqhslweiZkkpjeXko1Uztx7LnELaptEtO92he493p0QUWZP S3kur1zjNe7g7zi9NJEjB/BibjTa4Qr+j/Tq3mqXnYT6n5KCosK43o9JXQP1i9sqnGnqU6 sv8RwQBWwo7Q9Bq2vgL3mjbQZa18RfdHsNNtLOHwUiV+rmiDNvqAxyktpSG96sTkVBl722 lmktlDasMQTn1ZDtSUcSdgr+mHdg5S3Ij7eIXfzPNiXj8ctuas6pnIp9XA/INA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ee847Vsrq5GWkkOUYMTQsWthNkxPA3AqODljHkJzaqc=; b=KWmI9jhYBqaBPpvj/cvj0M3yvn0QnPSznnKH/tWEg0v8KhsC25Fth5cTemSR66/C8YErcS anfzBzPHCW+p7h7sK9OeVUuRyY5jP1O5c6aMRcFvXZ5nbLWeTnVWsRvSGkwp39M1aeeAEr TzR4rB4oNPCZP9fEirX9Yb/yOgjbRK+f3PpWdLpHLV6FmQraw2UNGt0AWdPYm6+OuO+VEh o4JYrbBGulMMxKqWViVy++itRUt8WeH1qEuQTR8tp1FDQli1ez2EhrjdVWxdFXNE7RDC59 wPcTWVasb74B+MXNYSQCWNwK3R6H9r9b/+nP8lLCU4ymAVY0SDQaa1n1JBAdFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387150; a=rsa-sha256; cv=none; b=x5vgDbMCueApydF/ugaaSU/Aj9BhUB7Ef0ss7eh38F1vASaKnvUeDXjcMmW6t6wwvQxi7Q TqyH9OPqehtmWvHnnH5M14wji0cgDHKU0eSezh7k/cxZGpjs3TlxzhvOOOR3hX+11D5b1/ 6Mq9dHAD6ZJNlQBqfUU7Ql3S8pmeYNXcet7L/SGuW8AjrZERg2Cawx6hqewx4m/jv2sqwb hvRbfAsFTwLnS2RFAefY8h9YJB/cpyqwqkYIjr0WcK3fjlZZCg1ikKPPC4Ux7TTJGEOqVG 58rXUEFsKL1TNsbPbJNXkDFyfDqyW9Y4nq3cDKPXgC79C9UzD3z88ql/G7djMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVP6Z4tzZTq for ; Fri, 02 Jan 2026 20:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 02624874966d - stable/13 - bsd.sys.mk: suppress some new clang 21 warnings for 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 02624874966d57e482baa6f0d1e87c37608506dc Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:29 +0000 Message-Id: <6958300d.bd16.38c638db@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=02624874966d57e482baa6f0d1e87c37608506dc commit 02624874966d57e482baa6f0d1e87c37608506dc Author: Dimitry Andric AuthorDate: 2025-12-25 18:44:34 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:49:54 +0000 bsd.sys.mk: suppress some new clang 21 warnings for C++ Otherwise, these lead to many -Werror warnings in libc++ headers, due to our use of -Wsystem-headers, which is not officially supported upstream: Suppress -Wc++20-extensions, due to: /usr/include/c++/v1/__algorithm/simd_utils.h:96:50: error: explicit template parameter list for lambdas is a C++20 extension [-Werror,-Wc++20-extensions] 96 | inline constexpr size_t __simd_vector_size_v = []() -> size_t { | ^ Suppress -Wc++23-lambda-attributes, due to: /usr/include/c++/v1/__format/format_functions.h:462:32: error: an attribute specifier sequence in this position is a C++23 extension [-Werror,-Wc++23-lambda-attributes] 462 | if (bool __is_identity = [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated | ^ Suppress -Wnullability-completeness, due to: /usr/include/c++/v1/string:1068:80: error: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Werror,-Wnullability-completeness] 1068 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n) { | ^ MFC after: 3 days (cherry picked from commit 63d1c3c43690ff3c3e76e1fb03c8640fe30a2663) --- share/mk/bsd.sys.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index e537d7f045c4..e3401bb35e77 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -99,6 +99,11 @@ CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter # Similar to gcc >= 8.1 -Wno-error=cast-function-type below CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000 +CXXWARNFLAGS.clang+= -Wno-c++20-extensions +CXXWARNFLAGS.clang+= -Wno-c++23-lambda-attributes +CXXWARNFLAGS.clang+= -Wno-nullability-completeness +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Fri Jan 2 20:52: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 4djbVP4NC4z6MFhS for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVN6bsMz3qw4 for ; Fri, 02 Jan 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQtcDmzO9/2eiZ0KWXDzbESN9Zpy8HQl+3kgPX6y/Wg=; b=N4F+B6sNKIHMW9VyYdDcB96L2QxhAfvoZMlj4HDRZHiDqlaVRf80A1l3A2t/gzqyqDb+Xs w/mrZDi32W/bTyUDkrXaP/B9sD2FVCy86+Ar6weNup4bqBuVhBbI8vn0uP9NG00m28/Q6v p2tVY3FegFyMYBH7FWcPIzUNiR/X+ZRySx3wrwKDJ0u/S5zxXnGjqWRJt7WodyZh7wgkJ1 2Pk9FIoGgt/JGDNarHa7yfGr+Pvm3bY0eEkgHzV0lB0sMzjl7daSHGqmbnFUfgLnuehvZu mNq2zNpuyDW/yJl4dustX0oDdX6vApxJwVVKxvUSlvDMXG+Wr0NVEI9BlBNeOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQtcDmzO9/2eiZ0KWXDzbESN9Zpy8HQl+3kgPX6y/Wg=; b=qyBjmE2gq5Axtx5SV3jWMX1H1GOIu47QqraqqXfBSmiRqnYl1ZZ38FNH19u6AgdOiqenIy GG7HIEe/B8OggsycPWO4tpqPwcokr/9zon/4+tgGOw8WhAV/eVTRbmL5lKRBwSswu284fZ JkIiS43m6mjqPMxgWFQxX8+mWpsEUzuSCSj2CIsF/iCJPyg7SH1zfZPSmzjAnYTKNU5fbk 06FfVmCKLp+sda2mVcJv1Emrv7VKwmtUw0ILZkzaTufL5ZHYRCvkCf7KPRsNe7/ErZdTKX nRSxQUNDJvoDWgwxwp3nIi8IukFTh3Zowk9xvhkVaUwCsHs24qv7WUgrNSiMIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387148; a=rsa-sha256; cv=none; b=UJyFaxAVKHXZuv2kvY6oTtfGvsSMHkghvgA+MI1GxmfiY4DJkmu2P/XY/NTc/ppkkyS5sc x7oWXEY2/Nhf+rRKtVpW13Bedu+2VBfZ/Bc5Ni4g6ycFyzC3VWDGimWbLa3mgqADuTzMx3 c9AnjuTWkfkds/qZVkauNHyljPyayaiPilh884fl0QCigW8m43vsxMs0P2vQ7031yWfZYr yjHe0dXyOkKHPWi1z0IzeQHItNd2f7sM0RXUtBMmECAbN2tuMa7v5XjKXcJ/MfUipiy1Yj Pf2NZyigj7t1DEAouwZavn0IRf19MzAOWkbf13r34mVB0inlHv/+Fgeq3MbsWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVN6516zZTp for ; Fri, 02 Jan 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a8bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3015ca9407d1 - stable/13 - sh: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3015ca9407d14876b1b6e8babc5b94acd939af68 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:28 +0000 Message-Id: <6958300c.a8bf.bb890a2@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3015ca9407d14876b1b6e8babc5b94acd939af68 commit 3015ca9407d14876b1b6e8babc5b94acd939af68 Author: Dimitry Andric AuthorDate: 2025-12-25 20:13:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:49:46 +0000 sh: avoid warnings about too-long initializer strings Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid warnings from clang 21 similar to: bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; | ^~~~~~~~~~~~~~~~~~~~~ bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 153 | {"==", STREQ}, | ^~~~ MFC after: 3 days Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D54362 (cherry picked from commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802) --- bin/sh/options.h | 2 +- bin/test/test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sh/options.h b/bin/sh/options.h index cd28baeeed6d..94fba049d2d4 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -75,7 +75,7 @@ extern char optval[NOPTS]; extern const char optletter[NSHORTOPTS]; #ifdef DEFINE_OPTIONS char optval[NOPTS]; -const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; +const char optletter[NSHORTOPTS] __nonstring = "efIimnsxvVECabupTPh"; static const unsigned char optname[] = "\007errexit" "\006noglob" diff --git a/bin/test/test.c b/bin/test/test.c index 1cb3eca8fe13..b8f6845c221f 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -117,7 +117,7 @@ enum token { #define TOKEN_TYPE(token) ((token) & 0xff00) static const struct t_op { - char op_text[2]; + char op_text[2] __nonstring; short op_num; } ops1[] = { {"=", STREQ}, From nobody Fri Jan 2 20: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 4djbVT1yzqz6MFhd for ; Fri, 02 Jan 2026 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVS1v8fz3r1q for ; Fri, 02 Jan 2026 20:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fxt+B+Gz+kvubxNDRvNtI8GdiPQlnaR20Qrxbgy7iUw=; b=OXpV1sYNHa/g1x/uoH9s7AjtZZRJuQJaxUzh0Rg+udU17pgT6lfngBMB7cMd8h+Kz40YOa ewFO/uGti76523204nFcrGhUplDu5dmhHe/n6mhfK4iPgqVh1csFsCDAxn60ia7gs8wZ07 AI3z/K7ZbPJGp7hIaUsCznBQBvKebO1vy6cs9IRZSPqqzggL2Gz3Ivh9OJqECl1NUVfegN wTm8eKxRMmEw2FOAncqJzQIN1u0ZQ9dGbLWweYzz2VnTgvlvsQNoBlhFbftE51xeMw6Oxg Lu9CxuyV3v+C7QDIbptOJjToOgfIVPv0g8HKIuI3+RXtyQUZt1NjKjc/5pA84w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fxt+B+Gz+kvubxNDRvNtI8GdiPQlnaR20Qrxbgy7iUw=; b=IkR2Nh+dygFl2/zba+ghRciZVDG+CcWH1SVfkHnT27m+3QhTVHI4blkwgfgNtWMRChIhSZ MiQPOnKHedW0i0eAe9lnR5jaw/kAg2TDmt6VyhpopgmpY5BqmcVuPintPoCC1PpDx2vqbu FzfVWA8YvCy36er2NMjkL3HDFz1Ejfr9gbDP9jiJVDv+D6e2JVC+DgCBucmw/cue7mWkIV iGxX4FSKkB1CJ0P6B/cRBHV+t7NP8R/FAJu7Ro4aJBx3QuIcq0g4RweRiJagQFmqGXmXkl LAMlJNxcrBhf26WvXAJnxQWO60NH3UV/Eea1EzynH7RLO3I8emW8bku8Whmwuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387152; a=rsa-sha256; cv=none; b=kvP60h/TYX3EMupqvFD9dyLt+GXMsSJ3EsFAVKxRxEwWmiV7IR/goJI2Js70DEP09d+Njd bzjPALNjVaifhiVBXfAAvFNhR6UukmUrfvDLzysQQrKkdEU+ZcpbeKe1RAf6tORrP9X1Uc WGdFIYg+qms8eF9Z8+P9sNm8C7NuZ5QQSsbs7E1pWW0HRXtb8IDDLrWZp820cCjt7H8VP1 WAK5CMsUcDB3aRxUUS+DxOZfd2yG0eTwzSs1VHdzfG5JeGpJyCK5n8AL1bnsq1SUpK/Axt RY2wf0AxWavnwmkvfNcERkIRZquCg/AzhhEa8/Af/Aa/O4ZrGbma0QbEqPt9jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVS1CVrzb3J for ; Fri, 02 Jan 2026 20:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd1a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 936112e7ff70 - stable/13 - ncurses: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 936112e7ff707e3a9cfdbcc3737bed580f400d6b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:32 +0000 Message-Id: <69583010.bd1a.1ca2e1f5@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=936112e7ff707e3a9cfdbcc3737bed580f400d6b commit 936112e7ff707e3a9cfdbcc3737bed580f400d6b Author: Dimitry Andric AuthorDate: 2025-12-30 12:48:07 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:50:13 +0000 ncurses: avoid warnings about too-long initializer strings Increase the size of `assoc::from` to 8 bytes, to avoid warnings from clang 21 similar to: contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 702 | DATA("\033[2J", "ED2"), /* clear page */ | ^~~~~~~~~ contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 716 | DATA("\033[!p", "DECSTR"), /* soft reset */ | ^~~~~~~~~ Reviewed by: markj Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54371 (cherry picked from commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083) --- contrib/ncurses/progs/infocmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index f42ff3416ece..92a56b01669d 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -660,7 +660,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; From nobody Fri Jan 2 20:52: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 4djbVR6hmKz6MFf7 for ; Fri, 02 Jan 2026 20:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVR0rz2z3rHC for ; Fri, 02 Jan 2026 20:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387151; 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=AEvhvTk1/0uYL8lR5VZkkgsHjmptooRK877nhjCl8k8=; b=mIpAESjJM1nTHY71mTCPyiPb18L8rz56ZZ2CB+k/pdsFE3OJmhtaQna24AGg5phwU3jiiR +9kVHOMMDHMTrE/JoEcNJ/dY86FTuNW5ytjfgS3kd85r8OgNL00TH1iTLSu9ToepLCsAgp m+T4OzOg/mKGhoRpOcBMelJyTvACEK3imZ8SM1NjNlcxPFxQjOKi+vnpW+3adx9xOWpw0X Bl7cLwkG+NTwVC9UKQo/DMT48halW2bmzEgDK3GcC6N3t/yilSpGBeSD53h3LlRthseeiU t6awMpFzgeh6zDo1JRQxUkgfcWziG++yosAgQxoLnSYOHKTG5XLVVmujUKmZyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387151; 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=AEvhvTk1/0uYL8lR5VZkkgsHjmptooRK877nhjCl8k8=; b=oGl7lZS4tptmT+SHcOuSe8zgLLaFrHaDe6C/nX83gyQgiPggM7WZPZjjgKZiURgQJ89ZJT ePM+thyvyc2CCdldpvD6qltkXxKGn8XN9gvE1+dT7PFm1Oz1v8iKvX+of/xqatfB1gzvZ8 K+c4CWQrkiBUj5/B+6vcLIyxAQGRFS/4BBXTTEaVAYLOO7LCuO/VgvEsk3DWBljcRlRFso +Qp34Nn/AtQixSldLz1sqtTw9AjvgR03FCQ2Ghsj5DADiQl0cjw3RiD17PjnmwDDo4I69B +HysX/2uyT7qjffCgaTPjmBshWQRZRVn58GWGrEw10Nrs3H66uAUOeYav9pnGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387151; a=rsa-sha256; cv=none; b=vrg36zwe26Ss3AUBw5AWF8bgOaPXdG0FGbritbS8en0FFA4XJC7K8RcEl32jKdurQmbV8j 8nrSA3OCPdl7tvUZ8ktdKbArIugE23ecdnIL/EVaGjqFrYlR2KlsDk7hj1ZmLD23DWTgUC ACwH80iBzid3m6TFJKdlNydTNlGHl/3WwIPh8ECLHisWVjwyBYC8hE8YjKV1aR14Jiuu+z V6T83cpRj+v2x2I86E7V6CKsoRKtxA7auPzVutmnS3od1hIK5XQyC5+Fj07pKYLyb+bXbU KLhMmF+gP2utvKFpOwWbAsXE58LkRovAe+sQlT8WAlphOEZqjlRQYN15ahvlmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVR0H26zZTr for ; Fri, 02 Jan 2026 20:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a2e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Dimitry Andric Subject: git: 958f2ab6d400 - stable/13 - compat: linux: use appropriate variables for copying out old timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 958f2ab6d400de5a8990c392d17eecaf2e47e6c4 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:31 +0000 Message-Id: <6958300f.a2e5.7c747a5d@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=958f2ab6d400de5a8990c392d17eecaf2e47e6c4 commit 958f2ab6d400de5a8990c392d17eecaf2e47e6c4 Author: Kyle Evans AuthorDate: 2025-12-28 22:02:04 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:49:59 +0000 compat: linux: use appropriate variables for copying out old timers We copyout &l_oval but do the conversions into &l_val, leaving us with stack garbage. A build with an LLVM21 cross-toolchain seems to catch this. Reported by: Florian Limberger Reviewed by: markj Fixes: a1fd2911ddb06 ("linux(4): Implement timer_settime64 syscall.") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52985 (cherry picked from commit 541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c) --- sys/compat/linux/linux_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index bfa17d7e8aa5..632c4c530eec 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -131,7 +131,7 @@ linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec(&l_val, &val); + error = native_to_linux_itimerspec(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } @@ -158,7 +158,7 @@ linux_timer_settime64(struct thread *td, struct linux_timer_settime64_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec64(&l_val, &val); + error = native_to_linux_itimerspec64(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } From nobody Fri Jan 2 20:52: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 4djbVT5rKsz6MFjd for ; Fri, 02 Jan 2026 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVT2s9pz3rHg for ; Fri, 02 Jan 2026 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvU6Zi5tAz5m/OUajehOuLMwYY+R1CGHgrAFbla2KFU=; b=F4aQJ+lyuXjiTSqCsTZcZwy/1mLVJUORK7HSl1b/F9iRmGYYaTB07NoeOqTgfsAB9W5gsh S1F+F6dNGqyjfZnA8/u6ZSWvtcZaClcaBpSDI39gnAlETCQ9WjJVzDO3rtSL3nSQ9wrwdR lS8Ixn8dXgHiZgwv/KCQZ4cmxDV2DzMbS1boXUqHtBQrcsQmqxPRrYUN8HVnEVzJ9xD6bc KTotLasEaXfxVWhqLIzEQx2M2u9op6suUrWl3bjbeJUEaPF4dlhqpdxc+Ou54WPAvz2YD4 4cLQM6uYEvX9L/FrMKrohnICC2/HTTRy5SPT4k/EIH7yiWcC6fWqBqYgb1Vixg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvU6Zi5tAz5m/OUajehOuLMwYY+R1CGHgrAFbla2KFU=; b=nhlNSr/ku9dXkP1OozYo0Gt8/TydjXtqvCahA55m+QhytoRwyk/bUfSL7eLhbIFMXDSAgL OmQx2ngXcEpdvHY8LyPNS80MJ3aK0BpWyTnaEGCA7FWAt24ETgnCCgQzte+ODEHPrjWpif GY01EWT4KUzPJVTIzD8Ul/QyL8KbzHcN5KK1Ptd347dGzQnN2nwPA0rgu05GdO6jPvtNYS QMm4pkxVf3NKv0y27nyA0kF3j5iMdJ9K8W14hQahtaQbAfL18lPK+keuUQBwgxr0gaLP0d 66tQCewMJELkQLR8Kn5+ytGgdk+fk6nv4EmwxTrNcwlqUlSw6l6o/ZejxTKvOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387153; a=rsa-sha256; cv=none; b=LUzNKynbs0z9884Hoh72XdB04qgIX5hDBghF10S4Zv1CN/WMtTI2TAKInsKPbA82kv0usX AdjnsER7Pj79V6qu3o812VNaEYYaZ2zdl6cDFgAsieu+9xfo8Q9TfSkcACdxwU6thtccDv yLGsQ2isTqRYejFaNnVsOFqlFtdNKSmoEjki6SgIbc5WMJ38t9/zx2dyfw8B2q+SMI1cp3 zU/Z1YyHaDeNnOpQtgzXzEmCkCmAF/ZCkeRQq19UUIC1SOOejo96UHNy8S6Ys7W6l2nYDd wSEJg2n4EkGeYPIlXECJLcoOLdupwfz/jHX1fhaDw72Gf8iXvLzRUF6jLzjpFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVT23bqzbHb for ; Fri, 02 Jan 2026 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b0f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f5b76cb51e2c - stable/13 - crypto: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5b76cb51e2c5b5b939b4d759379907c69ea31db Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:33 +0000 Message-Id: <69583011.b0f0.29123ad0@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b76cb51e2c5b5b939b4d759379907c69ea31db commit f5b76cb51e2c5b5b939b4d759379907c69ea31db Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:50:19 +0000 crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 (cherry picked from commit 710ec409dffed3306ced253bba85dbdc7758510b) --- sys/crypto/chacha20/chacha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c index e22c348d14bd..8ce69226635f 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -51,8 +51,8 @@ typedef struct chacha_ctx chacha_ctx; a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); -static const char sigma[16] = "expand 32-byte k"; -static const char tau[16] = "expand 16-byte k"; +static const char sigma[16] __nonstring = "expand 32-byte k"; +static const char tau[16] __nonstring = "expand 16-byte k"; LOCAL void chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) From nobody Sat Jan 3 02:53:16 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 4djlVh3mk6z6Mkjp for ; Sat, 03 Jan 2026 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djlVh3JYdz3vpr for ; Sat, 03 Jan 2026 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767408796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PTDWIFJfH8atv0gTvA8u4ivrPAQhpo7K7Ny7d6HDlI=; b=yvMzVbykeeLZ6bOZnCSKCq6rgSnMNs1a4CCdiut/+QQjJtjWivet1RHbXZbUUdr63sdog0 e9BpK1H1eJSOi+8IUfAK4qVLlr84r14DDNEwCPqkBC737EGKINbhoPXOtnFZlX3oD/IHp+ adfk8sjbzR8RgmxhfyeAZi/mDIsXXRoud7FDB4ROB1sydKQV9D4H/OMDDSsx9TQuzD7eT/ 5x28W8I+S/IT0xh+zkVeQlexxbaTIgI/vKdcghh8Ohw0Obs+ZWfRBA28K5auwoD+3PX0ti 23UTtlSTbIVxODGsaZWeT4/RZaT/PumlkvT2PGkUvxSiOmUMzKzGwg09ZFa/uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767408796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PTDWIFJfH8atv0gTvA8u4ivrPAQhpo7K7Ny7d6HDlI=; b=luqSi6ufLM2To9nUURZ0UXwV4XmO8Hz0ACFEI0z8Yywe5rVpVc6VtfSTliAQYIPQAG77EZ pqNi3LettZy+bYCNKQGi8rfml7R9SvdwlDWvcuwBcaB3/B+oz+51XVHghWjv/iJ6qrliSN DClGND6WcJ4MeIVAxYzE3VDhKcGpUy+qp0gnw+34dTSchs35r7pi3GCbF961chq6xRNJuh XuRWrvH0rI5HYbip9GvBhtZtDrKYiI1lZOFBUj9VbhH1iwiPCZqJ5iP1TfqPiETG8UN22O RXDmREYvwgdsS+Bgyow2N9jsf/PTyrsrlRZE4bsVNGFDgaRI2egnQwVBWi+KTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767408796; a=rsa-sha256; cv=none; b=k27Ns4UeYY5zENgFv3jyp6sRXCHpsUCOQQ+y3o+FS2OjKWxAMEpcOb34o8XmLNeSSyz/YX 2JqfRganIJKZbonFq/oBq8fK3T893A1Ya/kr3EwAD8vUg8mj/0hGHFQS7pXglyh2lqRDNr zZiuLrPHzQhNI97DaDlUesGO9qT9LgGUxlwSJpsktA8lPGFUdUED0Fh974ITJ6tSFVPYLf nrGfWu/24JXqyqREbQcpksVHFSsbT2CCVFj7iNlNeehL7TLqEa80Nea7DjUsngAViTmLTj HIbV/6BaY5T5eL5xbvi8DU9ezyWt/JfAFEDupb7dNzf97siOfLLG9RprXbvjzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djlVh1WR7zmMT for ; Sat, 03 Jan 2026 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4623e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 02:53:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 3e6e4e4a0d42 - main - hwpstate: add CPPC support for pstate driver on AMD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e6e4e4a0d42fa24f3b2a1c087e9ad25f9594081 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 02:53:16 +0000 Message-Id: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=3e6e4e4a0d42fa24f3b2a1c087e9ad25f9594081 commit 3e6e4e4a0d42fa24f3b2a1c087e9ad25f9594081 Author: ShengYi Hung AuthorDate: 2025-07-08 11:45:26 +0000 Commit: ShengYi Hung CommitDate: 2026-01-03 02:52:51 +0000 hwpstate: add CPPC support for pstate driver on AMD Implement CPPC interface for AMD Pstate Driver. This feature is only enabled when the CPUID shows it support CPPC. The CPPC is implemneted by the following steps: 1. Write MSR to enable it. 2. Read capability registert which indicates binary value of levels about lowest, best energy efficient, guarantee, and max performance. 3. Write request register with epp in energy balanced mode. And let CPU and firmware to enter autonomous mode. Also, create a sysctl handler to allow userspace to change epp value. In intel's hwpstate, The epp value can be in package level and core level. However, in AMD's one, there is only core level. Thus, to sync with the intel's code, we implement package level control in software and provide another sysctl (machdep.hwpstate_pkg_ctrl) to control it. Reviewed by: olce, khng Approved by: lwhsu (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49587 --- sys/x86/cpufreq/hwpstate_amd.c | 361 ++++++++++++++++++++++++++++++++++++++--- sys/x86/include/specialreg.h | 1 + 2 files changed, 337 insertions(+), 25 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index fc948dc90a15..4395e43a219f 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -8,6 +8,7 @@ * Copyright (c) 2009 Michael Reifenberger * Copyright (c) 2009 Norikatsu Shigemura * Copyright (c) 2008-2009 Gen Otsuji + * Copyright (c) 2025 ShengYi Hung * * This code is depending on kern_cpu.c, est.c, powernow.c, p4tcc.c, smist.c * in various parts. The authors of these files are Nate Lawson, @@ -55,6 +56,7 @@ #include #include #include +#include #include #include @@ -74,6 +76,15 @@ #define MSR_AMD_10H_11H_STATUS 0xc0010063 #define MSR_AMD_10H_11H_CONFIG 0xc0010064 +#define MSR_AMD_CPPC_CAPS_1 0xc00102b0 +#define MSR_AMD_CPPC_ENABLE 0xc00102b1 +#define MSR_AMD_CPPC_CAPS_2 0xc00102b2 +#define MSR_AMD_CPPC_REQUEST 0xc00102b3 +#define MSR_AMD_CPPC_STATUS 0xc00102b4 + +#define MSR_AMD_PWR_ACC 0xc001007a +#define MSR_AMD_PWR_ACC_MX 0xc001007b + #define AMD_10H_11H_MAX_STATES 16 /* for MSR_AMD_10H_11H_LIMIT C001_0061 */ @@ -92,6 +103,23 @@ #define AMD_1AH_CUR_FID(msr) ((msr) & 0xFFF) +#define AMD_CPPC_CAPS_1_HIGH_PERF_BITS 0xff000000 +#define AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS 0x00ff0000 +#define AMD_CPPC_CAPS_1_LOW_NONLIN_PERF_BITS 0x0000ff00 +#define AMD_CPPC_CAPS_1_LOW_PERF_BITS 0x000000ff + +#define AMD_CPPC_REQUEST_ENERGY_PERF_BITS 0xff000000 +#define AMD_CPPC_REQUEST_DES_PERF_BITS 0x00ff0000 +#define AMD_CPPC_REQUEST_MIN_PERF_BITS 0x0000ff00 +#define AMD_CPPC_REQUEST_MAX_PERF_BITS 0x000000ff + +#define HWP_AMD_CLASSNAME "hwpstate_amd" + +#define BITS_VALUE(bits, num) (((num) & (bits)) >> (ffsll((bits)) - 1)) +#define BITS_WITH_VALUE(bits, val) ((uintmax_t)(val) << (ffsll((bits)) - 1)) +#define SET_BITS_VALUE(var, bits, val) \ + ((var) = (var) & ~(bits) | BITS_WITH_VALUE((bits), (val))) + #define HWPSTATE_DEBUG(dev, msg...) \ do { \ if (hwpstate_verbose) \ @@ -106,10 +134,16 @@ struct hwpstate_setting { int pstate_id; /* P-State id */ }; +enum hwpstate_flags { + PSTATE_CPPC = 1, +}; + struct hwpstate_softc { device_t dev; - struct hwpstate_setting hwpstate_settings[AMD_10H_11H_MAX_STATES]; + struct hwpstate_setting hwpstate_settings[AMD_10H_11H_MAX_STATES]; int cfnum; + uint32_t flags; + uint64_t req; }; static void hwpstate_identify(driver_t *driver, device_t parent); @@ -140,6 +174,11 @@ SYSCTL_BOOL(_debug, OID_AUTO, hwpstate_pstate_limit, CTLFLAG_RWTUN, "If enabled (1), limit administrative control of P-states to the value in " "CurPstateLimit"); +static bool hwpstate_pkg_ctrl_enable = true; +SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, + &hwpstate_pkg_ctrl_enable, 0, + "Set 1 (default) to enable package-level control, 0 to disable"); + static device_method_t hwpstate_methods[] = { /* Device interface */ DEVMETHOD(device_identify, hwpstate_identify), @@ -159,8 +198,154 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; +static int +amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) +{ + device_t dev; + struct pcpu *pc; + struct sbuf *sb; + struct hwpstate_softc *sc; + uint64_t data; + int ret; + + sc = (struct hwpstate_softc *)arg1; + dev = sc->dev; + + pc = cpu_get_pcpu(dev); + if (pc == NULL) + return (ENXIO); + + sb = sbuf_new(NULL, NULL, 1024, SBUF_FIXEDLEN | SBUF_INCLUDENUL); + sbuf_putc(sb, '\n'); + thread_lock(curthread); + sched_bind(curthread, pc->pc_cpuid); + thread_unlock(curthread); + + rdmsr_safe(MSR_AMD_CPPC_ENABLE, &data); + sbuf_printf(sb, "CPU%d: HWP %sabled\n", pc->pc_cpuid, + ((data & 1) ? "En" : "Dis")); + + if (data == 0) { + ret = 0; + goto out; + } + + rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data); + sbuf_printf(sb, "\tHighest Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_HIGH_PERF_BITS, data)); + sbuf_printf(sb, "\tGuaranteed Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS, data)); + sbuf_printf(sb, "\tEfficient Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_LOW_NONLIN_PERF_BITS, data)); + sbuf_printf(sb, "\tLowest Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_LOW_PERF_BITS, data)); + sbuf_putc(sb, '\n'); + + rdmsr_safe(MSR_AMD_CPPC_REQUEST, &data); + +#define pkg_print(name, offset) \ + do { \ + sbuf_printf(sb, "\t%s: %03u\n", name, \ + (unsigned)(data >> offset) & 0xff); \ + } while (0) + + pkg_print("Requested Efficiency Performance Preference", 24); + pkg_print("Requested Desired Performance", 16); + pkg_print("Requested Maximum Performance", 8); + pkg_print("Requested Minimum Performance", 0); +#undef pkg_print + + sbuf_putc(sb, '\n'); + +out: + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); + + ret = sbuf_finish(sb); + if (ret == 0) + ret = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb)); + sbuf_delete(sb); + + return (ret); +} + +static bool +sysctl_epp_select_per_core(const device_t hwp_device, uint32_t val) +{ + struct hwpstate_softc *sc; + bool success = true; + int ret, cpuid; + + cpuid = cpu_get_pcpu(hwp_device)->pc_cpuid; + thread_lock(curthread); + sched_bind(curthread, cpuid); + thread_unlock(curthread); + sc = device_get_softc(hwp_device); + if (BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, sc->req) == val) + goto end; + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_ENERGY_PERF_BITS, val); + ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->req); + if (ret != 0) { + success = false; + device_printf(hwp_device, "Failed to set EPP to %u", val); + goto end; + } + +end: + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); + + return (success); +} + +static int +sysctl_epp_select(SYSCTL_HANDLER_ARGS) +{ + device_t dev, hwp_dev; + struct hwpstate_softc *sc; + const uint32_t max_energy_perf = + BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, (uint64_t)-1); + devclass_t dc; + uint32_t val; + int ret = 0; + int cpu; + + dev = oidp->oid_arg1; + sc = device_get_softc(dev); + + if (!(sc->flags & PSTATE_CPPC)) + return (ENODEV); + + val = BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, sc->req) * 100 / + max_energy_perf; + ret = sysctl_handle_int(oidp, &val, 0, req); + if (ret != 0 || req->newptr == NULL) + goto end; + if (val > 100) { + ret = EINVAL; + goto end; + } + val = (val * max_energy_perf) / 100; + + if (hwpstate_pkg_ctrl_enable) { + dc = devclass_find(HWP_AMD_CLASSNAME); + KASSERT(dc != NULL, + (HWP_AMD_CLASSNAME ": devclass cannot be null")); + CPU_FOREACH(cpu) { + hwp_dev = devclass_get_device(dc, cpu); + sysctl_epp_select_per_core(hwp_dev, val); + } + } else + sysctl_epp_select_per_core(dev, val); + +end: + return (ret); +} + static driver_t hwpstate_driver = { - "hwpstate", + HWP_AMD_CLASSNAME, hwpstate_methods, sizeof(struct hwpstate_softc), }; @@ -269,6 +454,8 @@ hwpstate_set(device_t dev, const struct cf_setting *cf) if (cf == NULL) return (EINVAL); sc = device_get_softc(dev); + if (sc->flags & PSTATE_CPPC) + return (EOPNOTSUPP); set = sc->hwpstate_settings; for (i = 0; i < sc->cfnum; i++) if (CPUFREQ_CMP(cf->freq, set[i].freq)) @@ -284,21 +471,38 @@ hwpstate_get(device_t dev, struct cf_setting *cf) { struct hwpstate_softc *sc; struct hwpstate_setting set; + struct pcpu *pc; uint64_t msr; + uint64_t rate; + int ret; sc = device_get_softc(dev); if (cf == NULL) return (EINVAL); - msr = rdmsr(MSR_AMD_10H_11H_STATUS); - if (msr >= sc->cfnum) - return (EINVAL); - set = sc->hwpstate_settings[msr]; - cf->freq = set.freq; - cf->volts = set.volts; - cf->power = set.power; - cf->lat = set.lat; - cf->dev = dev; + if (sc->flags & PSTATE_CPPC) { + pc = cpu_get_pcpu(dev); + if (pc == NULL) + return (ENXIO); + + memset(cf, CPUFREQ_VAL_UNKNOWN, sizeof(*cf)); + cf->dev = dev; + if ((ret = cpu_est_clockrate(pc->pc_cpuid, &rate))) + return (ret); + cf->freq = rate / 1000000; + } else { + msr = rdmsr(MSR_AMD_10H_11H_STATUS); + if (msr >= sc->cfnum) + return (EINVAL); + set = sc->hwpstate_settings[msr]; + + cf->freq = set.freq; + cf->volts = set.volts; + cf->power = set.power; + cf->lat = set.lat; + cf->dev = dev; + } + return (0); } @@ -312,6 +516,9 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) if (sets == NULL || count == NULL) return (EINVAL); sc = device_get_softc(dev); + if (sc->flags & PSTATE_CPPC) + return (EOPNOTSUPP); + if (*count < sc->cfnum) return (E2BIG); for (i = 0; i < sc->cfnum; i++, sets++) { @@ -330,19 +537,24 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) static int hwpstate_type(device_t dev, int *type) { + struct hwpstate_softc *sc; if (type == NULL) return (EINVAL); + sc = device_get_softc(dev); *type = CPUFREQ_TYPE_ABSOLUTE; + *type |= sc->flags & PSTATE_CPPC ? + CPUFREQ_FLAG_INFO_ONLY | CPUFREQ_FLAG_UNCACHED : + 0; return (0); } static void hwpstate_identify(driver_t *driver, device_t parent) { - - if (device_find_child(parent, "hwpstate", DEVICE_UNIT_ANY) != NULL) + if (device_find_child(parent, HWP_AMD_CLASSNAME, DEVICE_UNIT_ANY) != + NULL) return; if ((cpu_vendor_id != CPU_VENDOR_AMD || CPUID_TO_FAMILY(cpu_id) < 0x10) && @@ -357,14 +569,82 @@ hwpstate_identify(driver_t *driver, device_t parent) return; } - if (resource_disabled("hwpstate", 0)) + if (resource_disabled(HWP_AMD_CLASSNAME, 0)) return; - if (BUS_ADD_CHILD(parent, 10, "hwpstate", device_get_unit(parent)) - == NULL) + if (BUS_ADD_CHILD(parent, 10, HWP_AMD_CLASSNAME, + device_get_unit(parent)) == NULL) device_printf(parent, "hwpstate: add child failed\n"); } +static int +amd_set_autonomous_hwp(struct hwpstate_softc *sc) +{ + struct pcpu *pc; + device_t dev; + uint64_t caps; + int ret; + + dev = sc->dev; + pc = cpu_get_pcpu(dev); + if (pc == NULL) + return (ENXIO); + + thread_lock(curthread); + sched_bind(curthread, pc->pc_cpuid); + thread_unlock(curthread); + + ret = wrmsr_safe(MSR_AMD_CPPC_ENABLE, 1); + if (ret != 0) { + device_printf(dev, "Failed to enable cppc for cpu%d (%d)\n", + pc->pc_cpuid, ret); + goto out; + } + + ret = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->req); + if (ret != 0) { + device_printf(dev, + "Failed to read CPPC request MSR for cpu%d (%d)\n", + pc->pc_cpuid, ret); + goto out; + } + + ret = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &caps); + if (ret != 0) { + device_printf(dev, + "Failed to read HWP capabilities MSR for cpu%d (%d)\n", + pc->pc_cpuid, ret); + goto out; + } + + /* + * In Intel's reference manual, the default value of EPP is 0x80u which + * is the balanced mode. For consistency, we set the same value in AMD's + * CPPC driver. + */ + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_ENERGY_PERF_BITS, 0x80); + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MIN_PERF_BITS, + BITS_VALUE(AMD_CPPC_CAPS_1_LOW_PERF_BITS, caps)); + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MAX_PERF_BITS, + BITS_VALUE(AMD_CPPC_CAPS_1_HIGH_PERF_BITS, caps)); + /* enable autonomous mode by setting desired performance to 0 */ + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); + + ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->req); + if (ret) { + device_printf(dev, + "Failed to setup autonomous HWP for cpu%d\n", + pc->pc_cpuid); + goto out; + } +out: + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); + + return (ret); +} + static int hwpstate_probe(device_t dev) { @@ -373,15 +653,25 @@ hwpstate_probe(device_t dev) uint64_t msr; int error, type; - /* - * Only hwpstate0. - * It goes well with acpi_throttle. - */ - if (device_get_unit(dev) != 0) - return (ENXIO); - sc = device_get_softc(dev); + + if (amd_extended_feature_extensions & AMDFEID_CPPC) { + sc->flags |= PSTATE_CPPC; + device_set_desc(dev, + "AMD Collaborative Processor Performance Control (CPPC)"); + } else { + /* + * No CPPC support. Only keep hwpstate0, it goes well with + * acpi_throttle. + */ + if (device_get_unit(dev) != 0) + return (ENXIO); + device_set_desc(dev, "Cool`n'Quiet 2.0"); + } + sc->dev = dev; + if (sc->flags & PSTATE_CPPC) + return (0); /* * Check if acpi_perf has INFO only flag. @@ -433,14 +723,32 @@ hwpstate_probe(device_t dev) if (error) return (error); - device_set_desc(dev, "Cool`n'Quiet 2.0"); return (0); } static int hwpstate_attach(device_t dev) { + struct hwpstate_softc *sc; + int res; + sc = device_get_softc(dev); + if (sc->flags & PSTATE_CPPC) { + if ((res = amd_set_autonomous_hwp(sc))) + return res; + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_STATIC_CHILDREN(_debug), OID_AUTO, + device_get_nameunit(dev), + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP | CTLFLAG_MPSAFE, + sc, 0, amdhwp_dump_sysctl_handler, "A", ""); + + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "epp", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, + sysctl_epp_select, "I", + "Efficiency/Performance Preference " + "(range from 0, most performant, through 100, most efficient)"); + } return (cpufreq_register(dev)); } @@ -584,8 +892,11 @@ out: static int hwpstate_detach(device_t dev) { + struct hwpstate_softc *sc; - hwpstate_goto_pstate(dev, 0); + sc = device_get_softc(dev); + if (!(sc->flags & PSTATE_CPPC)) + hwpstate_goto_pstate(dev, 0); return (cpufreq_unregister(dev)); } diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index e9dde5c3b46a..3e5f598cd82a 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -418,6 +418,7 @@ #define AMDPM_HW_PSTATE 0x00000080 #define AMDPM_TSC_INVARIANT 0x00000100 #define AMDPM_CPB 0x00000200 +#define AMDPM_PWR_REPORT 0x00001000 /* * AMD extended function 8000_0008h ebx info (amd_extended_feature_extensions) From nobody Sat Jan 3 02: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 4djlbV6mq0z6Ml0n for ; Sat, 03 Jan 2026 02:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djlbV4Q66z3wMx for ; Sat, 03 Jan 2026 02:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767409046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAbFGC9sIGT4UIZH+ex0ovy51MRr2mT3FxEK6AGkevU=; b=ZtZXCNtoF/inx+S1wFwXQpEWG5Y/9Uw2duMyR3r5QZdbp8DLNlQ+FzN7JtWRE1oIyeaCsl GdePgZ0lFenObFI0gF5ihoX3xpyKP1ucfAMQHGf3D8wmaHZ4glT9QzSfk1sVkcoC3esHAh 3Z2kw3jamtGZVS36Rv8ch+UDR/BBw8QMDwB1tGzgB7EqBRGvhhF71ao8YuQsnu6Q+eqlwQ ifzwOWNV+WsU1A42XpazLPTu8Wq+vbcaVnMRtwGYRUEsGLqQYLGn47+StELbCkSzjniMvl nNSwLE/prF3Jto0AbPBzwIpKWf1Cl29NFITB319JGTxc2WreDGUF5XtQ5ukqNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767409046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAbFGC9sIGT4UIZH+ex0ovy51MRr2mT3FxEK6AGkevU=; b=rUPPbZogeDTjc7wT+pWw65tyFGswNHyj/g7zPcO8JVOeHbjv6xPy/ij8kWq9Q2Kqdlz/rO xsHN3wOglTg8WLkaSWt8noG8DIC3kvp7DRlfGh9ou0AJ1KJVpj5FPTiNdGrtqNAYrGi85G M4o/PHUWWkQS1ZwfIof9xd9xo2d+MWvyCOY6d3VfO3M+mU9xHmukTCIzDg4HtPglVrsOMs asoJT4PpXaEI93Mow2vGdmZeQCKyreshMQUYxnhYfccDoeMyU88EM52bwS34VhVLdOmKi9 0Em55WKCMWPtsaJCrHbpzLHxePuI1dbMIqWGlp2qeqyDSqMirSAieShwwTwN7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767409046; a=rsa-sha256; cv=none; b=c5xbH1GOUhxlyhR8+5NoPKubht+fk0VHZfU+C41PDVghP++fFvVqSjfn+orlCDjIdLjb5u 5SFjF4trGM8XmFwexJ9r55NS79H3PGG82Pp4P0gVB5kp4/4gVcT3RcDrMzIaTTmNqhVNTS wePn2T17sQ5YNE/Tgw61krMafCgBSLR455X8kNzgm/4yAP3YI4ueITh/rMWPcEDlgFKkdU 7PSHhxNgJlJHgKklU4zBoB2nPewrUNO8a8qa1UaRaXWl90obpbvKn3SgpFB9eUAYognlLG VCDFezarAGo+DS/rPWZT9x/6AkBdSTv2GBrOB2CzKYEg3UQWF3IaXpSnaZzAjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djlbV3NnczmZR for ; Sat, 03 Jan 2026 02:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 02:57:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 2e92aeede85c - main - bridge: Allow BRDGSIFVLANSET without IFBRF_VLANFILTER List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e92aeede85c8986bd6f4dde65d2ac2449eccf51 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 02:57:26 +0000 Message-Id: <69588596.46e51.576d9e8f@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2e92aeede85c8986bd6f4dde65d2ac2449eccf51 commit 2e92aeede85c8986bd6f4dde65d2ac2449eccf51 Author: Lexi Winter AuthorDate: 2026-01-03 01:13:22 +0000 Commit: Lexi Winter CommitDate: 2026-01-03 02:57:16 +0000 bridge: Allow BRDGSIFVLANSET without IFBRF_VLANFILTER Currently, we disallow BRDGSIFVLANSET when IFBRF_VLANFILTER is disabled. There's no particular reason to do this, and it causes some undesirable behaviour such as not being able to remove the tagged config on a member after disabling vlanfilter on the bridge. Remove the restriction so BRDGSIFVLANSET is always accepted. PR: 292019 MFC after: 1 week Reviewed by: zlei, p.mousavizadeh_protonmail.com Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54435 --- sys/net/if_bridge.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 9a468a8eb462..5bdd8613245e 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1990,9 +1990,6 @@ bridge_ioctl_sifvlanset(struct bridge_softc *sc, void *arg) struct ifbif_vlan_req *req = arg; struct bridge_iflist *bif; - if ((sc->sc_flags & IFBRF_VLANFILTER) == 0) - return (EXTERROR(EINVAL, "VLAN filtering not enabled")); - bif = bridge_lookup_member(sc, req->bv_ifname); if (bif == NULL) return (EXTERROR(ENOENT, "Interface is not a bridge member")); From nobody Sat Jan 3 06:11: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 4djqv957Xjz6MyQN for ; Sat, 03 Jan 2026 06:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djqv93mYxz4KTC for ; Sat, 03 Jan 2026 06:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767420677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uAzCS4cyn8OhFmfMH2Kw2wnctpizZKhbG3yohTA1Xco=; b=ft2Q2VO9rnyVXrK6UNJ7yxFY1nQvDQMwNT5iU0jBWMMQsr5RyXNh1sfOcFgGcjChrRptZ/ AJLApKdh7/3H2hep86pfYU/rnqiR+BZNS/61ZOjvD2RYpsZh6CVd8t7v1PWIfs6+ZKT2bu R/IayzNamrnMmlpGFrl4AWvgQvX4dE2oE1rPuA56r9M1kyPpJh9sKpreSc1JmOul2qV9oM Jv5Nxc6yTOnRULQtersz0PwAwOcLP97bXjD4CcPqUzt/CfJEoivITkgvBbLj7ysoSBHtaS fHbW05MAn+6T2HATSua9U5NeTFNi7kPkWiCyIbceyjw7qtVDr5MHO8ksKUewhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767420677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uAzCS4cyn8OhFmfMH2Kw2wnctpizZKhbG3yohTA1Xco=; b=QKoV+d3GAHujjzq5ZUP7TH/bv2nJv2cMT4IDHhMSmI99d2F5PS/5yPrR8S/7MUgtbMEY2d vV9JSVqO7RUcpwAa5FuxYtS0yYMi1RbRUTlC2jnwCpm4ODNwpkTGDzpbosr5VnYySeczim iJJZTEoRxOvFrK2Ft3yCgBlhlHnUNvmioMb2ZcMkRL/9OUJRwPksK1TmujX8cezqFk8KWL 068K+jgeF7oaZGqv3Oxg1ISfZTxSm9z2zSZJRpWaB4LuQ33M9pkU4FIxnUdRoL4hv9c2id a3FmmFgeFGk0iOX4uvPAt3Itj31QQzLWYCN0I+Vb3gDEis8cHUExmvj0MeAoWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767420677; a=rsa-sha256; cv=none; b=FiHwC5gdJ36z3Pdik8gHYdnu3fUVBoF4nOWLsN0hbinHzLm9vMXUXgzWN8qBdFFRLYAev/ oLZ5/OG47m9stpg0/CJxqCPw6H41qLeV5/nvMRIdkRJYEbETij2y3DSCAb9zHWgFT+A14/ Ate5phVmLvHJRS81KzlcP+Rb7Zw0mnXYdj0UxbQ5aUQDADjoshRo/H6XCMKHXHQLuWRnmF z9LLUALHcNQsX5iEATl+R6CLg4P4R7i1IpfDeEqjuaGD7kp5xWo7oLK5bw9Bl1OtCgqWV+ +2GUTEuP6ttvR781Pebg+HvrQdqaA55ixQg79fh1yRZwpXFWVk8y9RRLsk2s7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djqv935wDzsnq for ; Sat, 03 Jan 2026 06:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32dae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 06:11:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 3642ba2a9840 - main - hwpstate_amd: Fix compile 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 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: 3642ba2a9840734d83dd77ca4c1aa0ecb3bfe879 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 06:11:17 +0000 Message-Id: <6958b305.32dae.2c56e54e@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=3642ba2a9840734d83dd77ca4c1aa0ecb3bfe879 commit 3642ba2a9840734d83dd77ca4c1aa0ecb3bfe879 Author: ShengYi Hung AuthorDate: 2026-01-03 05:07:15 +0000 Commit: ShengYi Hung CommitDate: 2026-01-03 06:09:48 +0000 hwpstate_amd: Fix compile error Add parentheses between OR and AND operator to pass the compiler check. Approved by: lwhsu (mentor) Fixes: 3e6e4e4a0d42 ("hwpstate: add CPPC support for pstate driver on AMD") MFC aftert: 2 weeks Differential Revision: https://reviews.freebsd.org/D54465 --- sys/x86/cpufreq/hwpstate_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 4395e43a219f..ce0e0f6dd47a 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -118,7 +118,7 @@ #define BITS_VALUE(bits, num) (((num) & (bits)) >> (ffsll((bits)) - 1)) #define BITS_WITH_VALUE(bits, val) ((uintmax_t)(val) << (ffsll((bits)) - 1)) #define SET_BITS_VALUE(var, bits, val) \ - ((var) = (var) & ~(bits) | BITS_WITH_VALUE((bits), (val))) + ((var) = ((var) & ~(bits)) | BITS_WITH_VALUE((bits), (val))) #define HWPSTATE_DEBUG(dev, msg...) \ do { \ From nobody Sat Jan 3 09:10: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 4djvt76dNFz6LxBD for ; Sat, 03 Jan 2026 09:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvt74GMkz3Jgd for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pygJJMg/nIlaU2SGs9OHxu1MfIcKLwSo2+1bbEaZ+vA=; b=G7ZQhM8q+Rw6ftS3PVdy0zy+iZXhFWS5ZR4xhNCarbY9RTT/0k14MDCmdtqmMcYO91THNi f1muKQpk95qZl1b05mk3t8HjMq9gsGwhGrICtdAx7OCFRG1KlY9muPvGceo8DWKLtYOG6e q02+mPqOE2AUUL12guNLDYyUeVBOU7bdWthiAxZLBoqxxfrngtLiVXKducTY7iJ+QD3qPc z0Ok1stl723JE8w1nNoIHmjwisFzrFJSjlT51wbaI6qS3DpTe5wzff8lovygHkyAgG0ZtH nDwFs3m7DkC28AcPowz++Y4epNnO5bPd/2I/K52KklHn+8ijoY7hePBdab8lJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pygJJMg/nIlaU2SGs9OHxu1MfIcKLwSo2+1bbEaZ+vA=; b=mV6z2DSBrvxga9DvaPCOir0xZd1Ik1j431vge8zG6X5beQGNz/is21sdRuUR4p7wLV45JI qo6v4bqDrYqwRUNQQlMvotpzUOWRHgKT3t8ybR7JjReicop0KvA+2LVG5jYI8wYubuq31E tg3TCllRPzDLn0CcUnS53Cfyc/VzKSX4oq/vwv+TFp1MLLkALQbf/+oQU2GBjtMaRHScCs 5PsPxQeSL30cMQmIpbtLMABjj93PMy2zcOTGVze0/LyaHzyqXtm8/rLw3AILTP9BGJ2+6R ztJ2f72Ec0fwzL+hP5TWFbsP8fD+OOO5I978TduxY9lJil8VDYSYNiOEIPzEfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431439; a=rsa-sha256; cv=none; b=gOAqA4hvYCB994wax5zQT7qbImm3KtctVVlBvRELtVkyUixTbkGz7pxS4b3QihXgaqPlVr HDqO1oXMJZqM3k1iVf29k8gisYwJy4TrZYjLeRzDKUVIWkI4SvqPRi5OHklDBREvKvmqtR 6IF+6SdyZ4hfb7LKLFd1edjnrLJB4TCUiIzcaGqgFgF3or7bKy2AE0wkXCMim7BlHN5kb8 epIqLI6uIfIiNtezEm7qU4PzswfIiMpPgNZ0BDYpixwAE1nZ9vsDlPNOS/Veax28Ps/OGQ KVRS+mQAC8EFS65ixEzO2zYItgb76DQWCX7qUl4pgrRpHh+GNieGrDdIXIjUCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvt73K3kzxg0 for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:39 +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: f86148d2777d - main - linuxkpi: Correct kstrtobool List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f86148d2777d4d7985ed8f4ae957c41c44bd2484 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:39 +0000 Message-Id: <6958dd0f.98dc.3f85f227@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f86148d2777d4d7985ed8f4ae957c41c44bd2484 commit f86148d2777d4d7985ed8f4ae957c41c44bd2484 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:22 +0000 linuxkpi: Correct kstrtobool Implement the exact same logic as in Linux: * Accept 'e', 't', 'y', '1', "on" for true. * Accept 'd', 'f', 'n', '0', "of" for false. * Disregard any characters beyond that. * Check that the string is not null, but don't check the result pointer. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D54451 --- sys/compat/linuxkpi/common/include/linux/kstrtox.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kstrtox.h b/sys/compat/linuxkpi/common/include/linux/kstrtox.h index 6a145c409038..05bf94dd375d 100644 --- a/sys/compat/linuxkpi/common/include/linux/kstrtox.h +++ b/sys/compat/linuxkpi/common/include/linux/kstrtox.h @@ -249,22 +249,16 @@ kstrtoull(const char *cp, unsigned int base, unsigned long long *res) static inline int kstrtobool(const char *s, bool *res) { - size_t len; - - if (s == NULL || (len = strlen(s)) == 0 || res == NULL) + if (s == NULL || *s == '\0') return (-EINVAL); - /* skip newline character, if any */ - if (s[len - 1] == '\n') - len--; - - if (len == 1 && strchr("yY1", s[0]) != NULL) + if (strchr("eEtTyY1", s[0]) != NULL) *res = true; - else if (len == 1 && strchr("nN0", s[0]) != NULL) + else if (strchr("dDfFnN0", s[0]) != NULL) *res = false; - else if (strncasecmp("on", s, len) == 0) + else if (strncasecmp("on", s, 2) == 0) *res = true; - else if (strncasecmp("off", s, len) == 0) + else if (strncasecmp("of", s, 2) == 0) *res = false; else return (-EINVAL); From nobody Sat Jan 3 09:10: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 4djvt85XdLz6Lx1k for ; Sat, 03 Jan 2026 09:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvt83tMTz3Jqx for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzvfDxAR0hgkbJeKIH1YA1FElGb/F9iK1rPcCgNUh8Q=; b=jPJYRWZUiyYnaBiSfzbPP5kWHtNcV1vkc/iuCxEKYUtE+LsBWbLdmvgb4VmvChvcV9lH0u QpgoWXd4ky6oEcIJuw6il3MHlbRrAfDGjMGbyblcdhN4pW577dSchfuQFpUwkbohuBIuAG TNh6dbWsXe7P16q1u+/9ATZBMCzrWSrT/IoRUoymCXVGMQBDEASLOdaq1QKINWda0klFeu zAv4cDYSLYKtQ0Xm65O5t9y9ejPMetd/jHsbksUMX2GIqVKf+zHbUy6Ile/xX+gSOvQS0x ey3rLQmMp80VpHJIcoYoDm4aPtwznnGb/hA/6RMIT4S6FQwZ1WNYOwSYC9qZpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzvfDxAR0hgkbJeKIH1YA1FElGb/F9iK1rPcCgNUh8Q=; b=wUplWjNEoqRqzbZkYqCTV5xUo198mosI8Gp8CNiRHwdlhLlInx/KCNR175orJyugHXNtyW hHfgYPBJIJUf6dggWfx4SEnYug7BiwSmaKHfWPKZkxznywLmq7vVMod0njINuS3Ji0PgpE 5W4qIHJ+H4gk9gRvaU7gYG9GNO8gaKzcnuA7ozkxSLy+j8Anr43er97SwtBFZdadTZsg+5 9rdl4DHIjDOn13VUZ8dSVXcofiC9pXpv6EKzik2ME5IDeU3kqOldDvgWvd2xHH2zOjVFDT IIWPdUzArry9RPsuz2Z08tmp1kLjl23n693EhDs6Y5LNja8qrwYb8v6yrCibWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431440; a=rsa-sha256; cv=none; b=oMHr5zsaQZ/iLOChHKWAF/nVHPmtJQYp22hndD2M+xKvS/v1hyJJT1fC/0qecoSJNFQFYP M49l8S/RNDVymAwXHIBqlGhy9hZlcVZAcKqnwg8HlQbFcyFvqvLrZ6q6xDE36rAx1VumcA BG3IiIVw4+1Lm4RLJFBXgXA0ZctIDsCZs8yRE8zrk95a+H/UgNQQsONW3ZrIFZhKcuJ/Ol 1SNP7djNQ/N7LELHzGNwyamx4cN7QJgdUvJCcgVydn5ccA+GuwDl1eAQevfQ8hpoenltGc rIIPqYPxr0IPdeEex4I8nj082S9oMjvYsDRsw3uan0pBN58SWsg4sA5IYMI3dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvt83TnMzy6T for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b4b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:40 +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: 27894e20f140 - main - libgeom: Fix segfault in 32-on-64 case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27894e20f140ee2729c14b589035870c8185b87d Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:40 +0000 Message-Id: <6958dd10.b4b9.2aebecda@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=27894e20f140ee2729c14b589035870c8185b87d commit 27894e20f140ee2729c14b589035870c8185b87d Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +0000 libgeom: Fix segfault in 32-on-64 case We were using strtoul() to parse object identifiers, which are kernel pointers. This works fine as long as the kernel and userland match, but in a 32-bit libgeom on a 64-bit kernel this will return ULONG_MAX for all objects, resulting in memory corruption when we later pick the wrong object while resolving consumer-producer references. MFC after: 1 week PR: 292127 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54452 --- lib/libgeom/geom_xml2tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 2d2c43e29e77..161425d9fadf 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -76,10 +76,10 @@ StartElement(void *userData, const char *name, const char **attr) ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (!strcmp(attr[i], "id")) { - id = (void *)strtoul(attr[i + 1], NULL, 0); + id = (void *)strtoumax(attr[i + 1], NULL, 0); mt->nident++; } else if (!strcmp(attr[i], "ref")) { - ref = (void *)strtoul(attr[i + 1], NULL, 0); + ref = (void *)strtoumax(attr[i + 1], NULL, 0); } else printf("%*.*s[%s = %s]\n", mt->level + 1, mt->level + 1, "", From nobody Sat Jan 3 09:10: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 4djvt971pGz6Lx4g for ; Sat, 03 Jan 2026 09:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvt94p0fz3Jbs for ; Sat, 03 Jan 2026 09:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fIgOfCSm2MGeor5MlWcp4YDI83gXc42+ezrLMrlA8w=; b=f2TZworgZnFdvcZyFv/uYRf5GQW+HPJpNh51As5PeXtgJijOBiY+7JOE0E/l0eDbhZ2Ewf BeCunidVJyh63bC0jIivo3D4JnwoCwtgTUaf7c4523WSPaB46lN3b6yQW0oGfuMQPjBLUh ZY9bymt/Ue7X3RqPtSoPjX3nxSmK4m9vkE47uNhytRdBMCeEvHb8AwcdZ+rnzQcHgy0Cb5 ik3dWyZvR6aiqqu3ymFujb0a8+f9LM38EcH0/DHsW/3EuJxOPGAIU0yjxBidPePscz24J4 CttvdNN2K1YCW89GKqYdExhTnu04u9WeqtEKxLUpuElXVq/vUlVjiMDJoXdM/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fIgOfCSm2MGeor5MlWcp4YDI83gXc42+ezrLMrlA8w=; b=nIG9LSJT7KLASJ1/scaIYW9VJRa8Z7//vXtLtOtkridlhAX5P5kp9mHWoiTvqMEENn7DIH u4U3BRJKOCKufqJCJObrelEFMzRJ4qqunJzypdBnM+3MiW7XEtRJhOsV125miCJFPrlsmU MaEMg4gxyWLp7ngvMPJdQ4S4+tCJklcguBwp9z4331k6sPfP/HhWi4iy3jRVH/H/o0WxsZ +mQCKR4csQtQdybZOacqAMrJzozduzzV7xjm8WgZSAvYEUidneE+2ofa3vc+kzEtLkKkDX bRbQ3ihBRoSsR707saoZomozTjdrNB0X4G9pVwSGPCKr1N4A0uKvLTflYg3DpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431441; a=rsa-sha256; cv=none; b=uncqOQUji9mduqWFgRBs385vP6f20Ti6JSp9VSztW8m/vzOf8hS4OAycDBRHJUg7dOroO4 Rv+7PZkQz2JCdh8FJSHqbqTIV1ofoo+jVi6VdvDfe0ofa7eiYSb3gS0f8NDfn6zGu5YZvl 0uCeBNtkF5ITtT1P0ldOynTDwdSkOjnHigTGvVRfJRDbfM1rlz3YFE0vAzCFHoodX5Ej22 xDEmDRXzSwvASjYBhpjcF8lftelP21Yu9Z0blF7CSgt6VQkQTac5KlZT3WiMLwEU1sDGmF dJcQQpnUmlYx+i2VeUOr2GEjUU0Abd1hAc8GvRCSyquph51iHT9FHAfa+8zsag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvt94LRLzx57 for ; Sat, 03 Jan 2026 09:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cb3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:41 +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: fad6707e2589 - main - libgeom: Clean up xml2tree 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 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: fad6707e2589d8557ceb6b6bf11f22323b265f01 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:41 +0000 Message-Id: <6958dd11.cb3f.2c02d76a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fad6707e2589d8557ceb6b6bf11f22323b265f01 commit fad6707e2589d8557ceb6b6bf11f22323b265f01 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +0000 libgeom: Clean up xml2tree code MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54453 --- lib/libgeom/geom_xml2tree.c | 100 ++++++++++++++++++++++---------------------- lib/libgeom/libgeom.h | 2 +- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 161425d9fadf..81f7de1be263 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -29,21 +29,24 @@ * 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 +#include + #include #include @@ -75,17 +78,14 @@ StartElement(void *userData, const char *name, const char **attr) id = NULL; ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { - if (!strcmp(attr[i], "id")) { + if (strcmp(attr[i], "id") == 0) { id = (void *)strtoumax(attr[i + 1], NULL, 0); mt->nident++; - } else if (!strcmp(attr[i], "ref")) { + } else if (strcmp(attr[i], "ref") == 0) { ref = (void *)strtoumax(attr[i + 1], NULL, 0); - } else - printf("%*.*s[%s = %s]\n", - mt->level + 1, mt->level + 1, "", - attr[i], attr[i + 1]); + } } - if (!strcmp(name, "class") && mt->class == NULL) { + if (strcmp(name, "class") == 0 && mt->class == NULL) { mt->class = calloc(1, sizeof *mt->class); if (mt->class == NULL) { mt->error = errno; @@ -100,7 +100,7 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->class->lg_config); return; } - if (!strcmp(name, "geom") && mt->geom == NULL) { + if (strcmp(name, "geom") == 0 && mt->geom == NULL) { mt->geom = calloc(1, sizeof *mt->geom); if (mt->geom == NULL) { mt->error = errno; @@ -116,11 +116,11 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->geom->lg_config); return; } - if (!strcmp(name, "class") && mt->geom != NULL) { + if (strcmp(name, "class") == 0 && mt->geom != NULL) { mt->geom->lg_class = ref; return; } - if (!strcmp(name, "consumer") && mt->consumer == NULL) { + if (strcmp(name, "consumer") == 0 && mt->consumer == NULL) { mt->consumer = calloc(1, sizeof *mt->consumer); if (mt->consumer == NULL) { mt->error = errno; @@ -135,15 +135,15 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->consumer->lg_config); return; } - if (!strcmp(name, "geom") && mt->consumer != NULL) { + if (strcmp(name, "geom") == 0 && mt->consumer != NULL) { mt->consumer->lg_geom = ref; return; } - if (!strcmp(name, "provider") && mt->consumer != NULL) { + if (strcmp(name, "provider") == 0 && mt->consumer != NULL) { mt->consumer->lg_provider = ref; return; } - if (!strcmp(name, "provider") && mt->provider == NULL) { + if (strcmp(name, "provider") == 0 && mt->provider == NULL) { mt->provider = calloc(1, sizeof *mt->provider); if (mt->provider == NULL) { mt->error = errno; @@ -159,11 +159,11 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->provider->lg_config); return; } - if (!strcmp(name, "geom") && mt->provider != NULL) { + if (strcmp(name, "geom") == 0 && mt->provider != NULL) { mt->provider->lg_geom = ref; return; } - if (!strcmp(name, "config")) { + if (strcmp(name, "config") == 0) { if (mt->provider != NULL) { mt->config = &mt->provider->lg_config; return; @@ -210,7 +210,7 @@ EndElement(void *userData, const char *name) p = NULL; } - if (!strcmp(name, "name")) { + if (strcmp(name, "name") == 0) { if (mt->provider != NULL) { mt->provider->lg_name = p; return; @@ -222,47 +222,47 @@ EndElement(void *userData, const char *name) return; } } - if (!strcmp(name, "rank") && mt->geom != NULL) { + if (strcmp(name, "rank") == 0 && mt->geom != NULL) { mt->geom->lg_rank = strtoul(p, NULL, 0); free(p); return; } - if (!strcmp(name, "mode") && mt->provider != NULL) { + if (strcmp(name, "mode") == 0 && mt->provider != NULL) { mt->provider->lg_mode = p; return; } - if (!strcmp(name, "mode") && mt->consumer != NULL) { + if (strcmp(name, "mode") == 0 && mt->consumer != NULL) { mt->consumer->lg_mode = p; return; } - if (!strcmp(name, "mediasize") && mt->provider != NULL) { + if (strcmp(name, "mediasize") == 0 && mt->provider != NULL) { mt->provider->lg_mediasize = strtoumax(p, NULL, 0); free(p); return; } - if (!strcmp(name, "sectorsize") && mt->provider != NULL) { + if (strcmp(name, "sectorsize") == 0 && mt->provider != NULL) { mt->provider->lg_sectorsize = strtoul(p, NULL, 0); free(p); return; } - if (!strcmp(name, "stripesize") && mt->provider != NULL) { + if (strcmp(name, "stripesize") == 0 && mt->provider != NULL) { mt->provider->lg_stripesize = strtoumax(p, NULL, 0); free(p); return; } - if (!strcmp(name, "stripeoffset") && mt->provider != NULL) { + if (strcmp(name, "stripeoffset") == 0 && mt->provider != NULL) { mt->provider->lg_stripeoffset = strtoumax(p, NULL, 0); free(p); return; } - if (!strcmp(name, "config")) { + if (strcmp(name, "config") == 0) { mt->config = NULL; free(p); return; } - if (mt->config != NULL || (!strcmp(name, "wither") && + if (mt->config != NULL || (strcmp(name, "wither") == 0 && (mt->provider != NULL || mt->geom != NULL))) { if (mt->config != NULL) c = mt->config; @@ -301,28 +301,28 @@ EndElement(void *userData, const char *name) free(p); } - if (!strcmp(name, "consumer") && mt->consumer != NULL) { + if (strcmp(name, "consumer") == 0 && mt->consumer != NULL) { mt->consumer = NULL; return; } - if (!strcmp(name, "provider") && mt->provider != NULL) { + if (strcmp(name, "provider") == 0 && mt->provider != NULL) { mt->provider = NULL; return; } - if (!strcmp(name, "geom") && mt->consumer != NULL) { + if (strcmp(name, "geom") == 0 && mt->consumer != NULL) { return; } - if (!strcmp(name, "geom") && mt->provider != NULL) { + if (strcmp(name, "geom") == 0 && mt->provider != NULL) { return; } - if (!strcmp(name, "geom") && mt->geom != NULL) { + if (strcmp(name, "geom") == 0 && mt->geom != NULL) { mt->geom = NULL; return; } - if (!strcmp(name, "class") && mt->geom != NULL) { + if (strcmp(name, "class") == 0 && mt->geom != NULL) { return; } - if (!strcmp(name, "class") && mt->class != NULL) { + if (strcmp(name, "class") == 0 && mt->class != NULL) { mt->class = NULL; return; } @@ -347,7 +347,7 @@ CharData(void *userData , const XML_Char *s , int len) } struct gident * -geom_lookupid(struct gmesh *gmp, const void *id) +geom_lookupid(const struct gmesh *gmp, const void *id) { struct gident *gip; @@ -413,6 +413,7 @@ geom_xml2tree(struct gmesh *gmp, char *p) return (ENOMEM); i = 0; /* Collect all identifiers */ + /* XXX we should check for duplicate identifiers */ LIST_FOREACH(cl, &gmp->lg_class, lg_class) { gmp->lg_ident[i].lg_id = cl->lg_id; gmp->lg_ident[i].lg_ptr = cl; @@ -441,8 +442,9 @@ geom_xml2tree(struct gmesh *gmp, char *p) LIST_FOREACH(cl, &gmp->lg_class, lg_class) { LIST_FOREACH(ge, &cl->lg_geom, lg_geom) { ge->lg_class = geom_lookupidptr(gmp, ge->lg_class); - LIST_FOREACH(pr, &ge->lg_provider, lg_provider) + LIST_FOREACH(pr, &ge->lg_provider, lg_provider) { pr->lg_geom = geom_lookupidptr(gmp, pr->lg_geom); + } LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) { co->lg_geom = geom_lookupidptr(gmp, co->lg_geom); if (co->lg_provider != NULL) { @@ -522,22 +524,22 @@ geom_deletetree(struct gmesh *gmp) break; LIST_REMOVE(cl, lg_class); delete_config(&cl->lg_config); - if (cl->lg_name) free(cl->lg_name); + free(cl->lg_name); for (;;) { ge = LIST_FIRST(&cl->lg_geom); if (ge == NULL) break; LIST_REMOVE(ge, lg_geom); delete_config(&ge->lg_config); - if (ge->lg_name) free(ge->lg_name); + free(ge->lg_name); for (;;) { pr = LIST_FIRST(&ge->lg_provider); if (pr == NULL) break; LIST_REMOVE(pr, lg_provider); delete_config(&pr->lg_config); - if (pr->lg_name) free(pr->lg_name); - if (pr->lg_mode) free(pr->lg_mode); + free(pr->lg_name); + free(pr->lg_mode); free(pr); } for (;;) { @@ -546,7 +548,7 @@ geom_deletetree(struct gmesh *gmp) break; LIST_REMOVE(co, lg_consumer); delete_config(&co->lg_config); - if (co->lg_mode) free(co->lg_mode); + free(co->lg_mode); free(co); } free(ge); diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h index 950508fd3637..2116645bd496 100644 --- a/lib/libgeom/libgeom.h +++ b/lib/libgeom/libgeom.h @@ -133,7 +133,7 @@ struct gprovider { struct gconf lg_config; }; -struct gident * geom_lookupid(struct gmesh *, const void *); +struct gident *geom_lookupid(const struct gmesh *, const void *); int geom_xml2tree(struct gmesh *, char *); int geom_gettree(struct gmesh *); int geom_gettree_geom(struct gmesh *, const char *, const char *, int); From nobody Sat Jan 3 09: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 4djvtD17qTz6Lx6q for ; Sat, 03 Jan 2026 09:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvtC2JxTz3Jw6 for ; Sat, 03 Jan 2026 09:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWY+jUFaHUu8rwnWUesz8F8di6K8nRcoP8hRfdYdqtk=; b=Xa9ZTl3hTnfQHoxQf+MhVlthCPWLAW4hi036ZGYSAx6QEa5gXGhFMCbgH9qzoNFZyT1VqM EYXk9Eha6NFnptmiM+Sw6+S8v7e+hHGt8NXd+xX2iUPqL0WyeidsYGMIF51VO5ox3zzAYy vhypMd7tdyZnKULnYwFZhROTqnzFhb3evKwKdiOYrZzlWtMCob8vcZf1GMhri+PqLJ6N2g N382vbGTgoGEc7OTeGpCU+BnrXUVL8xwzP5sw4LYcLT7jz03TjcLILVnSe16HTU9/lmqFR b2DOKujHoiGuS8jbRvBgvV7NQHkPaA36/z7QI+MO0ybAeozcdY0VLILacah/Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWY+jUFaHUu8rwnWUesz8F8di6K8nRcoP8hRfdYdqtk=; b=PCdGCCZIqr86Vdr/KmqyOMId9RcG57HbbcaH40ZQLPYWiVLnke+mdgeV7FuPZJoMJcDX+8 D8s/eHBeL4YItr3kJyVAUVLy/z3TUL73ohGIAc0Xmx8Gxg3eNVYe6pGdC3L1aRLtUDIhcj pL+yGHDU2gRD6d5+Wrxagu2f952C+HjDDFgHNd3friqjGm9+DTr9zWj/bxtUe6J5JONNcF akP+z7pyrC5vELSYDriTBs8NkqF1y7fXMT3xBN2nzVKAU4PaDHs95I8Vc2c5AUllGuR4eo C5zds/JU/Q6xSCPQUGv5LCDUAd4hwg7Kn4DeTPFa10j2zRI2YYw+aRyO8s9MbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431443; a=rsa-sha256; cv=none; b=VPTd6BBCQ6pxaBCePBX1kCAuqjzFi4iMErR/Be9x2GkjUnD8Y4INeEzYupQMRwQNKLlJ/M 8xMss5bpu3FxbNfoZHD1AwGLHSNCdHot41r0G/HdSx4bXG1q89eFqT9+76/qITutf9Xi/7 sw87ARtPirw868V6LxYRWxxcgu41gWCvGE5arQb1ZE7zRcubJ5gA8eWkV8qf1grRO5p0RL zNyq/7F0GiuVVw/szCg0zouniV5Vs+XrbLvPkKH96ow5xtwX/JYpeG8nvDMFkdPL0J4PXP vHJNli1FK4tepAsHaZXxvbOjYAo7j0HTBpqBsD5maK2b5Jei1xw3gNAhoW2aPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvtB5BCbzxR1 for ; Sat, 03 Jan 2026 09:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 96fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:42 +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: 4b0d5d1d6a7c - main - libgeom: Improve type safety of xml2tree 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 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: 4b0d5d1d6a7c9773e38882feb4747a76b37a645c Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:42 +0000 Message-Id: <6958dd12.96fc.47b0ebd2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0d5d1d6a7c9773e38882feb4747a76b37a645c commit 4b0d5d1d6a7c9773e38882feb4747a76b37a645c Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:10:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +0000 libgeom: Improve type safety of xml2tree code When resolving references, assert that the type of the object we find is what we expect. This will help prevent memory corruption if two objects of different types somehow end up with the same identifier. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54454 --- lib/libgeom/geom_xml2tree.c | 54 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 81f7de1be263..03210947d431 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -358,14 +359,47 @@ geom_lookupid(const struct gmesh *gmp, const void *id) } static void * -geom_lookupidptr(struct gmesh *gmp, const void *id) +geom_lookup_class(const struct gmesh *gmp, const void *id) { struct gident *gip; - gip = geom_lookupid(gmp, id); - if (gip) - return (gip->lg_ptr); - return (NULL); + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISCLASS); + return (gip->lg_ptr); +} + +static void * +geom_lookup_geom(const struct gmesh *gmp, const void *id) +{ + struct gident *gip; + + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISGEOM); + return (gip->lg_ptr); +} + +static void * +geom_lookup_provider(const struct gmesh *gmp, const void *id) +{ + struct gident *gip; + + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISPROVIDER); + return (gip->lg_ptr); +} + +static void * __unused +geom_lookup_consumer(const struct gmesh *gmp, const void *id) +{ + struct gident *gip; + + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISCONSUMER); + return (gip->lg_ptr); } int @@ -441,15 +475,15 @@ geom_xml2tree(struct gmesh *gmp, char *p) /* Substitute all identifiers */ LIST_FOREACH(cl, &gmp->lg_class, lg_class) { LIST_FOREACH(ge, &cl->lg_geom, lg_geom) { - ge->lg_class = geom_lookupidptr(gmp, ge->lg_class); + ge->lg_class = geom_lookup_class(gmp, ge->lg_class); LIST_FOREACH(pr, &ge->lg_provider, lg_provider) { - pr->lg_geom = geom_lookupidptr(gmp, pr->lg_geom); + pr->lg_geom = geom_lookup_geom(gmp, pr->lg_geom); } LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) { - co->lg_geom = geom_lookupidptr(gmp, co->lg_geom); + co->lg_geom = geom_lookup_geom(gmp, co->lg_geom); if (co->lg_provider != NULL) { - co->lg_provider = geom_lookupidptr(gmp, - co->lg_provider); + co->lg_provider = geom_lookup_provider(gmp, + co->lg_provider); if (co->lg_provider != NULL) { LIST_INSERT_HEAD( &co->lg_provider->lg_consumers, From nobody Sat Jan 3 17:50: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 4dk7QH2FC5z6MZfx for ; Sat, 03 Jan 2026 17:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dk7QG6bBLz49cY for ; Sat, 03 Jan 2026 17:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767462647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=87A8suQPCyfCt+lfDJomV3zg1GsFOEo4HKMwXGMEQcw=; b=oNZWW7CvcwA1EN/vVeiwSBy53R30u/U1UMmwyjeLusE1JscGCbL26cNM9y8O/DedekKfga NrJzL0G0JxEKYdr/jhZhXkcn7M26yGndjsV7uDYL5FRJy8aKTEx0ny1DOvnfzd4dH7KnxA tUKRz1DWLtb4Q+sYJwI0Xw6ZKQikbXf/zCjvKusvL3h82kGXaST14IpX8Pt2f8OpqlaRoN 4OhV4WpzGt1p/2pJiXby1fzz6U8b2QgDXw3/bXlmN441G/KRL8WaSsaqWjaPP+sS6VLMn2 7dBrmTed9xY0b2vdEd+xh3x865IwDMXc6sCg+KFHaPS5b0KU3PmTQR2WPSgUTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767462646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=87A8suQPCyfCt+lfDJomV3zg1GsFOEo4HKMwXGMEQcw=; b=Ti78huqG3q1fW8ExeKh5uHAhp4Al+4MhzlNDIV/CdUzYar0TiZQF5oQmFmzO5rDh6a+DnW FrfPMf9mSysqpoOiPjJuviHB1WR4Q7mO/uUcvbhRf5JOjP7qeN/x2JVGjqnISkBnk+ergX NSWEcmsurTWzo4B3HS4EVJN6lC2bn0MXZYMRvMDBUXN/I5/uVT2UMTB4pWozcuAZ8z80hs cg0aUmgHFHqG4FrJja9C3+TMrMbupGOqqN6+EMFC1Auh2fXas7OXS1ozu0beEpueYYbpxO wgt7J8yBUSjHPOWduPOnEfUe8C2vfd89/XYrLSWqV0DnA7O4V091ALdZipliQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767462646; a=rsa-sha256; cv=none; b=FWPUdlhFRyrqqvtWR+HvWcaZm3zPyMLNeO27cVRTospnY94NgcbJqDjaqpa7LXMiUSmAKl L1ecXpcjmurdHcSzEbGEIuh/qNP+lbMTV37BADAGnBkI3yaKg+52sZ/wHNfLuvgk7Ej4Rc ektistHg8oE49KqgR9ZGfgtVFfGVEpMDs+tE1zDo5Ll4C6moukEdDwhAA83SuXT0mQANRM CgOelSfma9h9axmb6G3y3eQbIv1YGzv8PI1iUM2WaC6J4IhGrN/t8sYU9xfomEELaNBleA mqZxmtnJhnasm1LU5BbNNvK+gG/RrROz0zDpnXdmTrox27AxyFeSE730pFyizA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dk7QG5XbVz1D0P for ; Sat, 03 Jan 2026 17:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 17:50:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8ac77ea6a3c6 - main - cam: Minor comment 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 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: 8ac77ea6a3c6ce99d39e1dd4e19adb444b2b4d5a Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 17:50:46 +0000 Message-Id: <695956f6.27d43.4a1197f9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ac77ea6a3c6ce99d39e1dd4e19adb444b2b4d5a commit 8ac77ea6a3c6ce99d39e1dd4e19adb444b2b4d5a Author: Warner Losh AuthorDate: 2026-01-03 17:50:04 +0000 Commit: Warner Losh CommitDate: 2026-01-03 17:50:45 +0000 cam: Minor comment cleanup Some minor comment cleanup, add a comment about an unused value, etc. No functional change. Sponsored by: Netflix --- sys/cam/cam_ccb.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index bb23c6bed26f..cedb3a9ad61c 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -160,12 +160,14 @@ typedef enum { /* Path statistics (error counts, etc.) */ XPT_GDEV_STATS = 0x0c, /* Device statistics (error counts, etc.) */ + + /* 0x0d unused */ XPT_DEV_ADVINFO = 0x0e, /* Get/Set Device advanced information */ XPT_ASYNC = 0x0f | XPT_FC_QUEUED | XPT_FC_USER_CCB | XPT_FC_XPT_ONLY, /* Asynchronous event */ -/* SCSI Control Functions: 0x10->0x1F */ +/* SCSI, NVME, and ATA Control Functions: 0x10->0x1F */ XPT_ABORT = 0x10, /* Abort the specified CCB */ XPT_RESET_BUS = 0x11 | XPT_FC_XPT_ONLY, @@ -199,14 +201,10 @@ typedef enum { XPT_GET_SIM_KNOB_OLD = 0x18, /* Compat only */ XPT_SET_SIM_KNOB = 0x19, - /* - * Set SIM specific knob values. - */ + /* Set SIM specific knob values. */ XPT_GET_SIM_KNOB = 0x1a, - /* - * Get SIM specific knob values. - */ + /* Get SIM specific knob values. */ XPT_SMP_IO = 0x1b | XPT_FC_DEV_QUEUED, /* Serial Management Protocol */ @@ -250,8 +248,11 @@ typedef enum { XPT_REPROBE_LUN = 0x38 | XPT_FC_QUEUED | XPT_FC_USER_CCB, /* Query device capacity and notify GEOM */ +/* More common commands: 0x40-0x7f */ XPT_MMC_SET_TRAN_SETTINGS = 0x40 | XPT_FC_DEV_QUEUED, + /* Queued MMC/SD set transmit settings */ XPT_MMC_GET_TRAN_SETTINGS = 0x41 | XPT_FC_DEV_QUEUED, + /* Queued MMC/SD get transmit settings */ /* Vendor Unique codes: 0x80->0x8F */ XPT_VUNIQUE = 0x80 From nobody Sat Jan 3 18:48: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 4dk8jP3FWMz6MgMX for ; Sat, 03 Jan 2026 18:48: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dk8jP26L1z3KMS for ; Sat, 03 Jan 2026 18:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767466137; 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=z7HE/GjcCx5COrecG/uaitgMOufi1gqAc/zMG+n2Q7c=; b=IvQGvoXevA+DXW9SdfWbMOyoG4umCfirV10Tou7ixfYx50jYxRXHtNiiEOtKJcX8MVdEH/ N8sAdai82nWFjY7Tlp5s2UdvuFs/BZoI716YTk4fYFCQiSsIcRKmBGDHRGJsZWkP2aRAfh kYZoELkhWA/iOG+E1Whajd0/TtMUjjARowX7gw4VQgy5XVSB9D9VLwOgZRldlGW2gzerXx 56g8VXKGpoXf94frAnnOCUgl3jdFQ0/YpdZ47vhpgdIyWzoYbmCiUVofPfCcM+QyilGvLb T/Edu2Do82GOsHIWu3RggYV0a4InkRm2J17q4IT12JLhyVPRP5OEO8slCRO8DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767466137; 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=z7HE/GjcCx5COrecG/uaitgMOufi1gqAc/zMG+n2Q7c=; b=Swjk1n7VK2e0UIzOF/nzS6v9ea/sI4zc5tJjhooPp8iHhK7bbAjT6Fjgka4PNqrrGgeEt8 UQmYtCMYQeyAKgDgqDaHn8mAl1xESu8h8fAZai52qCnv2JAHcb1ANn0l+G8vicciah/Ncw E1T3WDO+qyXPJcHtCmPKneQWVJxXHN6OwzXLV8C6sqspCw2MnNtz6x7KCJ+/Z8PflL5Zpj zI8pzyRgW0J+e+aW65dEz7EA0h2mGH3zjtxs9UG/O14g/ipMxtFXq6AQcF0nHF/G33Wtzs ZLwIkE2iJuhIhq5g9mTxB4ZcY1DyiEQxsKtWNJZ3SEuba2eZQj57s/8IPXvl0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767466137; a=rsa-sha256; cv=none; b=DDDbKpeE1J8aks6Vk0vO4laYIwzN2wpfw1XlJy+brc2KqQoqTPKXK3+RX/1UywPhOvi3vR crj8NEGIDxBJ8V1v/+k1M4CXT8Kw0PcKMdY2mEL5ewVY3YS8pO8WAEx42omaSGoF2MzS47 IO11T6tvuu4jiVXOZFUNH/FdAMfCejlOAhBfdBOYSKq4l7FCwswMhvfzv2dyOlRI2031Nz 2fRx7agxcxlb+c/TQE2akdD12sG5WDUw8It1YUdsqYlRh1TKpOarrpGEHAY8W+w59UcWdR i/OG9TtxSpxmkPF6Zafo9zeHzPjF0zEt8u9mxl1ux4M8q8Tg6bK4XSzWw7V64A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dk8jP1FxBz1F0W for ; Sat, 03 Jan 2026 18:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 18:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 2a7c4685b769 - main - asmc: improve asmc_dumpall to read actual SMC key count List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a7c4685b7693bfa15e2bd4d5e82905a368b0030 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 18:48:57 +0000 Message-Id: <69596499.341cb.1bdb76bc@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=2a7c4685b7693bfa15e2bd4d5e82905a368b0030 commit 2a7c4685b7693bfa15e2bd4d5e82905a368b0030 Author: Abdelkader Boudih AuthorDate: 2026-01-03 18:33:11 +0000 Commit: Adrian Chadd CommitDate: 2026-01-03 18:35:53 +0000 asmc: improve asmc_dumpall to read actual SMC key count The asmc_dumpall debug function previously used a hardcoded loop limit of 0x100 (256) keys with a "XXX magic number" comment. This change improves asmc_dumpall to: * Read the actual number of keys from the ASMC_NKEYS SMC key * Print the key count being dumped for better debugging output * Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1) This provides more accurate debug output and removes the magic number. Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT): * Rebuild kernel with DEBUG enabled in asmc driver * Boot with new kernel * Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count) * Verify all 297 keys are dumped Differential Revision: https://reviews.freebsd.org/D54436 Reviewed by: markj, adrian --- sys/dev/asmc/asmc.c | 25 +++++++++++++++++-------- sys/dev/asmc/asmcvar.h | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index d99c1d56e67c..bdb8ca7831c4 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -823,10 +823,16 @@ asmc_resume(device_t dev) #ifdef DEBUG void asmc_dumpall(device_t dev) { + struct asmc_softc *sc = device_get_softc(dev); int i; - /* XXX magic number */ - for (i=0; i < 0x100; i++) + if (sc->sc_nkeys == 0) { + device_printf(dev, "asmc_dumpall: key count not available\n"); + return; + } + + device_printf(dev, "asmc_dumpall: dumping %d keys\n", sc->sc_nkeys); + for (i = 0; i < sc->sc_nkeys; i++) asmc_key_dump(dev, i); } #endif @@ -914,12 +920,15 @@ nosms: sc->sc_nfan = ASMC_MAXFANS; } - if (bootverbose) { - /* - * The number of keys is a 32 bit buffer - */ - asmc_key_read(dev, ASMC_NKEYS, buf, 4); - device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf)); + /* + * Read and cache the number of SMC keys (32 bit buffer) + */ + if (asmc_key_read(dev, ASMC_NKEYS, buf, 4) == 0) { + sc->sc_nkeys = be32dec(buf); + if (bootverbose) + device_printf(dev, "number of keys: %d\n", sc->sc_nkeys); + } else { + sc->sc_nkeys = 0; } #ifdef DEBUG diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d40dc1e7c8ff..b6d8686d9670 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -33,6 +33,7 @@ struct asmc_softc { device_t sc_dev; struct mtx sc_mtx; int sc_nfan; + int sc_nkeys; int16_t sms_rest_x; int16_t sms_rest_y; int16_t sms_rest_z; From nobody Sat Jan 3 20:37: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 4dkC6k5tKKz6Mnv0 for ; Sat, 03 Jan 2026 20:37: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkC6k3sYKz3fJ8 for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767472654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1lo1mQoVAjUqpQl4IMtR2rROXwc3QIeQlwFem74B2Y=; b=q13VdmDzLycbPsmGqeMbr8eWMGWORU1tzcjmkB+Ot3bxOaR5rBLms/YOObAau5Ivda8tP8 G1x+tbJjlCwEPBBU5YvsieBQa0HkuVx6XXGCzwunJrrzmT8ATWAz8ZAGofznvIOhotGq/O YBs5GCFCWXtvJo8P1kgfSHW4JX8qbCObJtIdGz0jNfb3m2zwTx2qbOml8xFvZAOSfmViHK 2DWzNPQP7j35a0vlAL5ZI/++nCK68atKHzxcXB2DjoSf5nelgr177+r9vn7HveBbH58lkq tNmkxTgoK6AWZh96xmZB8IM6anvGzSnFDaGVvEoQQO3qOxDMhrP7qX5PRtdUrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767472654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1lo1mQoVAjUqpQl4IMtR2rROXwc3QIeQlwFem74B2Y=; b=iPzRip3HyRJFXkZGZkDk+/xaxE53c53lw7Jb6ahyAKD30hdaC1YjpPcyShc2UY7mat2T+M vhf8s6Cn0UFLi6B6CLcyPnOyxf/SPLRQAtU8cW7okZx98kwEnb+RVZ60dxnnJZopjwCpPw uW42A6OhX70VCdrVwH71TGielYWOWfY9rcbIwWjCX79AIdtruunKp0uo3hRedpbpJOGlkI w/VqbdiLdN3minsJwQTdrgI9bWwpKx9OJ14ftksWJ/pC5/4ehoyRsyxXN05Z33kabuAeX/ Le/1BC67N+e5UyYEbvCjPbH7njTkCSnu/Bc/wGUOHeMtPqCYUPxSPfOp2CPb0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767472654; a=rsa-sha256; cv=none; b=DH+gx8h687vTTkJe4VCyoUG8Mo/RLG7MGOWye3KCvsGWwOi5hdma+V0EXkkRyT4PIzlanh ALBK5IA/py8jW2XXPk3rcBm1wu3yD38KL9HWlAXQU90qGvKLn2EkMD7dSecuuelWxvHPLu Jvnp6veVCrxE0jBu9CtCFe35+MKxf3orhLjH3e3ZGH7jprqeWr13yzfxehI5hyp56HmPV+ +Yijj7iEHorKZ6fWyme4DPBevzFmKM0EsvXOw67l9lPDYQfwhvxnFuOIB26on9A3G+kEmT gvC/HZvSf9NzoSXilGffI7rw91KUa1PU/4MIow92o1YhIaAoHqt8ZNitlVtlzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkC6k2yFwz1JbT for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 20:37:34 +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: 17355cf50fcb - main - libgeom: Fix 32-bit 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 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: 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 20:37:34 +0000 Message-Id: <69597e0e.3f9a2.3d060960@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17355cf50fcbd0d8ddb638e1f2fd5861b526edbe commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 20:34:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 20:37:18 +0000 libgeom: Fix 32-bit gcc build MFC after: 1 week Fixes: 27894e20f140 ("libgeom: Fix segfault in 32-on-64 case") --- lib/libgeom/geom_xml2tree.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 03210947d431..a66938671845 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -71,6 +71,7 @@ StartElement(void *userData, const char *name, const char **attr) struct mystate *mt; void *id; void *ref; + uintmax_t umax; int i; mt = userData; @@ -80,10 +81,12 @@ StartElement(void *userData, const char *name, const char **attr) ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (strcmp(attr[i], "id") == 0) { - id = (void *)strtoumax(attr[i + 1], NULL, 0); + umax = strtoumax(attr[i + 1], NULL, 0); + id = (void *)(uintptr_t)umax; mt->nident++; } else if (strcmp(attr[i], "ref") == 0) { - ref = (void *)strtoumax(attr[i + 1], NULL, 0); + umax = strtoumax(attr[i + 1], NULL, 0); + ref = (void *)(uintptr_t)umax; } } if (strcmp(name, "class") == 0 && mt->class == NULL) { From nobody Sun Jan 4 01:47: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 4dkL0d2lmWz6MD2N for ; Sun, 04 Jan 2026 01:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL0c6S1Cz3S2M for ; Sun, 04 Jan 2026 01:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491264; 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=1o9tS2dPCjGjIdg1YZunTIju0XuDyHe7qcp6aOW4PXo=; b=rig8aaMBhipeHZGgmdgvee8kogiCZJgw+7FvOpqv1kEPstLTTUs77eboXVPOHCgh8Tuood HANIvQR14ROkNHrBssSWi3B3iHQk54UuMBDbRk2EiZPa6GugK4CSINRJyEO7cMJ1dUqTos c8d4UXkFzkxUBT8mi8ZxdtWWCHqmTCB0sjtGUBV4r7wsBA4P9YAzCZlLQuidzKmYuedJ4S F45PXcqtIkH1aCyfEFFdDjp46IxoMFXl9JiGifsk2q2EypZNHTntPaSBd2Gw2m+AovfSl4 COZgTLwSTbMEk0boMRNGaJVsZqI7HkEskaxC8l1rNq5dNh8LhzQNN0q8rASajQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491264; 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=1o9tS2dPCjGjIdg1YZunTIju0XuDyHe7qcp6aOW4PXo=; b=MZy4lG55H91N0uG/CV2zx6TOaHaMyS6BxK41EsXVjHy7xkakO7W7DUba9FqamCq3cIite7 BqDdSpV4vXKiUik5sbWtR1JhHEzxdZ3pPk8BRnChwkn+kN527Cnp49+DJIe2GEuYsW07oY Sa+BIf+QzRbi319Lw3S0Lvp3y9ptwGvih+cpkigtt9PKCDPKQ2utDuVrtQrc9Ohg/7kSAY VD9EQotEEeZ3lBPRYUQ39DKmh/Pgt0f9k9jZayU0GRFLTD/zIlR0ptjAEcGopylTTGlWXq 6MAQYowVFg4kUK91GaMiEfHZkbfGSCn8ikqswSJk3YVobz5Ld+ykS/21vHaaig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491264; a=rsa-sha256; cv=none; b=UMSx5/TpMgSaWla88Or/4lezfLkEaq+7Sn0O+KAW9QhOFCzf9E41hEzDAyjeacKwdgC0GR 3quZ4E+u1z6MgpB/bv7uZkdYtiMsV6IxLQJFFT4/bAY65Sm2TN6FngcwnCJl+OK6Zhaiol begWr+qSw0ZvezwWr2fc7EhDRx7PYhAqBcChKTFgjKo2TLQ/YniQFrT4Gza56KQ4SNgl4c NKhpOx9VAnKPcVbUv+f5OuVeOcGUVTwZBbwG+/LR1+WyAt8aWiatzst479vXsZCN4bTXIe fYaFPf8oNusDRktgrloqfySWZcKS1MEZ6IGrNC+Ybyz8Pmz8dX1mC44aKeSbaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL0c4vfMz1S8W for ; Sun, 04 Jan 2026 01:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:47:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 9742a31a12f3 - stable/15 - ocs_fc: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9742a31a12f3a15d20b678dcb11ca451cdb336f3 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:47:44 +0000 Message-Id: <6959c6c0.3dc9a.2a16d66d@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9742a31a12f3a15d20b678dcb11ca451cdb336f3 commit 9742a31a12f3a15d20b678dcb11ca451cdb336f3 Author: Alex Richardson AuthorDate: 2025-09-16 04:58:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:33 +0000 ocs_fc: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 3c0ea1b629764c49611e3e3adfa0c44f9afa3558) --- sys/dev/ocs_fc/ocs_ddump.h | 3 +-- sys/dev/ocs_fc/ocs_mgmt.h | 3 +-- sys/dev/ocs_fc/ocs_os.h | 2 +- sys/dev/ocs_fc/ocs_utils.h | 12 ++++-------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_ddump.h b/sys/dev/ocs_fc/ocs_ddump.h index b7d7eefad813..3cffff6d9670 100644 --- a/sys/dev/ocs_fc/ocs_ddump.h +++ b/sys/dev/ocs_fc/ocs_ddump.h @@ -46,8 +46,7 @@ extern void ocs_ddump_startfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_endfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_section(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); extern void ocs_ddump_endsection(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); -__attribute__((format(printf,3,4))) -extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...); +extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...) __printflike(3, 4); extern void ocs_ddump_buffer(ocs_textbuf_t *textbuf, const char *name, uint32_t instance, void *buffer, uint32_t size); extern int32_t ocs_save_ddump(ocs_t *ocs, uint32_t flags, uint32_t qentries); extern int32_t ocs_get_saved_ddump(ocs_t *ocs, ocs_textbuf_t *textbuf); diff --git a/sys/dev/ocs_fc/ocs_mgmt.h b/sys/dev/ocs_fc/ocs_mgmt.h index 7b59a3916ca8..9781aec18462 100644 --- a/sys/dev/ocs_fc/ocs_mgmt.h +++ b/sys/dev/ocs_fc/ocs_mgmt.h @@ -95,8 +95,7 @@ extern void ocs_mgmt_end_section(ocs_textbuf_t *textbuf, const char *name, int i extern void ocs_mgmt_end_unnumbered_section(ocs_textbuf_t *textbuf, const char *name); extern void ocs_mgmt_emit_property_name(ocs_textbuf_t *textbuf, int access, const char *name); extern void ocs_mgmt_emit_string(ocs_textbuf_t *textbuf, int access, const char *name, const char *value); -__attribute__((format(printf,4,5))) -extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...); +extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...) __printflike(4, 5); extern void ocs_mgmt_emit_boolean(ocs_textbuf_t *textbuf, int access, const char *name, const int value); extern int parse_wwn(char *wwn_in, uint64_t *wwn_out); diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 331d5b07aecd..55ee98b3cc58 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -711,7 +711,7 @@ typedef struct { * @return returns 0 for success, a negative error code value for failure. */ -extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __attribute__((format(printf, 3, 4))); +extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __printflike(3, 4); /** * @brief execute a P (decrement) operation diff --git a/sys/dev/ocs_fc/ocs_utils.h b/sys/dev/ocs_fc/ocs_utils.h index e3a952e0cf26..7c9c9ae85b74 100644 --- a/sys/dev/ocs_fc/ocs_utils.h +++ b/sys/dev/ocs_fc/ocs_utils.h @@ -103,10 +103,8 @@ extern int32_t ocs_textbuf_init(ocs_t *ocs, ocs_textbuf_t *textbuf, void *buffer extern void ocs_textbuf_free(ocs_t *ocs, ocs_textbuf_t *textbuf); extern void ocs_textbuf_putc(ocs_textbuf_t *textbuf, uint8_t c); extern void ocs_textbuf_puts(ocs_textbuf_t *textbuf, char *s); -__attribute__((format(printf,2,3))) -extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap); +extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...) __printflike(2, 3); +extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap) __printflike(2, 0); extern void ocs_textbuf_buffer(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern void ocs_textbuf_copy(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern int32_t ocs_textbuf_remaining(ocs_textbuf_t *textbuf); @@ -325,10 +323,8 @@ typedef struct ocs_ramlog_s ocs_ramlog_t; extern ocs_ramlog_t *ocs_ramlog_init(ocs_t *ocs, uint32_t buffer_len, uint32_t buffer_count); extern void ocs_ramlog_free(ocs_t *ocs, ocs_ramlog_t *ramlog); extern void ocs_ramlog_clear(ocs_t *ocs, ocs_ramlog_t *ramlog, int clear_start_of_day, int clear_recent); -__attribute__((format(printf,2,3))) -extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap); +extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...) __printflike(2, 3); +extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap) __printflike(2, 0); extern int32_t ocs_ddump_ramlog(ocs_textbuf_t *textbuf, ocs_ramlog_t *ramlog); #endif From nobody Sun Jan 4 01:47: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 4dkL0f1TFkz6MD2Q for ; Sun, 04 Jan 2026 01:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL0d5ky9z3S2Q for ; Sun, 04 Jan 2026 01:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491265; 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=ErmKobwkhm3nv0U39U3O1BMHXOUFeWb/gDVi7aLDSIo=; b=uLRaYQfbTtV1b3bpCz9UzmNHirMRcRiEO4cyvw+Q/2Texps6iy+gNnUVwuNL0nrZ57uwrN wyOrnKV1KzC5wveqDjx7Gce2jN6A6LMsF/qvqo+8ftZpkMQ1zYzhOzv9nxzPXBHSY+ecip KWVLWHzuJB3Cq+U0gAoWCZBOgcKCiUMmBoKM+YDF/9yO9DBK+g42c1HjkPQ3ljyW88Z436 jmPaCr5xAllQOPaW0ZKx5AUrkUOVAd4PzOxMnXDqY7l5pD+9E1dXb2/CUqg27juFSCV537 HAPst0VWjulWhaYjXnG5qUjp6R2jGvWZl+CIHgNDJo02bmfbO55fBJzlvupMJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491265; 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=ErmKobwkhm3nv0U39U3O1BMHXOUFeWb/gDVi7aLDSIo=; b=adszRj5tCfgYO967sEF357W5WzftYXtKTCvmF35svKzdw/ODx4i0xCM95iFW5VPmtnJbuQ EKrhyH1HXKmC6UaNfnSq6+al+o3VzXDKfgLbu4LrItI/oNZWr8Xudr76j4IuBLhUtMfCJ2 OoupKwN2AXOcsW6z+e7DipRfZosjDU8vEwLF3nLUgtGrAB0vE0G8eEAOSyDacpIC0pO3P9 tCTziKLOSHdII/6EfCXeadVG9b9lPjppWVqxNkbeseZNsDjtSgf/QHYKnQQTWLR/D0CkZu /0glh3wBFtX9ZgR7BckC4kadbMDvoNoiKZc5lmkR8g4E07jXMoI2P3k/j3tddQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491265; a=rsa-sha256; cv=none; b=PFNthDaHVpXujvx6xG+I32CLEL4KiYfXgmhqMuRCBEt6a61XrnV+NtRaV7b89H+EtJB8nF H4jD+e9T3m76qqEjhbMAHuKgnmSYCLzenz0AT+hYn2FwJKSnHXYo4d68AachbPOFNEn3SJ uK1O7jnJpsgdnnk5vCpNwkrowZNeNAn/3ELQVcgSjJHMqO+aFiXpBMJIxH13vIXtzvURUW RjMToThcR1BynjOZ+EzepV3iNqzRq2iLxMv6rYy/DDX9zcXG3S81ut6cScErYI1zG68rqc VLaGSc3h94QWexwNKfHJqmZVsWb1e3S6rQI6/tVJ69NN8cJGgThTvSrKW2cPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL0d5936z1RvK for ; Sun, 04 Jan 2026 01:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ccfa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:47:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 05230e3b27c6 - stable/15 - sys/xen: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 05230e3b27c69f5f02c69d9024bbdb857524cb76 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:47:45 +0000 Message-Id: <6959c6c1.3ccfa.6a51cde6@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=05230e3b27c69f5f02c69d9024bbdb857524cb76 commit 05230e3b27c69f5f02c69d9024bbdb857524cb76 Author: Alex Richardson AuthorDate: 2025-09-16 04:54:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:49 +0000 sys/xen: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9) --- sys/dev/xen/blkback/blkback.c | 2 +- sys/xen/xen_intr.h | 2 +- sys/xen/xenbus/xenbusvar.h | 8 ++++---- sys/xen/xenstore/xenstorevar.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index c6cba729b991..dcfdcafa9351 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -152,7 +152,7 @@ struct xbb_softc; struct xbb_xen_req; static void xbb_attach_failed(struct xbb_softc *xbb, int err, const char *fmt, - ...) __attribute__((format(printf, 3, 4))); + ...) __printflike(3, 4); static int xbb_shutdown(struct xbb_softc *xbb); /*------------------------------ Data Structures -----------------------------*/ diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 75c3dc7c6060..4965928cc8b4 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -182,7 +182,7 @@ void xen_intr_unbind(xen_intr_handle_t *handle); */ int xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __printflike(2, 3); /** * Signal the remote peer of an interrupt source associated with an diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index ee444c132c0c..0f4168f17e6a 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -151,7 +151,7 @@ int xenbus_grant_ring(device_t dev, unsigned long ring_mfn, grant_ref_t *refp); * printf arguments. */ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_error(). @@ -162,7 +162,7 @@ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Equivalent to xenbus_dev_error(), followed by @@ -174,7 +174,7 @@ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) * printf arguments. */ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_fatal(). @@ -185,7 +185,7 @@ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_vfatal(device_t dev, int err, const char *fmt, va_list) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Convert a member of the xenbus_state enum into an ASCII string. diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 8b02262396e8..f34ad375bc3a 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -270,7 +270,7 @@ int xs_scanf(struct xs_transaction t, */ int xs_printf(struct xs_transaction t, const char *dir, const char *node, const char *fmt, ...) - __attribute__((format(printf, 4, 5))); + __printflike(4, 5); /** * va_list version of xenbus_printf(). From nobody Sun Jan 4 01:50: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 4dkL3b4gtKz6MDK8 for ; Sun, 04 Jan 2026 01:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL3b1Smmz3SnR for ; Sun, 04 Jan 2026 01:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491419; 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=c5pynAhUVSMUAZ1PAX1pfOcHUmhfSbPKHwtCHYdUmPA=; b=ja6JxZi51cTsnwAiLXga9Uv8Xw/tNCnLll+CqAL5TgHoHD64ef12DRjVguYypUEvjABEFn 4bonaPY+Q8tN6MbDzCkI6AXfZ93LwGLwzqSSGNCiIucSm23ZP+lVhaA9qr8CJVrZdZB/NF 2TRlqq934bcKZqsNCw6j+0BteuFVLL1KcXARrsPQYgX8U1ZreCm8aCbAu3vds33Nd+Bc+l taQ6O6Xoe5GWjPvxtnXLckTjG/v3BoV9+9nWo+380gPTOiJflVDRcJRRb6sdhf0VhdlC3l y9ZXu1KeVQV4E20EDdvwUaNL1YRXsVlcY2YVDp1Xxuoup3ynF4vBt5OseWqThA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491419; 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=c5pynAhUVSMUAZ1PAX1pfOcHUmhfSbPKHwtCHYdUmPA=; b=YUvAAJD6Iu0c/7oOqyafvo9WQ0os/1jGKXZR62ObQwQdBCeQ+UkW8PTxrbDqrcuVxvYtZ5 4HDEo3c2O25NbpKU8FqKQuBtaEct9zlD61Jw0T1tPP1yPIRdJjGlQ7lA4lhSf0prRugfav dNrOUJwPsNTGzpVp0cvjLF2F+nyMArC6DJWyftAla5Daj4E5C+835lvwhDsQRHizfJABKz pEePBYqzYk9SJxpjHg+q6SUb/FbbzJylBktiH2tBwH+GI93kuIzx7ScZNZwtDMh9d5Tbwo OiX0bvo79TrwDECZm/G922crAoovoQjnJ5FZBY6jfcWkEo4PuzyNwnajmaDzcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491419; a=rsa-sha256; cv=none; b=w/hmR6gE3NHwO2n3ziLGQgQlpWOqK29wBc+pOwD/TwepylhSVfoFw1gB33zte0ReWMc7P2 ARyweUq3huGcjPZ5CP6GuhLn4SYSvckVbOuZ/mbH/ytneiBRwKyo6W9ZlovGnINbX3R/RF OQRTPBA6aocNeR1Fk45o1/dBdZKOXkN+o8pRMrw4cfyMhGz74aKAMuzv017AiRmrkcn8p9 XKuoXkkI5dlvcs65m6H06rqAMw/sviNmFJ+MrEvXASZW7HziDr5lkfD2ioZHf/74IFGJwW 9zxEOV0xwTl+sSURfh9v5l7q8hH9fRCPEmHY18iqMJT7I3b8pYYZU9eYfKAEKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL3b0WH0z1SLl for ; Sun, 04 Jan 2026 01:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:50:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 108270f4c03d - stable/14 - ocs_fc: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 108270f4c03d4d39815c587627e650e558e22d2e Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:50:19 +0000 Message-Id: <6959c75b.3ed94.43e25f38@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=108270f4c03d4d39815c587627e650e558e22d2e commit 108270f4c03d4d39815c587627e650e558e22d2e Author: Alex Richardson AuthorDate: 2025-09-16 04:58:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:37 +0000 ocs_fc: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 3c0ea1b629764c49611e3e3adfa0c44f9afa3558) --- sys/dev/ocs_fc/ocs_ddump.h | 3 +-- sys/dev/ocs_fc/ocs_mgmt.h | 3 +-- sys/dev/ocs_fc/ocs_os.h | 2 +- sys/dev/ocs_fc/ocs_utils.h | 12 ++++-------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_ddump.h b/sys/dev/ocs_fc/ocs_ddump.h index b7d7eefad813..3cffff6d9670 100644 --- a/sys/dev/ocs_fc/ocs_ddump.h +++ b/sys/dev/ocs_fc/ocs_ddump.h @@ -46,8 +46,7 @@ extern void ocs_ddump_startfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_endfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_section(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); extern void ocs_ddump_endsection(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); -__attribute__((format(printf,3,4))) -extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...); +extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...) __printflike(3, 4); extern void ocs_ddump_buffer(ocs_textbuf_t *textbuf, const char *name, uint32_t instance, void *buffer, uint32_t size); extern int32_t ocs_save_ddump(ocs_t *ocs, uint32_t flags, uint32_t qentries); extern int32_t ocs_get_saved_ddump(ocs_t *ocs, ocs_textbuf_t *textbuf); diff --git a/sys/dev/ocs_fc/ocs_mgmt.h b/sys/dev/ocs_fc/ocs_mgmt.h index 7b59a3916ca8..9781aec18462 100644 --- a/sys/dev/ocs_fc/ocs_mgmt.h +++ b/sys/dev/ocs_fc/ocs_mgmt.h @@ -95,8 +95,7 @@ extern void ocs_mgmt_end_section(ocs_textbuf_t *textbuf, const char *name, int i extern void ocs_mgmt_end_unnumbered_section(ocs_textbuf_t *textbuf, const char *name); extern void ocs_mgmt_emit_property_name(ocs_textbuf_t *textbuf, int access, const char *name); extern void ocs_mgmt_emit_string(ocs_textbuf_t *textbuf, int access, const char *name, const char *value); -__attribute__((format(printf,4,5))) -extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...); +extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...) __printflike(4, 5); extern void ocs_mgmt_emit_boolean(ocs_textbuf_t *textbuf, int access, const char *name, const int value); extern int parse_wwn(char *wwn_in, uint64_t *wwn_out); diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 9e3beff35548..e0024a198cb7 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -711,7 +711,7 @@ typedef struct { * @return returns 0 for success, a negative error code value for failure. */ -extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __attribute__((format(printf, 3, 4))); +extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __printflike(3, 4); /** * @brief execute a P (decrement) operation diff --git a/sys/dev/ocs_fc/ocs_utils.h b/sys/dev/ocs_fc/ocs_utils.h index e3a952e0cf26..7c9c9ae85b74 100644 --- a/sys/dev/ocs_fc/ocs_utils.h +++ b/sys/dev/ocs_fc/ocs_utils.h @@ -103,10 +103,8 @@ extern int32_t ocs_textbuf_init(ocs_t *ocs, ocs_textbuf_t *textbuf, void *buffer extern void ocs_textbuf_free(ocs_t *ocs, ocs_textbuf_t *textbuf); extern void ocs_textbuf_putc(ocs_textbuf_t *textbuf, uint8_t c); extern void ocs_textbuf_puts(ocs_textbuf_t *textbuf, char *s); -__attribute__((format(printf,2,3))) -extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap); +extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...) __printflike(2, 3); +extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap) __printflike(2, 0); extern void ocs_textbuf_buffer(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern void ocs_textbuf_copy(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern int32_t ocs_textbuf_remaining(ocs_textbuf_t *textbuf); @@ -325,10 +323,8 @@ typedef struct ocs_ramlog_s ocs_ramlog_t; extern ocs_ramlog_t *ocs_ramlog_init(ocs_t *ocs, uint32_t buffer_len, uint32_t buffer_count); extern void ocs_ramlog_free(ocs_t *ocs, ocs_ramlog_t *ramlog); extern void ocs_ramlog_clear(ocs_t *ocs, ocs_ramlog_t *ramlog, int clear_start_of_day, int clear_recent); -__attribute__((format(printf,2,3))) -extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap); +extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...) __printflike(2, 3); +extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap) __printflike(2, 0); extern int32_t ocs_ddump_ramlog(ocs_textbuf_t *textbuf, ocs_ramlog_t *ramlog); #endif From nobody Sun Jan 4 01:50: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 4dkL3c2nGLz6MDG3 for ; Sun, 04 Jan 2026 01:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL3c1Mngz3SWq for ; Sun, 04 Jan 2026 01:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491420; 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=KthR+x17rA2MU70q1+p5PDxZyll2kaPIhkhfCh2EBg4=; b=w7eDCiPs/EjAzIjVdVNDyDJCIB+ZtFZ61/1f8AB21NIU4dWRE3uKRjcpvnpSz6rJ31y2Bu tvLqoI5ta43wwBOJU0NSByBpkJARe6LDVxH0iiglxbNufm/aev6xUe2F9l44pf0I0Bf3WP PdH5v3Al7Rv4OEuOnWUc26Q+OOJ9wu9q2kjInCgXXXP4ddM9zIf9fIcNj6o50hwiAJTrFu rWhNxFqzE2qw1DXscwAqL6uakYy0Nzlm2lEzqDPb1rS4XC6NNus3r2k4EG+2loS7dj4RbD 3Gtx0uX7/nLuA6An5vUNWBvnrKtzp/wY5XQsy8/aSSMwtxLxEjMTcbZFoFuWxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491420; 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=KthR+x17rA2MU70q1+p5PDxZyll2kaPIhkhfCh2EBg4=; b=BbRHCzyrYK8jsotvxkDd12ZPEwy4j6lj7zZmOarVoJ2uU0QmCJcF1sOcCtM+vCy6+fiCqz a/C8AbdzroE66gVlGtRrw4mzq2XLJYHrDBxcaYG3Oe3kzeSEvLMBoQZ9x9hT/oJZ0hgrI0 Ci7QwMJa8VUralNFaE+JbAEnkMQyC0ptRWapBHNZ42EJsCzQDPIjSEouQhERCTnOOqiEYI d1XekmoOUjy7kj5RLI3cFeRFtgpnY3ys8l8103Xy2nSqJ/cAUvR1XzT8KGpuDt4GLPxCuY hyPRbIcf/uVTn/nDuUR/rkvH9RFCAfdGEC2De6+RQuFUmKtOAferDFUJ+shVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491420; a=rsa-sha256; cv=none; b=cRLigcSJ9aUX7LtYs5jAore+R/1mY2XeE6J+aXtDysNyfGK/GAXTrzPT/2f/+NkGnKKJ2x aLe6yqIfEHnDJ1VkLxw0ahPn+7eiRfAh3HUObHopZ6yMYShG7/SieZ+98mqShZyAwWVvXz UmB9sBQrGDu4uzcApXxC5t+guBSZC1ulkO1rGul6Y00K75r4GioA7Cz76UxoKf4JuJWDd8 dI5QAVrix4yH/r6FEaypUYA3PFfbh0zW8Wz7LN3eFin6iPP7gjUl9u0z6VV0VdzJDQIW82 iuYotJn+7uiD6A5YYINIO/KVj94q//TUH1ZTmbLNklDjCrnXurQcH80PM1VzyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL3c0wC7zd for ; Sun, 04 Jan 2026 01:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e160 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:50:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 21961607e631 - stable/14 - sys/xen: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21961607e631a9c00a6a8aa1a20d3b2034f834ae Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:50:20 +0000 Message-Id: <6959c75c.3e160.5470aa6e@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=21961607e631a9c00a6a8aa1a20d3b2034f834ae commit 21961607e631a9c00a6a8aa1a20d3b2034f834ae Author: Alex Richardson AuthorDate: 2025-09-16 04:54:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:52 +0000 sys/xen: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9) --- sys/dev/xen/blkback/blkback.c | 2 +- sys/xen/xen_intr.h | 2 +- sys/xen/xenbus/xenbusvar.h | 8 ++++---- sys/xen/xenstore/xenstorevar.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index 8711bf0b08f5..b6c780320db3 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -152,7 +152,7 @@ struct xbb_softc; struct xbb_xen_req; static void xbb_attach_failed(struct xbb_softc *xbb, int err, const char *fmt, - ...) __attribute__((format(printf, 3, 4))); + ...) __printflike(3, 4); static int xbb_shutdown(struct xbb_softc *xbb); /*------------------------------ Data Structures -----------------------------*/ diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 75c3dc7c6060..4965928cc8b4 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -182,7 +182,7 @@ void xen_intr_unbind(xen_intr_handle_t *handle); */ int xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __printflike(2, 3); /** * Signal the remote peer of an interrupt source associated with an diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index 2e3d95795c43..22f192fdea8d 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -152,7 +152,7 @@ int xenbus_grant_ring(device_t dev, unsigned long ring_mfn, grant_ref_t *refp); * printf arguments. */ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_error(). @@ -163,7 +163,7 @@ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Equivalent to xenbus_dev_error(), followed by @@ -175,7 +175,7 @@ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) * printf arguments. */ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_fatal(). @@ -186,7 +186,7 @@ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_vfatal(device_t dev, int err, const char *fmt, va_list) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Convert a member of the xenbus_state enum into an ASCII string. diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 3b281ed21b0e..e602aac9e39c 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -271,7 +271,7 @@ int xs_scanf(struct xs_transaction t, */ int xs_printf(struct xs_transaction t, const char *dir, const char *node, const char *fmt, ...) - __attribute__((format(printf, 4, 5))); + __printflike(4, 5); /** * va_list version of xenbus_printf(). From nobody Sun Jan 4 01: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 4dkL3r70ZVz6MD6W for ; Sun, 04 Jan 2026 01:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL3r3hSbz3SyX for ; Sun, 04 Jan 2026 01:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491432; 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=rrdTbBM+KjNGK35G/OjMH4Jr8u75FDttTR3hI4VkIWg=; b=k1jQqJIlK9YascB8AVcuMMv8r4JR4GC2tsM8mwJo1Tclm/78tw6KHOCWRz8Ec5EouRCVfI SlLJM7xj5P88ljaMy0qCM0pYyntmlz9lvesOVbsmTvsegHShIUz93yLnoREFDdrkfOYjwz 0N+S9ezpnTGAOrnNRQFaYsMK7I/qpAg4ehzJSAM49MC+i7flPahiBDc9M0fB/MWQcOYlVF YubV+QqFaVfu1m7b3FcRx0ToHe9RWb8EnPGkJ7Jx+c5bbKXOefLMVH7FyL5DygQhpV+ugV 84I1Yv5gwDRHi064RzlgDdYgOiSM2fCF2+0DMDmcFs9Hi7S2Oo+hliWAVXm+Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491432; 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=rrdTbBM+KjNGK35G/OjMH4Jr8u75FDttTR3hI4VkIWg=; b=MYTyuovni+BhQMToD4WPixPSKK24E7wLVOCovx96RvmDChTtBfrXe3LxZcVnKbt1lwOqiH 3B3VoaaY+4q5n2dInZxGf2WSIiSUa/FoH/o0eKyOglyGuYaB+ccjZxDuGiSFgstTLvS4pS bD11vOek8jK/OjBcjLEyd/5kUUuT7RSKvNm47hQgx4m66iWBlflPJ3A/ni6CH7yaRBHTE/ 8RWigQPS5MNQhgSVZVCWlFkYGjZX2FmYTiZyW/oD0lphu4POrZRp1GVfPBo19xq6IC76gM h/NVYC+0x63uX7QAZzAoKumABPPDzDy5K9mD2OtCvW+8xEzdIdvmBP5JrnwBzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491432; a=rsa-sha256; cv=none; b=l6L/8ALnn/sdgOWsp9UCPCihHM6YiL9FffMFYpQCWmj3/H10aSsMFd5hgb0ENmG4QDHo/F DwmjoW6APMUtZ4U+tvtl9KnRp/2NHvk3nNGh6ceBIGGF+ewpugd3sDsWHt52Lt1lnuO3lu MYCBb9JbkJNpQ9BNvqDtr5faug8e9D4RaBqXubRs8786S2baQ0+FDw+YpsMEGUrmWr0q5h xjbIX8n7yH/kUgHteKQHDEkkMEaAm5do+Qt/79qaKHJViPy0oQaNWVctSC8fbJot+V+xHz eQCupg3zCuOdZxN/PPEIbtkgp6H6barpCQWpvc2l+EmMoM7KPsadZvyULPx+Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL3r3Cyyz1RZf for ; Sun, 04 Jan 2026 01:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: b94022db9aed - stable/13 - ocs_fc: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b94022db9aed8e01675baafde096e09c63bf6cf6 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:50:32 +0000 Message-Id: <6959c768.3ed9d.74a037a5@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b94022db9aed8e01675baafde096e09c63bf6cf6 commit b94022db9aed8e01675baafde096e09c63bf6cf6 Author: Alex Richardson AuthorDate: 2025-09-16 04:58:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:39 +0000 ocs_fc: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 3c0ea1b629764c49611e3e3adfa0c44f9afa3558) --- sys/dev/ocs_fc/ocs_ddump.h | 3 +-- sys/dev/ocs_fc/ocs_mgmt.h | 3 +-- sys/dev/ocs_fc/ocs_os.h | 2 +- sys/dev/ocs_fc/ocs_utils.h | 12 ++++-------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_ddump.h b/sys/dev/ocs_fc/ocs_ddump.h index b7d7eefad813..3cffff6d9670 100644 --- a/sys/dev/ocs_fc/ocs_ddump.h +++ b/sys/dev/ocs_fc/ocs_ddump.h @@ -46,8 +46,7 @@ extern void ocs_ddump_startfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_endfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_section(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); extern void ocs_ddump_endsection(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); -__attribute__((format(printf,3,4))) -extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...); +extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...) __printflike(3, 4); extern void ocs_ddump_buffer(ocs_textbuf_t *textbuf, const char *name, uint32_t instance, void *buffer, uint32_t size); extern int32_t ocs_save_ddump(ocs_t *ocs, uint32_t flags, uint32_t qentries); extern int32_t ocs_get_saved_ddump(ocs_t *ocs, ocs_textbuf_t *textbuf); diff --git a/sys/dev/ocs_fc/ocs_mgmt.h b/sys/dev/ocs_fc/ocs_mgmt.h index 7b59a3916ca8..9781aec18462 100644 --- a/sys/dev/ocs_fc/ocs_mgmt.h +++ b/sys/dev/ocs_fc/ocs_mgmt.h @@ -95,8 +95,7 @@ extern void ocs_mgmt_end_section(ocs_textbuf_t *textbuf, const char *name, int i extern void ocs_mgmt_end_unnumbered_section(ocs_textbuf_t *textbuf, const char *name); extern void ocs_mgmt_emit_property_name(ocs_textbuf_t *textbuf, int access, const char *name); extern void ocs_mgmt_emit_string(ocs_textbuf_t *textbuf, int access, const char *name, const char *value); -__attribute__((format(printf,4,5))) -extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...); +extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...) __printflike(4, 5); extern void ocs_mgmt_emit_boolean(ocs_textbuf_t *textbuf, int access, const char *name, const int value); extern int parse_wwn(char *wwn_in, uint64_t *wwn_out); diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 9e3beff35548..e0024a198cb7 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -711,7 +711,7 @@ typedef struct { * @return returns 0 for success, a negative error code value for failure. */ -extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __attribute__((format(printf, 3, 4))); +extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __printflike(3, 4); /** * @brief execute a P (decrement) operation diff --git a/sys/dev/ocs_fc/ocs_utils.h b/sys/dev/ocs_fc/ocs_utils.h index e3a952e0cf26..7c9c9ae85b74 100644 --- a/sys/dev/ocs_fc/ocs_utils.h +++ b/sys/dev/ocs_fc/ocs_utils.h @@ -103,10 +103,8 @@ extern int32_t ocs_textbuf_init(ocs_t *ocs, ocs_textbuf_t *textbuf, void *buffer extern void ocs_textbuf_free(ocs_t *ocs, ocs_textbuf_t *textbuf); extern void ocs_textbuf_putc(ocs_textbuf_t *textbuf, uint8_t c); extern void ocs_textbuf_puts(ocs_textbuf_t *textbuf, char *s); -__attribute__((format(printf,2,3))) -extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap); +extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...) __printflike(2, 3); +extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap) __printflike(2, 0); extern void ocs_textbuf_buffer(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern void ocs_textbuf_copy(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern int32_t ocs_textbuf_remaining(ocs_textbuf_t *textbuf); @@ -325,10 +323,8 @@ typedef struct ocs_ramlog_s ocs_ramlog_t; extern ocs_ramlog_t *ocs_ramlog_init(ocs_t *ocs, uint32_t buffer_len, uint32_t buffer_count); extern void ocs_ramlog_free(ocs_t *ocs, ocs_ramlog_t *ramlog); extern void ocs_ramlog_clear(ocs_t *ocs, ocs_ramlog_t *ramlog, int clear_start_of_day, int clear_recent); -__attribute__((format(printf,2,3))) -extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap); +extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...) __printflike(2, 3); +extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap) __printflike(2, 0); extern int32_t ocs_ddump_ramlog(ocs_textbuf_t *textbuf, ocs_ramlog_t *ramlog); #endif From nobody Sun Jan 4 01:50: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 4dkL3t1sXwz6MD6X for ; Sun, 04 Jan 2026 01:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL3s5ZvVz3T9H for ; Sun, 04 Jan 2026 01:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491433; 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=RvxgMl8E7PMpv2A+72VML+PYXRin7BPvBEkdJjppSQw=; b=mT2g/G9hUAcnG4g1uQmT/5AiUUMsFeeRHQ9AF50JOlzo+uaA7UQAnYmg6fswfqDd3fuFoh RnuJL2lwTUDO1YuE4mV6neT6LwHbSumS+d7fdshj5TwC5ZB4oR3dOE9nTDZ2J2oYP4cjca ucHbXdgPnUZDY/YtUfyfoSykFzTnDCkBCAvxGNoLr/vEcKwl8nFaP0qJpLaT8B+Js42B86 hKwYM/75wfcpYXAeZWmTaDgz+4fdvjv9agmeHx5o2l/LQH5ZM+W0EcrWMZ2wZa7KHOgdzB +qIcjOa0M9whMYNbR4kkWDLy93E6X9Un1pZdSknjaUM2LeyPa24TjGU5hICLNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491433; 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=RvxgMl8E7PMpv2A+72VML+PYXRin7BPvBEkdJjppSQw=; b=nT33//okqMzghmfcxVFrEcNAl7unl0/GFURTNwpYTrhBthbxw/b4E0U7/W8eWi8UK1mglc qb+/BblcecAe+GtDCi7Zcf9SLH+LA0gca0gwX4hldJ4nWAmmGGeu1B8JQJlWzIhFDmwpNm hpAsJP8nqeqX6IA5RopbWBLmtFrDBvjo+qkjXX0QmCVvdDpun/95q+BYiK/7ZU4uUvS6M6 q2mKBiCQxeu18ATLCj7X198s/cv6DWVEAvXUg/l9a2McF7sEP7XcSxRbPbCafEc4gS46eK u0eYz2e3sV1wODuSzf0XSoeUOrQqrEw3FjybJCOaR21okM4pkioZiG/2fwd6nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491433; a=rsa-sha256; cv=none; b=PMVmwH6x+ClVKQyNoe/3ZdjitRhIH2sdSdh/TpjEMpVGgzEXVLvk3iWwYDayfZy/lMtjGt +DbJFsyO/onectZ+rfIei4fJr4btQM/gN7pVfvaXgIvONjJyqsgWZoEUKoVmQSkQbeno47 04t39F9A5NwSFwj3r7a/hEJsmqFnvGmC0911vzJWFhWD/uoiKRN2Fp3vxyq3ZTfN6XNMOs Vl8XFzGHvTU3S3a6oZIvGze9tC+aDEWvt9j61+3cUvB9WDcRAcRmMKl5SzpKkrRN56rScj p1F/JPPHsZ/ni5IE3ylIvP9mzALrI77k0fV44NwyrBkFuPOtcqk1K9Ll0oF6Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL3s3p2Nz1SLn for ; Sun, 04 Jan 2026 01:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:50:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: a96eb797b2d4 - stable/13 - sys/xen: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a96eb797b2d4eab42b8d03935850532939df8fcc Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:50:33 +0000 Message-Id: <6959c769.3ef82.2c7472b3@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a96eb797b2d4eab42b8d03935850532939df8fcc commit a96eb797b2d4eab42b8d03935850532939df8fcc Author: Alex Richardson AuthorDate: 2025-09-16 04:54:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:55 +0000 sys/xen: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9) --- sys/dev/xen/blkback/blkback.c | 2 +- sys/xen/xen_intr.h | 2 +- sys/xen/xenbus/xenbusvar.h | 8 ++++---- sys/xen/xenstore/xenstorevar.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index c58af5e9c90f..57dafd762e41 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -173,7 +173,7 @@ struct xbb_softc; struct xbb_xen_req; static void xbb_attach_failed(struct xbb_softc *xbb, int err, const char *fmt, - ...) __attribute__((format(printf, 3, 4))); + ...) __printflike(3, 4); static int xbb_shutdown(struct xbb_softc *xbb); /*------------------------------ Data Structures -----------------------------*/ diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 57e1337398f4..25d676a15632 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -194,7 +194,7 @@ void xen_intr_unbind(xen_intr_handle_t *handle); */ int xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __printflike(2, 3); /** * Signal the remote peer of an interrupt source associated with an diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index 6cb6033bdca1..c332b261a62e 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -152,7 +152,7 @@ int xenbus_grant_ring(device_t dev, unsigned long ring_mfn, grant_ref_t *refp); * printf arguments. */ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_error(). @@ -163,7 +163,7 @@ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Equivalent to xenbus_dev_error(), followed by @@ -175,7 +175,7 @@ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) * printf arguments. */ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_fatal(). @@ -186,7 +186,7 @@ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_vfatal(device_t dev, int err, const char *fmt, va_list) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Convert a member of the xenbus_state enum into an ASCII string. diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 021b609d2f9c..89cfa0dda32f 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -271,7 +271,7 @@ int xs_scanf(struct xs_transaction t, */ int xs_printf(struct xs_transaction t, const char *dir, const char *node, const char *fmt, ...) - __attribute__((format(printf, 4, 5))); + __printflike(4, 5); /** * va_list version of xenbus_printf(). From nobody Sun Jan 4 02:28: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 4dkLvB44cPz6MGgm for ; Sun, 04 Jan 2026 02:28: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkLvB2ly7z3X4D for ; Sun, 04 Jan 2026 02:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767493686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oJjXdWeKIBVNz8SBQBnJ4GhjCcc8yAbDzM0tUgopB2M=; b=ZoZwsAR5YODOKdJsMDqYhuVf5GT6CC7byJTCL/nNkxKn5+s9O2ULijCk1oY5XlL2ui86bE QNqkST6KmrlTK2Cg0YYX+AZXbLFC4V7b+SzewOnbMDAoaEFtiM8rLwg7O091zGnTQy3oj1 kqnhx6iEySiRP4KpaQAsIziCxDFcf1DdR7EQXe4ufwsZ9ehv5fdCYjkKWUy2UIgeh0qTZz 9uwSeAlfDAxcdKpvZwDrDEWKVk9wY80DxKVUNLMJCF00DmEMdxVRrYf/Sa/NCYuDn6vYfd kfrUC5BOlqYDPdmn/Hjd1vB2bXdHqL6ZIUoK4rdtkpDcoZdCmTSW9Rd2ndw3cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767493686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oJjXdWeKIBVNz8SBQBnJ4GhjCcc8yAbDzM0tUgopB2M=; b=JXNeWLV7bA6tKnm5lul9x6dePnJfyX5SPox7qpFspmFasf7jFrJNKgdXNdPElJXw9Z4+rd Drh0fiXkuuIvhRKF+205XOUZxdHj4U26OR8mYsO3p+kg3xEaA2iIdS1od1s/LqK5XyBZ3+ Iz8W1i+rJip2QK+T3c/MR5wFvz5AGHx1x+OVO/tFF5H0ZILs+q/c1ZAP/hVla9X+Nu1+in zxwLpJfe0nlEviHVhEZ5mdZ9NlK9S5Y8cir/2YrG9qJTL8IsM29HPheX12SWkuO0eoub4G 0yEOOO5DwhPUzfPtmsz5m4cWLOzJmFuhod/YTiM4PdRhcYE1SbcJVj8HXg49dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767493686; a=rsa-sha256; cv=none; b=LELajCu0NHORuFwxyq3ExjjO8PJ/mVggCzBUV4TSirCzfqjAAyVUWfd2C2QFZWxDaGmYxN 7480O2Afji5cSs7l4sb6tlnqVuYaU+PATt0bTCMB0/MTpbKux/O8nJFo4410sxG47CaXMB wmh2d2QPGMcao4+BvWktA2NU4qN6Aq6h6ychJDTUJpqMitEdU6WLwcYyuF5TudHUOgA3j2 NkSE7UzYZZeObePX9y1g4o9kcPXoIJegl+YH6qY/l6MKfEc9VaoxBG1I5jOGTSHsjOw63/ 3WzhuQLlowYEmKl2gOZ2zJb1uUffrSbZ/Hy5F7g9GsWli14GgIrhbZ9u/uUnlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkLvB2JRGzSS for ; Sun, 04 Jan 2026 02:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a488 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 02:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 8df2e5421468 - main - powerpc: put the isync inside the TD_LOCK() checking loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8df2e542146801fd01675e56724eaa567d04c209 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 02:28:06 +0000 Message-Id: <6959d036.a488.771ea5c1@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8df2e542146801fd01675e56724eaa567d04c209 commit 8df2e542146801fd01675e56724eaa567d04c209 Author: Adrian Chadd AuthorDate: 2026-01-03 22:52:14 +0000 Commit: Adrian Chadd CommitDate: 2026-01-04 02:27:48 +0000 powerpc: put the isync inside the TD_LOCK() checking loop Fix a narrow window where the lock is unlocked but the checking CPU hasn't flushed things appropriately. Inside this window the CPU inside cpu_switch() will loop forever thinking the destination thread is still blocked/locked even though it is not. This manifests as the system hanging after starting all APs. I've seen this reliably trigger in qemu-system-ppc64 running power9 pseries guests; the more CPUs the more likely it triggers at boot. PR: kern/292167 Differential Revision: https://reviews.freebsd.org/D54478 Reviewed by: jhibbits MFC after: 1 week Relnotes: yes --- sys/powerpc/powerpc/swtch32.S | 2 +- sys/powerpc/powerpc/swtch64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powerpc/swtch32.S b/sys/powerpc/powerpc/swtch32.S index 547e1c5a201b..ef1a397bf74d 100644 --- a/sys/powerpc/powerpc/swtch32.S +++ b/sys/powerpc/powerpc/swtch32.S @@ -141,8 +141,8 @@ cpu_switchin: blocked_loop: lwz %r7,TD_LOCK(%r2) cmpw %r6,%r7 - beq- blocked_loop isync + beq- blocked_loop #endif lwz %r17,TD_PCB(%r2) /* Get new current PCB */ diff --git a/sys/powerpc/powerpc/swtch64.S b/sys/powerpc/powerpc/swtch64.S index 5f80751c8a10..ba37274d32bb 100644 --- a/sys/powerpc/powerpc/swtch64.S +++ b/sys/powerpc/powerpc/swtch64.S @@ -194,8 +194,8 @@ cpu_switchin: blocked_loop: ld %r7,TD_LOCK(%r13) cmpd %r6,%r7 - beq- blocked_loop isync + beq- blocked_loop #endif ld %r17,TD_PCB(%r13) /* Get new PCB */ From nobody Sun Jan 4 09:20: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 4dkX2q1XvVz6MlkX for ; Sun, 04 Jan 2026 09:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkX2p5YGHz46gL for ; Sun, 04 Jan 2026 09:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tFJSjhZNTjqV8ljvm5ZcETd2bXYeCraQkda3SZcCC4w=; b=waj+i9AysA3R0VyW3EqWLporzULER2Ip+fxQ3eWyzrEmLJuALSEwfVV//kv2naHwX9pSBF 0RBW7x62mz+VtDo1u40qQfmqvSLw2UDdWDfY0Vax8QL2U5vqK/H/kha41MbA4hCgFnKL9/ Rg8slrqTUeWm+BO6FwElxFyHoUkG57zMALajXIS7YTGWvVGkBGQ381iwIPw9irlQBd9bmq N/zwYbG/mQNywojheLLmyaK6FaNfA4n6j1Fjs+7xyPn4MAxzzPma0/XH4tbhCA9MqU11yL 0t1oYXTvmSdSFXrtkAe4cGcRfkTBtldh5RDDj7D0oJ1XMTAjVfqUMnsjyZTmnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tFJSjhZNTjqV8ljvm5ZcETd2bXYeCraQkda3SZcCC4w=; b=CTUOegM13wmvEe1pks3L6Ob9BCLZ43rvaZnXK1WZTN8el4uL8z1/ULDVFXHDX3dg3gDByG 5bqwP6LPdLZHeOeuMTAPq2n0Hd12EEp6YQOi5yu4Yc1NbWXkwNPLpnubeymYwIVKk97pEx KK633S8XZBWmf5F/rqqlIaYaDuxZe7dTscb3zW/B+Kbu+wC6o2Cc1o9T2pXy9+T4T2QND2 Lc/WqzlvZLPnKXbVWhLTtE4PEOCCoHy3pHqDtFXk5V1aDrG5s/ERjwObpl1gDlsy3psVSI ud1Hj0gW2hWiAwf41HdM/Bzzq98gSbMLpl3G36HWa7Ac4u1AxJ56sb/Tqo2R3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767518418; a=rsa-sha256; cv=none; b=eCaV3TtHu22oof6qPvn/uc58WR7utQ4mgOxSwqD9kU9vfmPmZFltDvvvY0+ruExdMrWRCy HHHFIYqSpP2iJ4vuLAQz+O+0jeCIDkSAhnRhnCYZZxyqmcybemSt33lnpyogvxaL6b06Jg SvupLuGu38jx03Ioo3EFFaHzYL4xyLQuW+bICGZgYkGnIiasGtbNWl0UsGF0Xu6uF6OBt5 FsjAOmBcIdsQu74ykTC7whIW6hYC1eqWgrloryvTNm1IcrjEBwAtksGT4xTB9fij1irk3g dLkKY+v1kBFSXow3VbnnTzXN2asug5d7pC6bFK+HCCYCLE2AskIg5xvoi+dTsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkX2p4sq8zCW4 for ; Sun, 04 Jan 2026 09:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a7f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:20:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 08cdcff58acb - main - crypto/openssl: update vendor update instructions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08cdcff58acb2aec881e42c7f097d6492d864898 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:20:18 +0000 Message-Id: <695a30d2.a7f4.8a66139@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=08cdcff58acb2aec881e42c7f097d6492d864898 commit 08cdcff58acb2aec881e42c7f097d6492d864898 Author: Enji Cooper AuthorDate: 2025-10-11 21:12:55 +0000 Commit: Enji Cooper CommitDate: 2026-01-04 09:20:13 +0000 crypto/openssl: update vendor update instructions This change fills out the requirements for doing vendor updates, documents the new vendor update process, and guides whoever needs to do the next version update a bit better than the documentation did prior to this change so everyone can pitch in with version updates a bit better. Convert the document to Markdown while here to make it easier to render/print out the directions in a structured format. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53190 --- crypto/openssl/FREEBSD-upgrade | 122 ----------------------- crypto/openssl/FREEBSD-upgrade.md | 202 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 122 deletions(-) diff --git a/crypto/openssl/FREEBSD-upgrade b/crypto/openssl/FREEBSD-upgrade deleted file mode 100644 index 86e65e8e07dd..000000000000 --- a/crypto/openssl/FREEBSD-upgrade +++ /dev/null @@ -1,122 +0,0 @@ - FreeBSD maintainer's guide to OpenSSL - ===================================== - - These instructions assume you have a clone of the FreeBSD git repo - main branch in src/freebsd/main, and will store vendor trees under - src/freebsd/vendor/. In addition, this assumes there is a "freebsd" - origin pointing to git(repo).freebsd.org/src.git. - -01) Switch to the vendor branch: - - $ cd src/freebsd/main - $ git worktree add -b vendor/openssl-X.Y ../vendor/openssl-X.Y freebsd/vendor/openssl-X.Y - $ cd ../vendor/openssl-X.Y - -02) Download the latest OpenSSL tarball and signature from the official - website (https://www.openssl.org/source/). - - $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-X.Y.Z/openssl-X.Y.Z.tar.gz) - $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-X.Y.Z/openssl-X.Y.Z.tar.gz.asc) - -03) Verify the signature: - - $ gpg --verify ../openssl-X.Y.Z.tar.gz.asc ../openssl-X.Y.Z.tar.gz - -04) Unpack the OpenSSL tarball to the parent directory: - - $ tar xf ../openssl-X.Y.Z.tar.gz -C .. - -05) Copy to the vendor branch: - - $ rsync --exclude .git --delete -av ../openssl-X.Y.Z/ . - -06) Take care of added / deleted files: - - $ git add -A - -07) Commit: - - $ git commit -m "openssl: Vendor import of OpenSSL X.Y.Z" - -08) Tag: - - $ git tag -a -m "Tag OpenSSL X.Y.Z" vendor/openssl/X.Y.Z - - At this point the vendor branch can be pushed to the FreeBSD repo via: - - $ git push freebsd vendor/openssl-X.Y - $ git push freebsd vendor/openssl/X.Y.Z - - Note the second "git push" command is used to push the tag, which is - not pushed by default. - - It is also possible to push the branch and tag together, but use - --dry-run first to ensure that no undesired tags will be pushed: - - $ git push --dry-run --follow-tags freebsd vendor/openssl-X.Y - $ git push --follow-tags freebsd vendor/openssl-X.Y - - The update and tag could instead be pushed later, along with the merge - to main, but pushing now allows others to collaborate. - -09) Merge from the vendor branch: - - $ git subtree merge -P crypto/openssl vendor/openssl-X.Y - - A number of files have been deleted from FreeBSD's copy of OpenSSL. - If git prompts for these deleted files during the merge, choose 'd' - (leaving them deleted). - -10) Resolve conflicts. Remember to bump the version and date in - secure/lib/libcrypto/Makefile.inc and - crypto/openssl/include/openssl/opensslv.h. - -11) Diff against the vendor branch: - - $ git diff --diff-filter=M vendor/openssl/X.Y.Z HEAD:crypto/openssl - - Review the diff for any unexpected changes. - -12) Re-generate the assembly files: - - $ cd secure/lib/libcrypto - $ make cleanasm buildasm - -13) Update the appropriate makefiles to reflect changes in the vendor's - build.info files. This is especially important if source files have - been added or removed. Keep in mind that the assembly files generated - belong to sys/crypto/openssl, and will therefore affect the kernel as - well. - -14) If symbols have been added or removed, update the appropriate - Version.map to reflect these changes. - -15) Compare compilation flags, the list of files built and included, the - list of symbols generated with the corresponding port if available. - -16) Re-generate the manual files: - - $ tar xzf openssl-X.Y.Z.tar.gz - $ (cd openssl-X.Y.Z && ./Configure --prefix=/usr --openssldir=/etc/ssl && - make build_man_docs) - [...] - $ find openssl-X.Y.Z/doc/man/man1 -name '*.1' -exec cp {} secure/usr.bin/openssl/man/ \; - $ find openssl-X.Y.Z/doc/man/man3 -name '*.3' -exec cp {} secure/lib/libcrypto/man/man3/ \; - $ find openssl-X.Y.Z/doc/man/man5 -name '*.5' -exec cp {} secure/lib/libcrypto/man/man5/ \; - $ find openssl-X.Y.Z/doc/man/man7 -name '*.7' -exec cp {} secure/lib/libcrypto/man/man7/ \; - $ grep -nrF usr/local secure/lib/libcrypto/man secure/usr.bin/openssl/man - [correct the references to the prefix and OpenSSL directories] - $ git commit --amend secure/lib/libcrypto/man secure/usr.bin/openssl/man - - Review the diff and tree status for anything requiring attention. - -16) Build and install world, reboot, test. - -17) Test the legacy provider as well: (here with "test" as the password) - - $ echo test | openssl rc4 -provider legacy -e -a -pbkdf2 - enter RC4 encryption password: - Verifying - enter RC4 encryption password: - U2FsdGVkX1+JvhqxLMOvlxvTi1/h - -18) Commit and hope you did not miss anything. diff --git a/crypto/openssl/FREEBSD-upgrade.md b/crypto/openssl/FREEBSD-upgrade.md new file mode 100644 index 000000000000..1fc38c4dd17f --- /dev/null +++ b/crypto/openssl/FREEBSD-upgrade.md @@ -0,0 +1,202 @@ +# FreeBSD maintainer's guide to OpenSSL + +## Assumptions + +These instructions assume the following: + +- A git clone of FreeBSD will be available at `$GIT_ROOT/src/freebsd/main` with + an origin named `freebsd`. Example: + `git clone -o freebsd git@gitrepo.freebsd.org:src.git "$GIT_ROOT/src/freebsd/main"` +- The vendor trees will be stored under `$GIT_ROOT/src/freebsd/vendor/`. + +## Software requirements + +The following additional software must be installed from ports: + +- lang/perl5 +- lang/python +- net/rsync +- security/gnupg + +## Warning + +This is a long and complicated process, in part because OpenSSL is a large, +complex, and foundational software component in the FreeBSD distribution. A +lot of the overall process has been automated to reduce potential human error, +but some rough edges still exist. These rough edges have been highlighted in +the directions. + +## Process + +### Notes + +The following directions use X.Y.Z to describe the major, minor, subminor +versions, respectively for the OpenSSL release. Please substitute the values as +appropriate in the directions below. + +All single commands are prefixed with `%`. + +### Variables + +``` +% OPENSSL_VER_MAJOR_MINOR=X.Y +% OPENSSL_VER_FULL=X.Y.Z +% RELEASE_TARFILE="openssl-${OPENSSL_VER_FULL}.tar.gz" +% BASE_URL="https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VER_FULL}/${RELEASE_TARFILE}" +``` + +### Switch to the vendor branch + +``` +% cd "$GIT_ROOT/src/freebsd/main" +% git worktree add -b vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} \ + ../vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} \ + freebsd/vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +% cd "$GIT_ROOT/src/freebsd/vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +``` + +### Download the latest OpenSSL release + +The following instructions demonstrate how to fetch a recent OpenSSL release +and its corresponding artifacts (release SHA256 checksum; release PGP +signature) from the [official website](https://www.openssl.org/source/). + +``` +% (cd .. && fetch ${BASE_URL} ${BASE_URL}.asc ${BASE_URL}.sha256) +``` + +### Verify the release authenticity and integrity + +**NOTE**: this step requires importing the project author's PGP keys beforehand. +See the [sources webpage](https://openssl-library.org/source/) for more +details. + +This step uses the PGP signature and SHA256 checksum files to verify the release +authenticity and integrity, respectively. + +``` +% (cd .. && sha256sum -c ${RELEASE_TARFILE}.sha256) +% (cd .. && gpg --verify ${RELEASE_TARFILE}.asc) +``` + +### Unpack the OpenSSL tarball to the parent directory + +``` +% (cd .. && tar xf ../${RELEASE_TARFILE}) +``` + +### Update the sources in the vendor branch + +**IMPORTANT**: the trailing slash in the source directory is required! + +``` +% rsync --exclude .git --delete -av ../openssl-${OPENSSL_VER_FULL}/ . +``` + +### Take care of added / deleted files + +``` +% git add -A +``` + +### Commit, tag, and push + +``` +% git commit -m "openssl: Vendor import of OpenSSL ${OPENSSL_VER_FULL}" +% git tag -a -m "Tag OpenSSL ${OPENSSL_VER_FULL}" vendor/openssl/${OPENSSL_VER_FULL} +``` + +The update and tag could instead be pushed later, along with the merge +to main, but pushing now allows others to collaborate. + +#### Push branch update and tag separately + +At this point the vendor branch can be pushed to the FreeBSD repo via: +``` +% git push freebsd vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +% git push freebsd vendor/openssl/${OPENSSL_VER_FULL} +``` + +**NOTE**: the second "git push" command is used to push the tag, which is not +pushed by default. + +#### Push branch update and tag simultaneously + +It is also possible to push the branch and tag together, but use +`--dry-run` first to ensure that no undesired tags will be pushed: + +``` +% git push --dry-run --follow-tags freebsd vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +% git push --follow-tags freebsd vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +``` + +### Remove any existing patches and generated files. + +``` +% make clean +``` + +Please note that this step does not remove any generated manpages: this happens +in a later step. + +### Merge from the vendor branch and resolve conflicts + +``` +% git subtree merge -P crypto/openssl vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +``` + +**NOTE**: Some files may have been deleted from FreeBSD's copy of OpenSSL. +If git prompts for these deleted files during the merge, choose 'd' +(leaving them deleted). + +### Patch, configure, and regenerate all files + +The following commands turn the crank associated with the vendor release +update: + +``` +% make patch +% make configure +% make all +``` + +This process updates all generated files, syncs the manpages with the new release, +regenerates assembly files, etc. + +For now, any build-related changes, e.g., a assembly source was removed, a manpage +was added, etc, will require makefile updates. + +### Diff against the vendor branch + +Review the diff for any unexpected changes: + +``` +% git diff --diff-filter=M vendor/openssl/${OPENSSL_VER_FULL} HEAD:crypto/openssl +``` + +The net-result should be just the applied patches from the freebsd/ directory. + +### Make build-related changes + +**IMPORTANT**: manual adjustments/care needed here. + +Update the appropriate makefiles to reflect changes in the vendor's +`build.info` metadata file. This is especially important if source files have +been added or removed. Keep in mind that the assembly files generated belong in +`sys/crypto/openssl`, and will therefore affect the kernel as well. + +If symbols have been added or removed, update the appropriate `Version.map` to +reflect these changes. Please try to stick to the new versioning scheme in the +target OpenSSL release to improve interoperability with binaries compiled +dynamically against the ports version of OpenSSL, for instance. + +Compare compilation flags, the list of files built and included, the list of +symbols generated with the corresponding port if available. + +### Build, install, and test + +Build and install a new version of world and the kernel with the newer release +of OpenSSL. Reboot the test host and run any appropriate tests using kyua, +`make checkworld`, etc. + +### Commit and push From nobody Sun Jan 4 09:21: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 4dkX3l5gs7z6MlY3 for ; Sun, 04 Jan 2026 09:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkX3l1cJVz476q for ; Sun, 04 Jan 2026 09:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysbkxybkd6qzMVuX1XTUOcIHj0xUlicink8tGmaX+gI=; b=aYar4Ob4WE4sqUa+kV5u7tdJO/xe//9OWnb+54PzTN9WiDKGEELXNzZmWZMYKT/mFumxEM CJqvdK906MIMipxcbRg+YVCYfvfXqHr3pLRJiYqOClI7BDwCCchbB5DrLuTmq+v1oTo4xI rqWZavykwRycNaK65sDMLe6bOsf6PxUoDjacDVG31VNubQZ74bHUGrZ+uU0P4nysUvDA0m 1z8IRm4bxzV/2apob5GOxOQqj0cM85dD3obF+fcY5Pbecovsi/kbXfkwvA/FklVG4cj5Xp 0SPG+d/0YMmUThJyyY7S8EKwfQ4z2fALNXUWnq7EIN3iXFVUTYvziCCdEumCfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysbkxybkd6qzMVuX1XTUOcIHj0xUlicink8tGmaX+gI=; b=rXzZo3zCGt5UcUWcDiZfVg9yFOnk4SlQZsUgRhY9b8i59wicRyrR9zkGYNbgemiVnhKfh7 HFnCaGKRHR+eJbdr41FC9BfVoos16H0I2acUrE+muI4YHenLKMpDZweisjkULDAz3EBcm7 XCd1INwRhqOISxuVhB+WFUZSinY62k9JSlQytak4zNZ5+tL4Os1hNtebmo/TmoFY8+Zfm3 Fpf7uO4MjvbTPnQEdcehJ5iPWmzU6ODvrxS821A6DVv5+rHcK0onVKHpD6Pq0rOzEPZNBE g5MsuIdnSa4Yr/o37FQqvxDfIU4am5al9ixk3Co7HMcKDxS5N1rsjY+E47VHDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767518467; a=rsa-sha256; cv=none; b=eo0RWbNPt3J/N5l+vEiwvoId3tVORpRsBD/uT55t92D59IP2yzIuHop2TeCqI4W74yUdDo 66LoBxywTv9235t9o2OJpS7cspVwMuHSBlvH5AfLqn8e8+w0cFpB57bxpecoUaHoKJDp0o vSMOvRckEI6uKk7Myyr9u70hOmaQWRhhVtdMBrLd0C0VFfyPiA/i1a5CXRog8yrxKRkhtI ojeueCvvvUSaeAG20fYXN5CwjuS6qA4ruubrGYIG104yvhFgCAGRvT8jNLDOKmoULZDaAQ A6g2xSwq8wMArJ3uSSGg/lIX7GYgQu9GoqWN0eauDMRLF6cqJpPrUwYvXq9LIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkX3l0yt0zBlN for ; Sun, 04 Jan 2026 09:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 90e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:21:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: a8fb6303b835 - stable/15 - bhyvectl: improve options error handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a8fb6303b835e07e94226f3ae8591a4fe71c6274 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:21:07 +0000 Message-Id: <695a3103.90e9.5a2162c9@gitrepo.freebsd.org> The branch stable/15 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=a8fb6303b835e07e94226f3ae8591a4fe71c6274 commit a8fb6303b835e07e94226f3ae8591a4fe71c6274 Author: Roman Bogorodskiy AuthorDate: 2025-12-05 18:45:03 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-01-04 05:15:25 +0000 bhyvectl: improve options error handling Currently, it is possible to execute bhyvectl(8) with mutually exclusive options, such as "--destroy" and "--suspend", and it will print out obscure errors, e.g.: bhyvectl --suspend=/var/run/vms/my_vm --destroy --vm my_vm connect() failed: Connection refused Address that by failing early if mutually exclusive options were specified. Additionally, move the BHYVE_SNAPSHOT block before the errors are printed, so its errors are also displayed. Approved by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54092 (cherry picked from commit 148111d3775eb159d71a36e3a8b4c5c1bf53392c) --- usr.sbin/bhyvectl/bhyvectl.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 41055678ac30..8c37b670ab2e 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) { char *vmname; - int error, ch, vcpuid; + int action_opts, error, ch, vcpuid; struct vm_run vmrun; struct vmctx *ctx; struct vcpu *vcpu; @@ -338,6 +338,7 @@ main(int argc, char *argv[]) opts = setup_options(); + action_opts = 0; vcpuid = 0; vmname = NULL; progname = basename(argv[0]); @@ -388,6 +389,16 @@ main(int argc, char *argv[]) if (vmname == NULL) usage(opts); + action_opts = create + destroy + force_reset + force_poweroff; +#ifdef BHYVE_SNAPSHOT + if (checkpoint_file) + action_opts++; +#endif + + if (action_opts > 1) { + fprintf(stderr, "mutually exclusive actions specified\n"); + exit(1); + } ctx = vm_openf(vmname, create ? VMMAPI_OPEN_CREATE : 0); if (ctx == NULL) { @@ -508,17 +519,17 @@ main(int argc, char *argv[]) if (!error && force_poweroff) error = vm_suspend(ctx, VM_SUSPEND_POWEROFF); +#ifdef BHYVE_SNAPSHOT + if (!error && checkpoint_file) + error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); +#endif + if (error) printf("errno = %d\n", errno); if (!error && destroy) vm_destroy(ctx); -#ifdef BHYVE_SNAPSHOT - if (!error && checkpoint_file) - error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); -#endif - free(opts); exit(error); } From nobody Sun Jan 4 09:21: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 4dkX3k3vMRz6MlVd for ; Sun, 04 Jan 2026 09:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkX3k0qgdz4701 for ; Sun, 04 Jan 2026 09:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/Hn8b2kQYI/8t1zN9omrvjTycw7hXvBY9WaR9EDfBY=; b=WwkAKgDT5qVbsb3ftEcBR7GfaePMGEXs2Wf+OQaEzHup6R2+4elwX/ENQhBMvQbpamD17f /cMZMCb2CKDLLuD6NTIcGQGq5KJ3M82DHxOf7dqWCsqW4FZErNFo5iZLCX5R7Qwb6rhQNX JItth9tyku9UFuVAwtP4cFYc5Fp6cfb+mVBOh2dhmD4tG1MPtoT8VzguyI+kl2fH9S8zbK dBGQv82cJZwZ3u0go+t/vtzVKiYJ1ZHp45rFMoQnaRyzZbVHsM8hCw46xJxVKhwJHCgHuN mOaimNHmeqxAQsqBmPbq+llBNsdq8/ikaF1q8f+Zwp6eT29gL956Ou17nrNweQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/Hn8b2kQYI/8t1zN9omrvjTycw7hXvBY9WaR9EDfBY=; b=WAM7Ha/8YfvIPNJT2fJ6+w3O2YQdjzAawf3KYTLnNTvOnC/j0TgkJ0pg8kuAmWYi7aEdmL b+h+oG7LfhGtUPm/bT1WAX94QEGuTV4gZL0uBCCz9kTA0dQkmD/oaxDEeHx6qG+BtHavGK FPsuLA6c4HHZVTpHgKZ+EbPSRBFJyYGztqiIR0Xx1FRVVYA9JU0png1XrWsfb2XrdJTdCb 7Fim+5E8bvVtXZ04SiHEfONa4/1qO4uRSer0OaKD09Nmhbl/oaeuxB2OiEdMFg7hVeHtJ6 8Ag6cKmjkWlED3s0ahYU/9oeQDQPwvJq/vggRxjNLirOaG/N7+ogJ6k5+z8Ing== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767518466; a=rsa-sha256; cv=none; b=UTy05WRHvZBTqrhcRB6crZeQouaiO2LPXXnrt8TxcBSubK7yrozgucESbMZNbBm8dBOAZd JaP5IYHmpogJQqSYBgyHB/LPCSxdeZU5R3cS9GFXx40r/rCCxcSnxBd7yn9tM/rvse7pQ4 Y1oVnp6I/deUgKouwm8tqS7aVRXL8jTudHx/f6ZyIH9z5Y7VyG6tJYju+qXUe1V8O++HXb W/lqoSwndhTRUt2FQ2/xW8+R6mnhivJ35fu7bENLtP2TWHJtadrZv44I/XIXFg3XqWdRyp 2hdylNQopMzCtBEexuB1KbIQzVMOOy2rOMRFf6A+JtChQdT8iVryjdgMZ83L9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkX3k08K8zCl6 for ; Sun, 04 Jan 2026 09:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id aed3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:21:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 894674da1400 - stable/15 - bhyve: change suspend exit 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 894674da14002bfaffeb47482bf85c49b575d2ee Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:21:06 +0000 Message-Id: <695a3102.aed3.15e234ad@gitrepo.freebsd.org> The branch stable/15 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=894674da14002bfaffeb47482bf85c49b575d2ee commit 894674da14002bfaffeb47482bf85c49b575d2ee Author: Roman Bogorodskiy AuthorDate: 2025-12-05 17:16:29 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-01-04 05:15:25 +0000 bhyve: change suspend exit code Currently, after suspending, bhyve(8) exits with 0. This code is also used to indicate that a VM was rebooted. To differentiate reboot and suspend, use the next available exit code, 5, for suspend. Approved by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54087 (cherry picked from commit 611bbb190ff593e0e424e311575d7e978e623659) --- usr.sbin/bhyve/bhyve.8 | 4 +++- usr.sbin/bhyve/snapshot.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 1d81280b8f75..811b19149f9a 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 December 26, 2025 +.Dd December 30, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -1152,6 +1152,8 @@ halted triple fault (amd64 only) .It 4 exited due to an error +.It 5 +suspended .El .Sh EXAMPLES If not using a boot ROM, the guest operating system must have been loaded with diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 997faa254284..eabe6ab47f80 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -1308,7 +1308,7 @@ vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, if (stop_vm) { vm_destroy(ctx); - exit(0); + exit(5); } done: From nobody Sun Jan 4 09:56: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 4dkXrM4b81z6MnfS for ; Sun, 04 Jan 2026 09:56: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkXrM2cf0z4DDP for ; Sun, 04 Jan 2026 09:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMHw6wv1wsvIEzmmuzVDcvQIIJNsqMGgTtq/s+dgaZo=; b=g/e+yszFgvUiuLi42S4lV75DqpsH1yQLkuwtq3IZpc/XaqBZIZ75XDLYEpBKyUk1XnKoYW R3UTdDLo4pHms3MuRQgYy7CzAAiUQHuf4UtYrQw9F33FA1kIwpGK355skcy//HYY/sIsSM ZIBIPHLG8uuDTQiW0MQ5RMAVV9xjDvLliu0LS41R8NWt9DPHLjIT3T3gQQRnhNGr8IQM8D 5Owc/09ZUi06qc3u3NVPKCxJaKjYpJZWLzzSUvdshN7RjRaX2SACxaGJ7+JFd67z+oBBL5 F9CKNDPG6xGPRbLz+hYgUcAWtUebtPRYUQc8A9eMVxWtNJt75jdb8c280FXINw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMHw6wv1wsvIEzmmuzVDcvQIIJNsqMGgTtq/s+dgaZo=; b=g5abnjj8eGlxf4Lj6PzJg+4BUuXSP6XOabOrXB4he1eAR/oF+xHX5PRXNrJw2DyKE3D6fV WNPFKxI6pF+Kt6zE6zplRIg4FY1SbBg+tic9WDnuqJ3p08f+e0VhPR0x4MxonAZAQIa6OR 4z37R105/eScqo/meYD4YZp5i6ypPBjUN7HJKeRpWbPYPWskAbd0XupCbeVS9c2PPtMf1Q hZtcSgrJzUqL3hmxG29whw1h8I0luvjG3uglX+8pGukPfM1MGtR4USDPW3b12EUGL2EbL8 8OKR7jQRKjHjmD7SE2IsZTIoEuIW7zGw9kUMJkc35gfCTK5lXWBfqkCMetolPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767520579; a=rsa-sha256; cv=none; b=Sbalpr0nO+gLfye4/RghsXFIKLX1NZfTO63ykgtwsfebnmBsAbodrVQkDSh86Hp8596Q21 vaBkucFCSaXXX0KVwaWAsmHBxmywtu3MLDmJd2K3DJPSBlZEj+T9S+6Cr+pUD+BmqBfZ27 lWNWxcL79dY3F2bI76nspqRCptZugA2ISj/cPrmjxIoEkqRj2RGjO7PPJGd7vEpznWyDzC jBnW57BI6xbP0qyPQFfN0UASw1tGpilGegKtM9umw4wuXIUzu28MIYxjEOZuV9GQLSFPDg NpxS4K9BwuEYJQYZUIvlh0VnctnODjQsS37a0tEFZWhP35pk+z+Q9NJ61qGLGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkXrM2BgpzTZD for ; Sun, 04 Jan 2026 09:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cd56 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:56:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 38d757b6c29c - main - linuxkpi: Avoid trailing whitespaces in lkpi_hex_dump() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38d757b6c29c990de72dc51ac123922d3f095f53 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:56:19 +0000 Message-Id: <695a3943.cd56.2157529c@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=38d757b6c29c990de72dc51ac123922d3f095f53 commit 38d757b6c29c990de72dc51ac123922d3f095f53 Author: Jean-Sébastien Pédron AuthorDate: 2025-07-26 15:30:40 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-04 09:44:52 +0000 linuxkpi: Avoid trailing whitespaces in lkpi_hex_dump() We use the return value of the callback to track the number of bytes written. We use it to determine if a group of characters should be prepended with a whitespace. This way, we never add a trailing whitespace. We need to pay attention to the return value of the callback: if it is negative, it's an error and we return immediately. Otherwise, we would decrease the number of written bytes and possibly make it negative. Reviewed by: bz, christos Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51558 --- sys/compat/linuxkpi/common/src/linux_compat.c | 66 +++++++++++++++++++++------ 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 35430daf311d..03d866260dd9 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1900,47 +1900,87 @@ lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, typedef const struct { uint32_t value; } __packed *print_32p_t; typedef const struct { uint16_t value; } __packed *print_16p_t; const void *buf_old = buf; - int row; + int row, linelen, ret; while (len > 0) { - if (level != NULL) - _fpf(arg1, "%s", level); - if (prefix_str != NULL) - _fpf(arg1, "%s ", prefix_str); + linelen = 0; + if (level != NULL) { + ret = _fpf(arg1, "%s", level); + if (ret < 0) + break; + linelen += ret; + } + if (prefix_str != NULL) { + ret = _fpf( + arg1, "%s%s", linelen ? " " : "", prefix_str); + if (ret < 0) + break; + linelen += ret; + } switch (prefix_type) { case DUMP_PREFIX_ADDRESS: - _fpf(arg1, "[%p] ", buf); + ret = _fpf( + arg1, "%s[%p]", linelen ? " " : "", buf); + if (ret < 0) + return; + linelen += ret; break; case DUMP_PREFIX_OFFSET: - _fpf(arg1, "[%#tx] ", ((const char *)buf - - (const char *)buf_old)); + ret = _fpf( + arg1, "%s[%#tx]", linelen ? " " : "", + ((const char *)buf - (const char *)buf_old)); + if (ret < 0) + return; + linelen += ret; break; default: break; } for (row = 0; row != rowsize; row++) { if (groupsize == 8 && len > 7) { - _fpf(arg1, "%016llx ", ((print_64p_t)buf)->value); + ret = _fpf( + arg1, "%s%016llx", linelen ? " " : "", + ((print_64p_t)buf)->value); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 8; len -= 8; } else if (groupsize == 4 && len > 3) { - _fpf(arg1, "%08x ", ((print_32p_t)buf)->value); + ret = _fpf( + arg1, "%s%08x", linelen ? " " : "", + ((print_32p_t)buf)->value); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 4; len -= 4; } else if (groupsize == 2 && len > 1) { - _fpf(arg1, "%04x ", ((print_16p_t)buf)->value); + ret = _fpf( + arg1, "%s%04x", linelen ? " " : "", + ((print_16p_t)buf)->value); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 2; len -= 2; } else if (len > 0) { - _fpf(arg1, "%02x ", *(const uint8_t *)buf); + ret = _fpf( + arg1, "%s%02x", linelen ? " " : "", + *(const uint8_t *)buf); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 1; len--; } else { break; } } - _fpf(arg1, "\n"); + ret = _fpf(arg1, "\n"); + if (ret < 0) + break; } } From nobody Sun Jan 4 09:56: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 4dkXrP57m5z6MnL1 for ; Sun, 04 Jan 2026 09:56: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkXrP3vM3z4Cxj for ; Sun, 04 Jan 2026 09:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vfhuD6Wm6hC+yl6YyVYfRKKTOPaIB4VB3997h8J3RM=; b=t58S07FNuxLT3DLEOTXHJDRtcyMZe24zXtLzdXvRs2gaOx0PX5OWU5v7j36xdjtrAY2Ocj UAnwaD+tBc1o4TJq4iZ7GEVeIzoN5MloCSeqhGHOyCboXylUBk86EdzQR7ek1gyWht4vdz 0vOxsgJvb5d8LQ0sEJiuNpsSqpVrYH01QsTZmRJOUbuBpxXL5X03isHA2WXLVzcWUJwyu3 +GUVj9omJ+xVisgmXDGNP9EhCdtwOFoUoKUKjD4BqRJkbeSwbFU6l0TBmmzeDRHU0w/17D FcDJjr8mrIB5i9xR9iZBzX8CStTO9mEm17w9dY0risDM/7NGpVC5418jb0XIhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vfhuD6Wm6hC+yl6YyVYfRKKTOPaIB4VB3997h8J3RM=; b=rDLx3qK+6WXcj+BJTW7eTrDNDN+dyB4vQM4kn/D6M6vlDEh/O8iMVPpIANcyUXD8DnSWM4 QlNrDcQ0J0LWU6gEqhAcDDXhPk4Ag2GC1gP8jqJDC4vSEj1GQcr2pclhNxud+AAU5OoCuu C0N125gSe4MVq+RXPlXSjpSSpZ4oCy8vBhGnkBS3Mw/gnnCrJ+mlhdZldeEqoM2EWn8mJU TD8eMusuIu0UvCbKBT8ydbpLYr/MdqIhR0dUX/mwz+Sr2gUGsKcNKdorCn0NV0HiA+iTXm eYnaAgCPMqA8F32D44Zhdor9H92BZ8mQ3+sXC6MfBSc1CqThU0Fuojl3jnQ6UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767520581; a=rsa-sha256; cv=none; b=p1o+ho73vKKHGBHZpiuroPuj6bkRakRk5ndYshPnsszWybeYp4XTJkom65aXOxvI8CuCHy yxm0gHeQwIWUrnvqj5OjtmRHeJRR7KVps3ZAcZ6nCkskhizxoIvu6JVlFWQnaBusjdgSup WOEvBfgQbo/8/xgb9JeX4pPF4VG8GYexL+SPc9aU85sTMjiBMqrcOl9CO3FcsadhwtDgqk SxbS4+DBZd5fd4SzXu2IpNjwlit/BGjEsifxnZq4mIbjefSI4CjcxB6CdbqY0+US36FY1Y nYo2o/0lnkQk7vDmS5RD9zr49Ny8rYpqCMWABcU41G2bIS06CLP82tIjgZkY7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkXrP3SLLzTZG for ; Sun, 04 Jan 2026 09:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bffa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:56:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: b1bef9f7e0e1 - main - linuxkpi: Add hex_dump_to_buffer() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1bef9f7e0e182a9eee222639ffc8af4883ec0fa Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:56:21 +0000 Message-Id: <695a3945.bffa.623ca786@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bef9f7e0e182a9eee222639ffc8af4883ec0fa commit b1bef9f7e0e182a9eee222639ffc8af4883ec0fa Author: Jean-Sébastien Pédron AuthorDate: 2025-07-10 23:03:51 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-04 09:45:36 +0000 linuxkpi: Add hex_dump_to_buffer() This function prints a single line of hex dump to the given line buffer. The implementation relies on `lkpi_hex_dump()` to format the string. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51559 --- sys/compat/linuxkpi/common/include/linux/printk.h | 6 ++ sys/compat/linuxkpi/common/src/linux_compat.c | 70 +++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h index e10656c8a1d0..066ec900f04e 100644 --- a/sys/compat/linuxkpi/common/include/linux/printk.h +++ b/sys/compat/linuxkpi/common/include/linux/printk.h @@ -50,6 +50,12 @@ void lkpi_hex_dump(int(*)(void *, const char *, ...), void *arg1, const char *, const char *, const int, const int, const int, const void *, size_t, const bool, const bool); +#define hex_dump_to_buffer(buf, len, rowsize, groupsize, linebuf, linebuflen, ascii) \ + lkpi_hex_dump_to_buffer((buf), (len), (rowsize), (groupsize), (linebuf), (linebuflen), (ascii)) + +int lkpi_hex_dump_to_buffer(const void *buf, size_t len, int rowsize, + int groupsize, char *linebuf, size_t linebuflen, bool ascii); + static inline void print_hex_dump(const char *level, const char *prefix_str, const int prefix_type, const int rowsize, const int groupsize, diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index c2bad1f28eaf..8fc644241d79 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1986,6 +1986,76 @@ lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, } } +struct hdtb_context { + char *linebuf; + size_t linebuflen; + int written; +}; + +static int +hdtb_cb(void *arg, const char *format, ...) +{ + struct hdtb_context *context; + int written; + va_list args; + + context = arg; + + va_start(args, format); + written = vsnprintf( + context->linebuf, context->linebuflen, format, args); + va_end(args); + + if (written < 0) + return (written); + + /* + * Linux' hex_dump_to_buffer() function has the same behaviour as + * snprintf() basically. Therefore, it returns the number of bytes it + * would have written if the destination buffer was large enough. + * + * If the destination buffer was exhausted, lkpi_hex_dump() will + * continue to call this callback but it will only compute the bytes it + * would have written but write nothing to that buffer. + */ + context->written += written; + + if (written < context->linebuflen) { + context->linebuf += written; + context->linebuflen -= written; + } else { + context->linebuf += context->linebuflen; + context->linebuflen = 0; + } + + return (written); +} + +int +lkpi_hex_dump_to_buffer(const void *buf, size_t len, int rowsize, + int groupsize, char *linebuf, size_t linebuflen, bool ascii) +{ + int written; + struct hdtb_context context; + + context.linebuf = linebuf; + context.linebuflen = linebuflen; + context.written = 0; + + if (rowsize != 16 && rowsize != 32) + rowsize = 16; + + len = min(len, rowsize); + + lkpi_hex_dump( + hdtb_cb, &context, NULL, NULL, DUMP_PREFIX_NONE, + rowsize, groupsize, buf, len, ascii, false); + + written = context.written; + + return (written); +} + static void linux_timer_callback_wrapper(void *context) { From nobody Sun Jan 4 10:28: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 4dkYZ40Dwvz6Mqcn for ; Sun, 04 Jan 2026 10:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkYZ34Ghsz4GTC for ; Sun, 04 Jan 2026 10:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767522539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv/mJSWKGUJ3Sgow004nubooUhRGutAdogPKK1F6bvY=; b=EKLLui6xG7wIflyOGFdpGDlILnqc1YqObl+dfL2zangAmu3MY7nE1GxKJLB7tt9KRqsleE FfWtx8zGGMG/r0Sfi1boFgKKvygUhBY6dMX9ipb5aF766pQa7Ryoc4zNZMpEXu7Yp4CvNc uvk0H2G/s3fCN/QIKxNDaYLN1zakhCXs3gZMbAMi4ZXzu2niOl2q5iQ+H2nKrq8cRcwbLh IC1gsYD+Sfhykeo5kp3efcxSZlUPs1nly53XyfWs3/cjTfFwDOBjbhhUXKfgMxE2/7CVs7 oGPVjA6XjNfFakglUyP6Jbpadb0pV/6na2u7FnqLdXxNW/PdfxgFFfxlgKVk2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767522539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv/mJSWKGUJ3Sgow004nubooUhRGutAdogPKK1F6bvY=; b=Y5r4998U8Wsy/HIS029LIqKeC9MljmReWv0OWmIgwy5nMJyNvErEMCgls0yKJ5OS8xMZ9n /8d52Se8r3QxWv5w0HoLftKdvyB3BLKS30TfD5eNk7SVqvIjz6kwU/9PFBlFEnV+wc9Ugl RcTgkmBvjwVYve8mF8xitrC9Qr5XY3Be7itL+5jwn5yhZdchJe6HFaKtJqYSKUKGLfRy8e KRvmahPx9w01ADWDKzpvdiGBwJTUH90/Jr6lxKEMjurpd7oANdXbdu78ZrWQuYBAZtj6d7 3e//0IkP5bE4g3mvaId9qWhhZVnvGxtfsQjihdxihLmx8qQhoq+SaeklqquPDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767522539; a=rsa-sha256; cv=none; b=sF0Ck69Az5L2asfCAu4ClNk3wmdOtPamb8wquqVurMARfQaXT7HPubyOX1LdCXwyZZAdXL xcr6Pad8yKXMSTL8tHaSyCX+PXXAgdf0sqJFVGGQNiBJRpGxd0I82PX1PFoQMXgz+wjles XACTrhp80Bwjsf+XnZENq8O9yQ52dvitwvtaV7brs+kVHLKzYpFPMm69jTwC8NxtBYSyQw ocsNIlkiq3XSyaz70I9en0U+RWwg+mxcxK0H5acJkNW6vVBYASc/fUwS1v5jnatvrJhxki ZJpAsgrRYkDEuqPkxV2D8B49hEO0DwyaML784GManT8EDNFGFbzeITdYyNWCiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkYZ33r9fzW0k for ; Sun, 04 Jan 2026 10:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 10:28:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 3f649d1edfbe - stable/14 - bhyve: change suspend exit 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f649d1edfbea6caccd3270fe0071875adb9651a Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 10:28:59 +0000 Message-Id: <695a40eb.20e21.2ec90f4a@gitrepo.freebsd.org> The branch stable/14 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=3f649d1edfbea6caccd3270fe0071875adb9651a commit 3f649d1edfbea6caccd3270fe0071875adb9651a Author: Roman Bogorodskiy AuthorDate: 2025-12-05 17:16:29 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-01-04 10:24:47 +0000 bhyve: change suspend exit code Currently, after suspending, bhyve(8) exits with 0. This code is also used to indicate that a VM was rebooted. To differentiate reboot and suspend, use the next available exit code, 5, for suspend. Approved by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54087 (cherry picked from commit 611bbb190ff593e0e424e311575d7e978e623659) --- usr.sbin/bhyve/bhyve.8 | 4 +++- usr.sbin/bhyve/snapshot.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index a6e1f772a81f..48735c22e320 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 26, 2025 +.Dd December 30, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -1025,6 +1025,8 @@ halted triple fault .It 4 exited due to an error +.It 5 +suspended .El .Sh EXAMPLES If not using a boot ROM, the guest operating system must have been loaded with diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index edce55c03eae..23f6fc627de1 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -1309,7 +1309,7 @@ vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, if (stop_vm) { vm_destroy(ctx); - exit(0); + exit(5); } done: From nobody Sun Jan 4 10:29: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 4dkYZ50SC7z6MqXV for ; Sun, 04 Jan 2026 10:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkYZ45Gbkz4H4s for ; Sun, 04 Jan 2026 10:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767522540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FRJGSV5y5B+ewdcbFw95KigO9KJ5G/trwk/UekY/2c=; b=NzVvbgNiZzdgEaIMex9iK5Q1oozwfhEBILSZuBO1cIhmuBBtttJp/IdYODfeN1sWruBZOA nnYHDZFJwk5NrvRpkPA/c3OmMYPdt0mztB2DF0a7FOD9SgHED+06KV1N5afGqVQLy6N/aQ WUMEP2P/1NwmshO8aWySXqdv798rEGYraf/8H82RWtsDbkc/tbSw5YziNbgXjPrtSFMLtY dJ/aXcGbx5ID5lRT190TvQrE4a8tPuB/FbKZjb7a7ZQUsHJWKRuCxl49hakZBLcfm8ivUX GCKnCnK3N8mp45tRv+WvEgujrsbFzES3WyO+G8l12Im3QlIF2ohc4IX7tL+Nlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767522540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FRJGSV5y5B+ewdcbFw95KigO9KJ5G/trwk/UekY/2c=; b=vVmgd776pzZzCWkK0esmAD8FvvNb+OliBwQLf212WUCxJLNE1NZTND4R+7KKcl9FdmRejF HCURg8IbnGtMR2w2q2tJ1r0tZxPVR70WH9YR5zwjQuO28uS+qmO85fqRpicTPWGcV7pjbE JGMBoWC9LNED/Rn1ozUBQ/PkfHE6n0ZV/3QsdJ3KojchmD688z+SKQ1veDIRYO5umJM5yi AadmV2E6ui1zphK93Z3NmacWuHkaXUbuuMsGI4eDcbggXQwqArRNNIKCGlrvOoP1N3SI20 Nnhdf4OI/ZMPcC5rDyJwBQ+3cRHtfkjB79M3tg0wAyll9NbSsqOX4N7FOiMeIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767522540; a=rsa-sha256; cv=none; b=Q1HwxYR2Xg39I2u/V8wzfmY2CeBJeM9BNp/FQ4vtkxTqmVnvsXwN166ox5jlIJJvmhQMo8 2ZnXTbZO46Jj8rq/Rj708AkO/CJXv9Hg61GWwQnbyZBpw7cNGCx8BQR9dVKH7mcRZ63ysC 9QkVUkavcqvB2BAaRNkUxgnZZMeAb8nfAcDm/uErdzSm7X/FO4l6YuVDe+52d1hVJzH1b8 XErl9fq8BuWf7lnNKjEiCPlMh/7zo/6n/84F6ed/HZqnr0UUvkqa4uUeYmC+dYC/wHHjiB QwtuTgBpcIB6YXUOZfqxHG9s/enMEfIGu54EbjPSJn+CiRDerb7L7GzjBnjapw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkYZ44fmnzVrY for ; Sun, 04 Jan 2026 10:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 10:29:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: b35e955333ef - stable/14 - bhyvectl: improve options error handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b35e955333efdd97a3a369740d2b2038fb86826c Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 10:29:00 +0000 Message-Id: <695a40ec.20e98.3527639a@gitrepo.freebsd.org> The branch stable/14 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=b35e955333efdd97a3a369740d2b2038fb86826c commit b35e955333efdd97a3a369740d2b2038fb86826c Author: Roman Bogorodskiy AuthorDate: 2025-12-05 18:45:03 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-01-04 10:24:47 +0000 bhyvectl: improve options error handling Currently, it is possible to execute bhyvectl(8) with mutually exclusive options, such as "--destroy" and "--suspend", and it will print out obscure errors, e.g.: bhyvectl --suspend=/var/run/vms/my_vm --destroy --vm my_vm connect() failed: Connection refused Address that by failing early if mutually exclusive options were specified. Additionally, move the BHYVE_SNAPSHOT block before the errors are printed, so its errors are also displayed. Approved by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54092 (cherry picked from commit 148111d3775eb159d71a36e3a8b4c5c1bf53392c) --- usr.sbin/bhyvectl/bhyvectl.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 050d72f013df..acd4950e10ca 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -1628,7 +1628,7 @@ int main(int argc, char *argv[]) { char *vmname; - int error, ch, vcpuid, ptenum; + int action_opts, error, ch, vcpuid, ptenum; vm_paddr_t gpa_pmap; struct vm_run vmrun; uint64_t rax, cr0, cr2, cr3, cr4, dr0, dr1, dr2, dr3, dr6, dr7; @@ -1648,6 +1648,7 @@ main(int argc, char *argv[]) cpu_intel = cpu_vendor_intel(); opts = setup_options(cpu_intel); + action_opts = 0; vcpuid = 0; vmname = NULL; assert_lapic_lvt = -1; @@ -1822,6 +1823,17 @@ main(int argc, char *argv[]) if (vmname == NULL) usage(opts); + action_opts = create + destroy + force_reset + force_poweroff; +#ifdef BHYVE_SNAPSHOT + if (checkpoint_file) + action_opts++; +#endif + + if (action_opts > 1) { + fprintf(stderr, "mutually exclusive actions specified\n"); + exit(1); + } + error = 0; if (!error && create) @@ -2290,17 +2302,17 @@ main(int argc, char *argv[]) if (!error && force_poweroff) error = vm_suspend(ctx, VM_SUSPEND_POWEROFF); +#ifdef BHYVE_SNAPSHOT + if (!error && checkpoint_file) + error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); +#endif + if (error) printf("errno = %d\n", errno); if (!error && destroy) vm_destroy(ctx); -#ifdef BHYVE_SNAPSHOT - if (!error && checkpoint_file) - error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); -#endif - free (opts); exit(error); } From nobody Sun Jan 4 13:21: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 4dkdNZ75Xmz6N1rN for ; Sun, 04 Jan 2026 13:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdNZ55cSz3Kcf for ; Sun, 04 Jan 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzdiFuTQNdoePsgsjYpduBi8TS5V3BE/UGSJMUM4FsY=; b=YF4MLzDvD9koQZFkycLTB62rBCnLIhlYVijWu7GnuXiO7vSkmzO/c88S5/1dBZGq5azFhs GzjQuBM7aUhpmV/WX6W72sRvSrX7YfNtw+WPvUeTBiuCrqETnbmH+g6TsJbfx5Fk1KjqtW 5TBb97dfF1yHVCeLzu5AkCranL8D2jtjq3yLDwRvQUEXh2ZfyQtmhkz7B1LP9ZA2WPImfZ SstuCGRUrmBbidXpXuY0fx8NigNozOSr56cvGEUMj2AFoepQ4dEDZt8DfhexpWbZ442RM2 dQnZnI3emcmJyldcsMBLxFzAQphArr/+C0Wv95Mqkieog8dWbLpuV9g4e7wY0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzdiFuTQNdoePsgsjYpduBi8TS5V3BE/UGSJMUM4FsY=; b=WkcX/o8GC3d7wFsDbSykTxiJ6Wn3YZZCdTv6d3pmuxJGjBW4BsHW+spk4vphb8XrQLsWN4 CV5uZJsekh+1qQ7SmMHUEpxnF7VIJOuY6wFja3TVxgnlW4wc+gtWcA84IAGl4uRwKPCxtU +P1TeKAbt3+KuZ9pGi8WT5+8OgOeLBDn2/44AZiKUXMGgycBNu1P0e8U6eK7utBkixnu4I Y6Cv8V3zTA6zwqikL1VT9z38OsKTyOkCTSL/TxWyWoTuWMZ5RBM6V5AmwNsFCz76YaWdqd s+sBD0vIMhOAU3tSXtHg5mABKB1hNf3nSq5LeEUFWOXOO4eHLeD1AYZDBDO9rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767532862; a=rsa-sha256; cv=none; b=dhpt2wwol+ZI7FOw6tbhDolJVFrYsgNX7u8Yb5r+tVpPsoSuG2gooyS2pouwYf/B88uQMY C6XhCw7x/LQ76Cn1CY1/cz7XUCNGf/rHc+uEmZnxyVTpJk8LwUoS8M+agYnSUksoF//vn7 bQXIwyzZSQHHLKhJyIrRRjrYEHfROFW2dQUQoqmk+JX5YCQZzPSO5hwW2JTld1bkwF2ytW OBK1JHub3zZMW8T3V0KjEWvKUHgCLhQB3QiTmgtqyZgrMDpqdqSUVzncsd3/tgumIdGI4+ NHoc1MnDZwtS5OmLdD4MmWNyQkWG5hg4F4aBntTrkbhTg0KPVRi399D/La0aRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdNZ4ZkmzcFq for ; Sun, 04 Jan 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 9595055ae749 - main - loader.efi: only use firmware provided Blt on GOP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9595055ae7494997bb07b4aaed544f88ac4c5e7f Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:21:02 +0000 Message-Id: <695a693e.3a4b0.7bba4b46@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=9595055ae7494997bb07b4aaed544f88ac4c5e7f commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:37 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-04 13:15:37 +0000 loader.efi: only use firmware provided Blt on GOP gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when using GOP. The firmware provided Blt functions on UGA platforms have been observed to not work on old MacBooks, and are likley hit or miss anyways as UGA has been deprecated since 2006. Reviewed by: tsoome PR: 291935 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54432 --- stand/common/gfx_fb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index eb41c51c50b6..d99d9b7a868f 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -83,6 +83,7 @@ */ #include +#include #include #include #include @@ -856,7 +857,7 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, int rv; #if defined(EFI) EFI_STATUS status; - EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = gfx_state.tg_private; + EFI_GRAPHICS_OUTPUT_PROTOCOL *gop; EFI_TPL tpl; /* @@ -866,7 +867,10 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, * done as they are provided by protocols that disappear when exit * boot services. */ - if (!ignore_gop_blt && gop != NULL && boot_services_active) { + if (gfx_state.tg_fb_type == FB_GOP && !ignore_gop_blt && + boot_services_active) { + assert(gfx_state.tg_private != NULL); + gop = gfx_state.tg_private; tpl = BS->RaiseTPL(TPL_NOTIFY); switch (BltOperation) { case GfxFbBltVideoFill: From nobody Sun Jan 4 13:21: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 4dkdPc5vYCz6N1j6 for ; Sun, 04 Jan 2026 13:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdPc4BQpz3LLs for ; Sun, 04 Jan 2026 13:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8PMVRzjnfQrOqJt4GOuGVqGkrhZMWqWTd8k8jbCN+c=; b=M4MLu+CcLqtGJQuIDEs+InxV4k8FQX5pk74et5xWk4sfrA+avTBTbeinh2+dK8ouvmWVQW DzPu8QPoOp1xTzsX9XfSOPOtPeI1J+A4QOWE76F2RWol1IfaUzW/hWf7AfjdcsonF1xUH5 bBxkV2cJVC7//fb0YaEsge0iAZAoUfWsTxNEtalJodsoXg1EycagFZf9OIkJotY2NVWWNc aCnRdvhQ6bGCU4AI1k8xBx/zv8NO08xqJO/7gn5LAyzh/knsynFB5Vi35vvGXqrVr2KaU/ e95wzsHQ6alXJpXrGO6jhCneuQq4LT4XL5FwNhsywfLCj2J8CM8GXEiNjJVPjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8PMVRzjnfQrOqJt4GOuGVqGkrhZMWqWTd8k8jbCN+c=; b=R/CS/5GYmEMRSgFHuZw2tQprOboXEBMvyOSY9VkKLKc4f2OmoOJ/rsdUa895tdQYMmeN8R b3WRI5U5/nK5yifszQ1sszQ2z2gkC2IaMMSNcWy7MdhbZOmDhCzo47Mm5MBSoQZu7BMlQ7 l90RPrgB7SUBGHKejV0W5dgL1LQXu6dbE6g8I2MIl0xkMw9Ca1Zrm7dveukQhJno3dg6ST bMR+kElEXuYPqGZilBAJFZWV/KSJnW19a61z8wZgbTznrKm2lgfT1U/fUemAEe1cCgXBPg w/OPzJoJQY26xTZyCqkgIZQgMgxlm2wFYkND7fpX2kv7upemXO+dbkkiiKsETA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767532916; a=rsa-sha256; cv=none; b=l7r6hDCWf44lt1GI3d4JDpyRNleOKrHAYjanHd/FSRKxcj2fYBtfxf93dPzTQakNQ/GlPG N8ZMpzjDMKGz3MV9GVo5VV4B/HnEbFx1y5OxqQoG+4T7b6txJ9T24ZxxrzWYW77nbRW8Hz bCjQHFJ74fQ9BxIpiohVtQdzTvdzDj1hgBsaWd11WcOzWzCwB4x/cWhZEv9IwDSqHX0DYl tyPUqYS7CRht5yO0RH4zfbQH9p73bKLFNv62E+cg2a66gTymf4if7dPZB9/r2zCefm4hp3 EolMjjuQV7vS2Zw7fI621rjnOsZACKM2KONS4zn5By2W/4VtJ0LrIEDXnImu5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdPc3nYNzcll for ; Sun, 04 Jan 2026 13:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3967a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:21:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 2f83319214d9 - main - libc/amd64: fix stpncpy.S again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f83319214d9adb8ab7a77e35d1014658b3f9cae Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:21:56 +0000 Message-Id: <695a6974.3967a.494e6935@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2f83319214d9adb8ab7a77e35d1014658b3f9cae commit 2f83319214d9adb8ab7a77e35d1014658b3f9cae Author: Robert Clausecker AuthorDate: 2025-12-18 23:37:33 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:21:41 +0000 libc/amd64: fix stpncpy.S again The previous fix introduced a regression on machines without the BMI1 instruction set extension. The TZCNT instruction used in this function behaves different on old machines when the source operand is zero, but the code was originally designed to never trigger this case. The bug fix caused this case to be possible, leading to a regression on sufficiently old hardware. Fix the code by messing with things such that the source operand is never zero. PR: 291720 Fixes: 66eb78377bf109af1d9e25626bf254b4369436ec Tested by: cy Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D54303 --- lib/libc/amd64/string/stpncpy.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index 764ee1d4008c..2efadc97a435 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -36,9 +36,7 @@ .set stpncpy, __stpncpy ARCHFUNCS(__stpncpy) ARCHFUNC(__stpncpy, scalar) -#if 0 /* temporarily disabled cf. PR 291720 */ ARCHFUNC(__stpncpy, baseline) -#endif ENDARCHFUNCS(__stpncpy) ARCHENTRY(__stpncpy, scalar) @@ -93,7 +91,6 @@ ARCHEND(__stpncpy, scalar) /* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ ARCHENTRY(__stpncpy, baseline) #define bounce (-3*16-8) /* location of on-stack bounce buffer */ - test %rdx, %rdx # no bytes to copy? jz .L0 @@ -225,8 +222,8 @@ ARCHENTRY(__stpncpy, baseline) /* 1--32 bytes to copy, bounce through the stack */ .Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy - bts %r10, %r8 # treat end of buffer as end of string and %r9d, %r8d # mask out head before string + bts %r10, %r8 # treat end of buffer as end of string test $0x1ffff, %r8d # end of string within first chunk or right after? jnz 0f # if yes, do not inspect second buffer @@ -235,10 +232,10 @@ ARCHENTRY(__stpncpy, baseline) pcmpeqb %xmm1, %xmm0 # NUL in second chunk? pmovmskb %xmm0, %r9d shl $16, %r9d - or %r9d, %r8d # merge found NUL bytes into NUL mask + or %r9, %r8 # merge found NUL bytes into NUL mask /* end of string after one buffer */ -0: tzcnt %r8d, %r8d # location of last char in string +0: tzcnt %r8, %r8 # location of last char in string movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack lea (%rdi, %r8, 1), %rax # return pointer to NUL byte From nobody Sun Jan 4 13:24: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 4dkdS10zxyz6N24l for ; Sun, 04 Jan 2026 13:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdS06Cg6z3MmZ for ; Sun, 04 Jan 2026 13:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533040; 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=FeuVLF1s9zfCimYtnjkqYcnr0+PPQ5KrQmDcWD2iJag=; b=ha3DA4RxjTkiD5cn9mfzcXPldmoN/Vj+DhjoAF1rbguJGagUai0Pg9rVc3VbhqggY6nFMl 5FuwIPhbA2sethWxh8U9HDHELjBJg8gHs3HpFci2/Dywo4MLW2916KiGrGx+H5F493LcVk x0j97Rhy19FG5QrXyvMLM3dtysJBHPAnMIlya2w4qdwFkPQ0rKYObOef3Ni21arXPq1Sh+ 5+NtrVNz2otoRBNu72sonN4jOqCUgBf4xz8uYXObjCOVlLTTFJ44aSfJU4Y32aASsaD8y5 pQyB4fducgrNxdU8i4gVWCQQATuKZbH3n90hu/RclQQqv4BCYtwxQPZ4fisadA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533040; 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=FeuVLF1s9zfCimYtnjkqYcnr0+PPQ5KrQmDcWD2iJag=; b=NQfOAiB4wtOl3kMrc7prwjIxJcWKgUGUU5hILVpkQQCcACsehr9bE3uQduWX+0R/XUA1tZ s/NNyrJoCXYOE+5Q1Y9/c22iZwWlJOX5pGroKwnb1ZMmFvXWzA9uKDghUygUpWxIlsHaSi La7XljzbUF3E8S5DGA+xzcJAgcfaN5wqy8ekgJGNwG45gP6KwxYg3W63azbdDI64esExCD y7pBYdYAF+YE+wHlwflVKLS52qYrCAhjOjViM6aCkjIoXK4T7mtqowm2NC0NCrbLu2Qqzu XWmOAlrmo4AhNaGyWjmXU8P62mCLFbcfK0DFvkEPY5661NoEDU2aFh0N9FVDfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767533040; a=rsa-sha256; cv=none; b=VzpvTyE+tum7ySFErVufLOYKcCxsM10H4Ou+FY/YZwn/kDwug4qxsq/FjNieB77O2Zn68d gnmVR+xORMLo/s/SK7HFLncVczFsjCENl0/EN6OnBy7aQ82bxaR34dyWpT7KAa1Z1AU38J jZfXCD54Q/Lfm8ztPcD8F4eDEYd2sNBxFuQ701C3JgDILyG8q5NxHr7vLm75VE6X9/ag3i uTLODVZ+Pm8c+JByYVt6zMsJpOxfvT8KGGUIPtnN9fWxW3MMzknfu7mLDmGbtklj4/h5i+ fNP3p4bDtiNa4l7wsfuAJB2YjTLPm+/1tUCWY3GVMLFKJt2g87KSM7lKGLIhhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdS05S6czcqQ for ; Sun, 04 Jan 2026 13:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b511 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:24:00 +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: Robert Clausecker Subject: git: e626fa022361 - stable/15 - libc/amd64: Disable baseline version of stpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e626fa022361bca98bba93842afb3d749427b801 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:24:00 +0000 Message-Id: <695a69f0.3b511.5883ec2b@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e626fa022361bca98bba93842afb3d749427b801 commit e626fa022361bca98bba93842afb3d749427b801 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-16 19:04:51 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:22:50 +0000 libc/amd64: Disable baseline version of stpncpy() This implementation appears to be broken on some CPUs. Disable it until the issue can be investigated and fixed. PR: 291720 Fixes: 66eb78377bf1 ("libc/amd64: fix overread conditions in stpncpy()") Fixes: 90253d49db09 ("lib/libc/amd64/string: add stpncpy scalar, baseline implementation") (cherry picked from commit ce9557d4ee174267504a63b2c8f6009be27368c9) --- lib/libc/amd64/string/stpncpy.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index df22bb9f0c53..764ee1d4008c 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -36,7 +36,9 @@ .set stpncpy, __stpncpy ARCHFUNCS(__stpncpy) ARCHFUNC(__stpncpy, scalar) +#if 0 /* temporarily disabled cf. PR 291720 */ ARCHFUNC(__stpncpy, baseline) +#endif ENDARCHFUNCS(__stpncpy) ARCHENTRY(__stpncpy, scalar) From nobody Sun Jan 4 13:24: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 4dkdS23lt6z6N22R for ; Sun, 04 Jan 2026 13:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdS203wDz3Mmb for ; Sun, 04 Jan 2026 13:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=39TIpkZj7PwQxjLTahalkjo4mHFvhKS/yE4dlQBzus4=; b=ATP3dknSKxpMwBMuqUg1wU9icGRslkYC5YEzGb44R/8rx3S663cEXs9VR/pm7LhRyHH6Cb C/JF3315Lo0McPunLxzja8apUKW8yKZcDDgEYHsWzvzuNc5hKU/JUJ0E2HgEdlmZ55jYik +HVFfeH4YXqwujVBGK1u7BSFTsYCjimm3sFSINy33LKbEilwxJCgSre6v5jJLTuowQiVBi NfXJIoydOnSrH4L3Xll9Kw4UeJdCL+75E+PCYMfl6ku5t1JVcJ8fEjSSepc223GvIV0D8w btJdi+AyGSvq1enXu+g9QxeffEKvwjt8Hs3UoV4u5eod0VLD6zlsGhAINbingw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=39TIpkZj7PwQxjLTahalkjo4mHFvhKS/yE4dlQBzus4=; b=Vqmpff2GfVnXcQExAE5X7t9OD6aAlZJ2NNSByJMdycG3igp0Krk0QTRiATNLzSe1lt45Y0 78yFnmkH9bhARHSM+ArpFtjYn5bskrHNRD6/BQ/0if56K2G2wasESAJYh3IWXFxnfO5f+C QLVv7uumXwWy9cvrlD9qd6YJpN+jOSpIBX5bzCbk0hbR6v+lkOtHPXHfT/xJVUP3eNLN27 aTVGSf5AB6a5kO5uvEv0eouyE7Kzgk7fehyBU/eTxFUCjlloxeMC19/d/nzaU8LlP6QwZC orFJQfSXxERUAxwsUEFXauRikdqKJyVgDzjjTnUyx+emKvnEJQFDzxq2cXyfIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767533042; a=rsa-sha256; cv=none; b=eMfXyqg3ZWEsNXUdpP4yoMlycxU39vmTkfS3UITTt1oJKUXUTPbOVrEDmnQh95hpHAYr0p emJnORM1KSHfE15VMIBtPK/aV+d15KZzEjT80X27iY8KSE+MjZ7fBjGuqnmqXY7KK+zRbG CTJF5agmmNIt8OLx9VR1s8m0ajU0MyfQqHW9/sSmoOPuFpaKvRpGYJkhs1MvEwTK9uCsT2 ctEsY4yI8sFw59cotY+80kcLLOdlf+ajpsuBhydxDigWIw2m56PX2zuJbkSBDKFL9OCJpP 0DLW4H8o3nSLVDU9niwceYauoT7EzrN1J7SupNWSynx3+iBmH8yVMdO/HjALeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdS166m1zd1C for ; Sun, 04 Jan 2026 13:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39da1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:24:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 9c68745a5064 - stable/15 - libc/amd64: fix stpncpy.S again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c68745a50640ccff37565e3cbfe53dddc18d7d3 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:24:01 +0000 Message-Id: <695a69f1.39da1.5b9f90d9@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=9c68745a50640ccff37565e3cbfe53dddc18d7d3 commit 9c68745a50640ccff37565e3cbfe53dddc18d7d3 Author: Robert Clausecker AuthorDate: 2025-12-18 23:37:33 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:22:51 +0000 libc/amd64: fix stpncpy.S again The previous fix introduced a regression on machines without the BMI1 instruction set extension. The TZCNT instruction used in this function behaves different on old machines when the source operand is zero, but the code was originally designed to never trigger this case. The bug fix caused this case to be possible, leading to a regression on sufficiently old hardware. Fix the code by messing with things such that the source operand is never zero. PR: 291720 Fixes: 66eb78377bf109af1d9e25626bf254b4369436ec Tested by: cy Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D54303 (cherry picked from commit 2f83319214d9adb8ab7a77e35d1014658b3f9cae) --- lib/libc/amd64/string/stpncpy.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index 764ee1d4008c..2efadc97a435 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -36,9 +36,7 @@ .set stpncpy, __stpncpy ARCHFUNCS(__stpncpy) ARCHFUNC(__stpncpy, scalar) -#if 0 /* temporarily disabled cf. PR 291720 */ ARCHFUNC(__stpncpy, baseline) -#endif ENDARCHFUNCS(__stpncpy) ARCHENTRY(__stpncpy, scalar) @@ -93,7 +91,6 @@ ARCHEND(__stpncpy, scalar) /* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ ARCHENTRY(__stpncpy, baseline) #define bounce (-3*16-8) /* location of on-stack bounce buffer */ - test %rdx, %rdx # no bytes to copy? jz .L0 @@ -225,8 +222,8 @@ ARCHENTRY(__stpncpy, baseline) /* 1--32 bytes to copy, bounce through the stack */ .Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy - bts %r10, %r8 # treat end of buffer as end of string and %r9d, %r8d # mask out head before string + bts %r10, %r8 # treat end of buffer as end of string test $0x1ffff, %r8d # end of string within first chunk or right after? jnz 0f # if yes, do not inspect second buffer @@ -235,10 +232,10 @@ ARCHENTRY(__stpncpy, baseline) pcmpeqb %xmm1, %xmm0 # NUL in second chunk? pmovmskb %xmm0, %r9d shl $16, %r9d - or %r9d, %r8d # merge found NUL bytes into NUL mask + or %r9, %r8 # merge found NUL bytes into NUL mask /* end of string after one buffer */ -0: tzcnt %r8d, %r8d # location of last char in string +0: tzcnt %r8, %r8 # location of last char in string movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack lea (%rdi, %r8, 1), %rax # return pointer to NUL byte From nobody Sun Jan 4 13:27: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 4dkdX25WVJz6N21G for ; Sun, 04 Jan 2026 13:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdX21xwbz3NnN for ; Sun, 04 Jan 2026 13:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=epJ5kVENtkCBTISFhlkceHUD2MDAnOKGqgt1v9z7pL8=; b=l7n9EV+kX9TstrjLtjREJoSOBothX2WT7jupO6l/nOwnptypUK7lJ4l1s+nhw98u6I6qrY Y7KoBiHLoFKgZIrHKk+GhUSBNyKsJMSi2B/4uFuJS522lWZOvj5a/nwiPTYPmd2QQPUN3f AnL//8wyJQ9kSASYJBhm/u24vcSXXnyG7dCpHin5ADJHNMwfMd/4eQ6LmtJ7E/OCUo70A4 SpKnOQ6Gk8YuCFeCF0Xm0P/zuIaJXx7WUUpSHPyv8D2n8U+6EGiSNn8WsddtnO6u3TdBL0 LjW/eqNISKEzXx+5y73HPGMCm/wDZcF4+tRlE9u91nPt/Ekjk1wCx2TNr4humQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=epJ5kVENtkCBTISFhlkceHUD2MDAnOKGqgt1v9z7pL8=; b=u1duMk4Jjph47BIuX6EZvbIWgKa3bQDQ163wlcyA0Akz76vrYqUgGYQOM4q7SDYV010Wu9 D7QJdtHFieN/K6sIYcUlJ9tXd3LU5RT3U4YQ6R4G+7V1SADWxDpVbm2hWTVlRoWVj0P5xh mlb5gYxMfFs9WYHgdQklvipTzqZZqIOT2a8klWnm8PwLq3HvrkZn84BK32LCa/KDBLB41i SPJSlvU99z3j2EKuw6FWod3d9PW4DLzqUnKaVdnPMRSXkHwM0LMLyfrT5c9ND13v5epjQO QX3XBAEQ7MCyHIzHVSmgX5VDSKbek1cYYoBHi2VEg3Fy2bfVl7Kc5TmnH2me5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767533250; a=rsa-sha256; cv=none; b=Zsm9QDJsVjnTS38396ExUPIpzorOIoakPkb96DtOYdAjiBrDkR9E/IQs4/H8vavAqdzwQI 9cQVYLhgL9KQycYZfQYcraAOlP2vydWPtKDllKUfWKxurBTkCudV9/dYpddgpk9J7VlFBs eMVULDCLGU4OyduU3LsPVZBcSfJtWJc4zgFKakTXSlNLiN7xdQj1bdA7o7uFQdbbFXKY+U BaVBrWLmnwuGRuOaFklPhxeS6CFX1whveH4GrIoYaPzfe2kXec3Ny+n968+jP4qY3FrgaM qBFTmhgcsRRtaqjmHvXoTv8AlP6a/xKfmA/yEpqt3cH1gzGbYqft2ov0d33OTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdX21Vg3zd3h for ; Sun, 04 Jan 2026 13:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a166 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:27:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: b0dc25c6d378 - stable/14 - libc/amd64: fix overread conditions in stpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0dc25c6d378fbab41f86e494d4e7fcbadeb1b74 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:27:30 +0000 Message-Id: <695a6ac2.3a166.30e2c471@gitrepo.freebsd.org> The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=b0dc25c6d378fbab41f86e494d4e7fcbadeb1b74 commit b0dc25c6d378fbab41f86e494d4e7fcbadeb1b74 Author: Robert Clausecker AuthorDate: 2025-12-10 20:45:18 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:25:33 +0000 libc/amd64: fix overread conditions in stpncpy() Due to incorrect unit test design, two overread conditions went undetected in the amd64 baseline stpncpy() implementation. For buffers of 1--16 and 32 bytes that do not contain nul bytes and end exactly at a page boundary, the code would incorrectly read 16 bytes from the next page, possibly crossing into an unmapped page and crashing the program. If the next page was mapped, the code would then proceed with the expected behaviour of the stpncpy() function. Three changes were made to fix the bug: - an off-by-one error is fixed in the code deciding whether to enter the runt case or not, entering it for 0 Reviewed by: getz Approved by: markj (mentor) MFC after: 1 week Fixes: 90253d49db09a9b1490c448d05314f3e4bbfa468 (D42519) Differential Revision: https://reviews.freebsd.org/D54170 (cherry picked from commit 66eb78377bf109af1d9e25626bf254b4369436ec) --- lib/libc/amd64/string/stpncpy.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index 5ce0dd093a9e..df22bb9f0c53 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -100,7 +100,7 @@ ARCHENTRY(__stpncpy, baseline) movdqa (%rsi), %xmm0 # load head and $0xf, %ecx # offset from alignment mov $-1, %r9d - lea -32(%rcx), %rax # set up overflow-proof comparison rdx+rcx<=32 + lea -33(%rcx), %rax # set up overflow-proof comparison rdx+rcx<=32 shl %cl, %r9d # mask of bytes belonging to the string sub %rcx, %rdi # adjust RDI to correspond to RSI pxor %xmm1, %xmm1 @@ -223,8 +223,9 @@ ARCHENTRY(__stpncpy, baseline) /* 1--32 bytes to copy, bounce through the stack */ .Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy - bts %r10d, %r8d # treat end of buffer as end of string - and %r9w, %r8w # end of string within first buffer? + bts %r10, %r8 # treat end of buffer as end of string + and %r9d, %r8d # mask out head before string + test $0x1ffff, %r8d # end of string within first chunk or right after? jnz 0f # if yes, do not inspect second buffer movdqa 16(%rsi), %xmm0 # load second chunk of input From nobody Sun Jan 4 13:27: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 4dkdX4585pz6N23S for ; Sun, 04 Jan 2026 13:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdX439VJz3P1K for ; Sun, 04 Jan 2026 13:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGqil7mE4sjPqrDnjzS79J2bhFHEG2daUfPUkVcmtNY=; b=MjPwChwb/g6njZpruO3HM/vNia5Vcuzg2CqU4XOaSggemN6ULjlY3vfeRlFIdsO/Kfxngb zEqmjQ3c7AtnZNES1LkqPtaCSRjjB2P6/VOtzs3LoIzIILy8jXZyNBVy8idA/0o+FzNETz 6xuOSvorxP2MuxrZxCsKfem7IVLxFGPaNqvSigDdKO3oOcgEPmzgPrFPYA9jBqpxkj2Do3 9J77bVc6KNWNyVq5Mhm38QNDbzd26ANRnqN6K+8t3Wj7g1Jo4xmGhLy5Jzgmcm4Rlnn7Yy dDZGYvuOLfF3molk5GPIrbowhpgCEx8fqZQhPPnRk/0vfCPT09U53EeH/yZIlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGqil7mE4sjPqrDnjzS79J2bhFHEG2daUfPUkVcmtNY=; b=nItt8rhjvR6TdlO2gCa89hTFBMawfyuU8Gf+zBusRE/PBDtbHOzxptNN+hUlubonsfEolE GkMeqfPcJcdr9q7CYLxKKLpVuRXXtTVE3AnA+dL7NV7NhQe8UrCBRbhNhfwwxo+CBW9DuD TY7l6NGZO/sr8JkLJyyiEEPyllRNTF0cVFCCnVjtBLoCQOH/bbOFbve5jhSyw1wwnDkxLK elWbZeDVxrtOFlMxfgyhDindtNj4eCiUTWoazK8FaWxm9NiUHGOcAUYKkAWuyXRhfvWI/S hXzP9aQjXfzIS9zuCrmRM4L5FmHf5dETiqWySv3HEj/iMyfqTs1LW8hn/T7I4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767533252; a=rsa-sha256; cv=none; b=tQNIdGC+pDXtdvhVkoK4nUptncY3n6sRXpD3KZhmQ/POCcgymeMRJTzFfPdvb7ANgAaXdh ONA7VuvWrxjQ8ESRUMaNFD5n/WBPcZRXw3mwx2p3HtF4dypO80MxXzQKJx9P//cRDUAj0R Ku8yM2hvoc9Wp9IP0dPFmSoZOrlEZUNEq7yDS57jICkFgbE1PtZaJFSo/M15jZRM8XItpQ qF91jGwLvOdAFiMHsDluALyKzMmfv4mLSMoQ/C7wZ2ML/JliW/SiagKqhQ7ZgR8E7JfP0t p/ajkUt95UPkWmoXThq+mqBdZNyuBjcY/wn97s/O36lsZb8uy/Hu1nwH0OOZwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdX42lZCzcmk for ; Sun, 04 Jan 2026 13:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:27:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: a5c6c9563119 - stable/14 - libc/amd64: fix stpncpy.S again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5c6c95631195181bd3707d96ab79184235df6a6 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:27:32 +0000 Message-Id: <695a6ac4.39c72.7c805f10@gitrepo.freebsd.org> The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a5c6c95631195181bd3707d96ab79184235df6a6 commit a5c6c95631195181bd3707d96ab79184235df6a6 Author: Robert Clausecker AuthorDate: 2025-12-18 23:37:33 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:25:33 +0000 libc/amd64: fix stpncpy.S again The previous fix introduced a regression on machines without the BMI1 instruction set extension. The TZCNT instruction used in this function behaves different on old machines when the source operand is zero, but the code was originally designed to never trigger this case. The bug fix caused this case to be possible, leading to a regression on sufficiently old hardware. Fix the code by messing with things such that the source operand is never zero. PR: 291720 Fixes: 66eb78377bf109af1d9e25626bf254b4369436ec Tested by: cy Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D54303 (cherry picked from commit 2f83319214d9adb8ab7a77e35d1014658b3f9cae) --- lib/libc/amd64/string/stpncpy.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index 764ee1d4008c..2efadc97a435 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -36,9 +36,7 @@ .set stpncpy, __stpncpy ARCHFUNCS(__stpncpy) ARCHFUNC(__stpncpy, scalar) -#if 0 /* temporarily disabled cf. PR 291720 */ ARCHFUNC(__stpncpy, baseline) -#endif ENDARCHFUNCS(__stpncpy) ARCHENTRY(__stpncpy, scalar) @@ -93,7 +91,6 @@ ARCHEND(__stpncpy, scalar) /* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ ARCHENTRY(__stpncpy, baseline) #define bounce (-3*16-8) /* location of on-stack bounce buffer */ - test %rdx, %rdx # no bytes to copy? jz .L0 @@ -225,8 +222,8 @@ ARCHENTRY(__stpncpy, baseline) /* 1--32 bytes to copy, bounce through the stack */ .Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy - bts %r10, %r8 # treat end of buffer as end of string and %r9d, %r8d # mask out head before string + bts %r10, %r8 # treat end of buffer as end of string test $0x1ffff, %r8d # end of string within first chunk or right after? jnz 0f # if yes, do not inspect second buffer @@ -235,10 +232,10 @@ ARCHENTRY(__stpncpy, baseline) pcmpeqb %xmm1, %xmm0 # NUL in second chunk? pmovmskb %xmm0, %r9d shl $16, %r9d - or %r9d, %r8d # merge found NUL bytes into NUL mask + or %r9, %r8 # merge found NUL bytes into NUL mask /* end of string after one buffer */ -0: tzcnt %r8d, %r8d # location of last char in string +0: tzcnt %r8, %r8 # location of last char in string movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack lea (%rdi, %r8, 1), %rax # return pointer to NUL byte From nobody Sun Jan 4 13:27: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 4dkdX35k44z6N2Gy for ; Sun, 04 Jan 2026 13:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdX32PKGz3P6Y for ; Sun, 04 Jan 2026 13:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533251; 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=yAEsHFksg0nH3TA8sUM01wthyFfb/uY0duD1Txx0LM8=; b=eqEH5vR/AWduJ2MTiqbXyNIyGLtI2K288nvCuPYvZA0AFRFLPJX5mIg2SVJPbU4K0ZBK7D 8XGrrLf6XdD2XaS51zPsOtV28HShWTzF6dP60AN+p22EJOSsU2tEiBDC1IBCoq9A2c9y80 OLZ3NA+dGOvEPpDrM2epQwRlxDToJyS5HboWlsLRRcqTsdbS5y6L7EKKweCZooBIhnZKmz py0Exff+MrmRSvguGWlRfH5sEtO0kyVsUgHlIBDFFnqOoM6xSJ2mj+cqYL3W/qWIeAw+yA 4MLZnFCEkrd537UgWrDWRuZxEAb73DHY6mUTtbdYUg7GgC6BULk4hjmY2QaXBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533251; 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=yAEsHFksg0nH3TA8sUM01wthyFfb/uY0duD1Txx0LM8=; b=FyRHLrIOU6RSZwBkgB3tcFru7pipreeiFq0mUgfWnKM24wtH+AdlYTJZlLkGqANo/H9Gvg c50o+a75jxloiHtdz58X5248F+1cQ4mPESsMriO0RpVkjgOVqKUxBWNGdiQ28Fge+MykkB MxE0qzJUluOs876W8Oe4UYh+cSqjqArKTzjFo8UvRzsNT4FlraVmQBj+EL+Jn0hzJ/LzNk IElv3FE5dPBWlPclpeZFYjCj5IYcXK25fYhvC7ejTa3rg4UnABVG5HkjPMEA7CLvR9Hu2G r7Uaz/jKetk1L8dypArQdIQQCP1lFah3YDFQs87Qhe+tS716E7PaEUzdej4n8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767533251; a=rsa-sha256; cv=none; b=a4Y5xz9LPkAQE2FRH5fJ6e/9f0B8bDQfvTnfRCTz6bbzFhYhruGmzkqqyi1DPh5s1/HzbE EOARypIpwTWcc2mBY4FdsnPWGS58eHgoA3ruJUj/3lYABkZjGIl4OVQsQiO9YRU4YOQ/dv +J3w+gdQuw0wqo67M67hO+6nmtbyjy7RxH4IAfbFag4+Rro7sDRUHODF9O395EXDfZWQ7p IJphgl7HxD3F4ZINcd7cLDJHFJmVje43CjYQCXI4UfQKMnsN7m759hibYP776bYRYLw8TK z/yJ9xmfmRU0hU4QMaPwp8/sIkCjCNLk23lF8ldaMxT6D6kllN28OlaUDTDZKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdX31zhQzck8 for ; Sun, 04 Jan 2026 13:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:27:31 +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: Robert Clausecker Subject: git: 793877e7667c - stable/14 - libc/amd64: Disable baseline version of stpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 793877e7667ce667cdf3539de68af78fb511c06f Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:27:31 +0000 Message-Id: <695a6ac3.3ab25.712cd7db@gitrepo.freebsd.org> The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=793877e7667ce667cdf3539de68af78fb511c06f commit 793877e7667ce667cdf3539de68af78fb511c06f Author: Dag-Erling Smørgrav AuthorDate: 2025-12-16 19:04:51 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:25:33 +0000 libc/amd64: Disable baseline version of stpncpy() This implementation appears to be broken on some CPUs. Disable it until the issue can be investigated and fixed. PR: 291720 Fixes: 66eb78377bf1 ("libc/amd64: fix overread conditions in stpncpy()") Fixes: 90253d49db09 ("lib/libc/amd64/string: add stpncpy scalar, baseline implementation") (cherry picked from commit ce9557d4ee174267504a63b2c8f6009be27368c9) --- lib/libc/amd64/string/stpncpy.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index df22bb9f0c53..764ee1d4008c 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -36,7 +36,9 @@ .set stpncpy, __stpncpy ARCHFUNCS(__stpncpy) ARCHFUNC(__stpncpy, scalar) +#if 0 /* temporarily disabled cf. PR 291720 */ ARCHFUNC(__stpncpy, baseline) +#endif ENDARCHFUNCS(__stpncpy) ARCHENTRY(__stpncpy, scalar) From nobody Sun Jan 4 13:27: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 4dkdX141J9z6N2Gx for ; Sun, 04 Jan 2026 13:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdX11s3gz3Nwc for ; Sun, 04 Jan 2026 13:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vAVjOpuCghMIoh2wbKytJRKd3TGE7SkZoIQNcgGgzQU=; b=A9hR6rPrWPEKh2nAK1+/4mmUKJmFpFA9kXtlK4TyvK51foJK6zH4OQFILCv6b42/8NRX+M THO6zYTfuhMptpglFiinrN/+0xkYbe01VR13HzEFm+F318nxJFuQGcA4baHq7xMzYFRJUw TlizPqdQSgx6lD8T1qVmnoAkZFuoCgKHQ2MNQ1c9BFkn5Hi6HLZFhHHuDJvTf9t4mY/2JU v2+Fh9UWrfWAIFkJmxS5GqVuQHzK+Yal0xqLigYSTIvuTa1pIq/ZywTrHDZxKt/G6R2VIB qCpddAygDK0ngdg8Hs5J7/0jshIZl63AwZV1LCmJ19vR6o1anxM/Zjc4Nwudug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767533249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vAVjOpuCghMIoh2wbKytJRKd3TGE7SkZoIQNcgGgzQU=; b=wmBEjOe5UT4463mcGdeEhJOKFTo+MXeo7rM8FSPLsfYzH4iLs9k9n/lGqMcC4RE9YHA+jT jUz3fuNug8oKyJne/RokIc8D4KMHj6qoE6ra0sTaOpzIvvTQ4aifrhSKVsEFMYHNL+5HdL WClLNPzWxYqit2OYPKSqbqOGdYDyhVa3LHESxvUDcpKIzKlceqUGpatfpq10HKyUAnPMJ+ 5YveGd3qwZUYe+rwp1cpWPswYQDZDwYwVD+wM+VuZYTmYfY/swzQxcXbcGZXX/QyE4Geyh zYzeDlptC9hIbWTgt0v32OZAKCqK6AIcvz8z9U6X7wUUivW+D+k4r4y1dclNFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767533249; a=rsa-sha256; cv=none; b=cninMv8ubZWI7HuGQcdo71O5uu9f7NoJ7ugFwq6lWHsneivWhzDKBDQyhrL/mRW0Z/3+qU jC9wqpfZEOTPKogeHiqbRi/70DIdGpev4fTSod8s77c9ACX4zJhtefLl0K/WMzR5a1nvzJ GY+bq2QqKhycYidk+UX9LnGIyjUJUi1mKDQsm7rvuCLVoZzAlg4wn5KtyiAl93NyrkU2z9 kTYfD+HdxBXDLMzigr9NllwogLiO4ZjN0qCunn2h5l+oi9UKthZXZ6gLMe24ZeTEvmcu/P X0m6j1/VVdd5mtCM/bExMPhNvdGIL9Tx/9EnjvuF2SvULvidZIZUYk9d2agpOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdX10wmjzck6 for ; Sun, 04 Jan 2026 13:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3af68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:27:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: e2f095779323 - stable/14 - libc/tests/string: improve stpncpy() "bounds" unit test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e2f095779323204e90843b405863c81dc02423d2 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:27:29 +0000 Message-Id: <695a6ac1.3af68.37e5642f@gitrepo.freebsd.org> The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e2f095779323204e90843b405863c81dc02423d2 commit e2f095779323204e90843b405863c81dc02423d2 Author: Robert Clausecker AuthorDate: 2025-12-04 16:34:59 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:25:21 +0000 libc/tests/string: improve stpncpy() "bounds" unit test The test is extended the same way I previously extended the memccpy() test to fix what is probably the same kind of bug. PR: 291359 Reported by: Collin Funk Reviewed by: ngie Approved by: markj (mentor) Fixes: 6fa9e7d8737548ef93c573387ce62402c368d486 (D42519) See also: 61ed5748e4e9c7397fcb2638b442f46ac5c9e7c5 (D46051) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54169 lib/libc/tests/string/stpncpy_test.c: apply ngie's fixes (cherry picked from commit 123c086200491819595abc271d360e605288fd18) (cherry picked from commit 8be8642826099368208efb2c1222f2a102cc5b08) --- lib/libc/tests/string/stpncpy_test.c | 55 +++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c index 8574b2d591be..7fabe17bfe4a 100644 --- a/lib/libc/tests/string/stpncpy_test.c +++ b/lib/libc/tests/string/stpncpy_test.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2009 David Schultz - * Copyright (c) 2023 The FreeBSD Foundation + * Copyright (c) 2023, 2025 The FreeBSD Foundation * All rights reserved. * * Portions of this software were developed by Robert Clausecker @@ -52,34 +52,57 @@ makebuf(size_t len, int guard_at_end) buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); assert(buf); if (guard_at_end) { - assert(munmap(buf + alloc_size - page_size, page_size) == 0); + assert(mprotect(buf + alloc_size - page_size, page_size, PROT_NONE) == 0); return (buf + alloc_size - page_size - len); } else { - assert(munmap(buf, page_size) == 0); + assert(mprotect(buf, page_size, PROT_NONE) == 0); return (buf + page_size); } } static void -test_stpncpy(const char *s) +freebuf(char *buf, size_t len, int guard_at_end) { - char *src, *dst; - size_t size, len, bufsize, x; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + if (guard_at_end) + munmap(buf + len + page_size - alloc_size, alloc_size); + else + munmap(buf - page_size, alloc_size); +} + +static void +test_stpncpy(const char *s, size_t size) +{ + char *src, *dst, *expected; + size_t bufsize, x; int i, j; - size = strlen(s) + 1; for (i = 0; i <= 1; i++) { for (j = 0; j <= 1; j++) { - for (bufsize = 0; bufsize <= size + 10; bufsize++) { - src = makebuf(size, i); - memcpy(src, s, size); + for (bufsize = 0; bufsize <= size + 32; bufsize++) { dst = makebuf(bufsize, j); + if (bufsize < size) { + src = makebuf(bufsize, i); + memcpy(src, s, bufsize); + expected = dst + bufsize; + } else { + src = makebuf(size, i); + memcpy(src, s, size); + expected = dst + size - 1; + } + memset(dst, 'X', bufsize); - len = (bufsize < size) ? bufsize : size - 1; - assert(stpncpy_fn(dst, src, bufsize) == dst+len); - assert(memcmp(src, dst, len) == 0); - for (x = len; x < bufsize; x++) + assert(stpncpy_fn(dst, src, bufsize) == expected); + assert(memcmp(src, dst, MIN(bufsize, size)) == 0); + for (x = size; x < bufsize; x++) assert(dst[x] == '\0'); + + freebuf(dst, bufsize, j); + freebuf(src, MIN(bufsize, size), i); } } } @@ -140,12 +163,12 @@ ATF_TC_WITHOUT_HEAD(bounds); ATF_TC_BODY(bounds, tc) { size_t i; - char buf[64+1]; + char buf[64]; for (i = 0; i < sizeof(buf) - 1; i++) { buf[i] = ' ' + i; buf[i+1] = '\0'; - test_stpncpy(buf); + test_stpncpy(buf, i + 2); } } From nobody Sun Jan 4 22:48: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 4dkszR2GvBz6N0T4 for ; Sun, 04 Jan 2026 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkszR1cmBz3ZX1 for ; Sun, 04 Jan 2026 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767566915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzD0FzHFY4Vlr8/ZL1j/anGSZjbNYVZL/JWe3KjgEvg=; b=TISk0nQt+nuSwoXbyF2s6vulBov8N/v2+3PiEkPddVU1fBQoW86iJoTl4U0OiWVkCLmkfT IiLwfAsKFNAOweFNs++NUKj6t0fJr/VJJ4cmv8YGo6IMHCeTJwJ1OT8iu7Fi2y2t5I2GaK H7+n2OQ/5TxMwKUSsAtEpqc0u6f6/9d6mheO/4OMj+d5zAhN3UZI0OlTv5DSa9FJ8B0ulC kMOoijl3LqPmh1d8567E0+NSFTfKukoCXzlSFzkzah1zGvQaK2ZZ9jZMz7OGbq1ZuMuFlW YRk5CE+lvoqhMgCsSJbvyVpUrPXoKByDWQzx96wwwXGCiCsC4G9nqrNfyL2yPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767566915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzD0FzHFY4Vlr8/ZL1j/anGSZjbNYVZL/JWe3KjgEvg=; b=k9gj2nF1U4LQrVoPDL1/s+JS/ft+9jeyle0ny5LA9xmpt5IfkmnluIZaIpuWUv2qUWOQBp DNgMvfrDB8yh0s3F/rve2FFIOz4GVvxok+2DapmEfUAppt/LnJ3RIKrv1lxqeE4wU8AmgO 5EQ1LhXK00aS2tMIqwqEa5d7TQ9jsn52+Mzt5rhF8ROigVppPOs+MR7HrKiWy/IyG2r89k Kf1+axRM06UJUQ2LIcZ+kltpQZzKnO/8KpvEBRoR6psJSG8RixFteHh/DKEmv8FnggIchC Re21QLcGrmxZMnkXyoKu6MMX9dBUYmlloUTWHxWDMywoiS6GtIXE8eITGraJFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767566915; a=rsa-sha256; cv=none; b=VGpGHYltBkh1tCEN6PoSRwe2H+dxsjCgARI/7V55xpD/ZfSxE5KWpJD8sBon1gIoaMqORf KWGJ20uepbuM7lHybPLzLeoMhV/4rFa4+SygstmshPc/McNVEtHd1H4QQmnnVCro/Hn1I3 ywyTpt3ysYMUnXaPoVevQvitLobyAP7RYylEfC85qqHGBnQQBIKhdwzlFImDn7CYlowmrm 9Ol7KIqIWL2fVtatIBpF/RKBy1gmUBIKtZLApmavS5RTkQ/BnusVG9QD7qidSbrHP1e+Xe TFU68Ekt1T70VI7xPbxUc05MyzsUXLv2nt7UlV/DaqtHLikzQ2A9pkF6XrVbjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkszR1BKhzvKK for ; Sun, 04 Jan 2026 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20dd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 22:48:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9c923575606b - main - vm/vm_object.h: clarify the OBJ_ONEMAPPING semantic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c923575606bbd29dcf0ec3384150d2d67136cbb Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 22:48:35 +0000 Message-Id: <695aee43.20dd6.e22f3b6@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c923575606bbd29dcf0ec3384150d2d67136cbb commit 9c923575606bbd29dcf0ec3384150d2d67136cbb Author: Konstantin Belousov AuthorDate: 2025-12-31 22:26:38 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-04 22:47:51 +0000 vm/vm_object.h: clarify the OBJ_ONEMAPPING semantic Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D54459 --- sys/vm/vm_object.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 98afb93f8389..cd1d10d4fb89 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -197,8 +197,9 @@ struct vm_object { #define OBJ_SPLIT 0x00000400 /* object is being split */ #define OBJ_COLLAPSING 0x00000800 /* Parent of collapse. */ #define OBJ_COLORED 0x00001000 /* pg_color is defined */ -#define OBJ_ONEMAPPING 0x00002000 /* One USE (a single, non-forked) - mapping flag */ +#define OBJ_ONEMAPPING 0x00002000 /* Each page is allowed to have at most + one managed mapping, all in the same + vm_map */ #define OBJ_PAGERPRIV1 0x00004000 /* Pager private */ #define OBJ_PAGERPRIV2 0x00008000 /* Pager private */ #define OBJ_SYSVSHM 0x00010000 /* SysV SHM */