From nobody Tue Mar 17 00:38:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3L1qrPz6VH43 for ; Tue, 17 Mar 2026 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZY3L10Wcz42dn for ; Tue, 17 Mar 2026 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XkOua8713XQ7eI/iXSdevtmc0uWcWrSTMJ8lXUicttA=; b=BZTja64v6fuijiDJScfEdqvv+vj6DljLglqWAaaScaOU7LLEZrzIxdMtgQPZsj3i1zZTBR oVMitqCTnRilx9kKnmP1haH6CYMzwtcVCKBO5gtzdf7WXimZg5zFaMFBvjJDQeT5NtBtpY SBgogADvAvz/V2j/VLC7vHqtZ71uCUY8BjuqriBLkGDekakTwKwKPnTJsXJ4Gy1DPvlJFW qzeNn4j14eHV4HltnMLt3gpdV1pQkaDAVb1cuYAS0q2gwsbihHedoGujIs2wLfFfUBTuXe n6Xq50b0l0r2KgSjP4K37X0a3V2n96CGOhim10NrNaGGMrq/qlT30NWnSk029Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773707902; a=rsa-sha256; cv=none; b=hkJIj+RahmoP5eGcGjYodGdhc/VWsGHW2QA542oqh3fefPLYn/dxgY/XIDS6fwFttVcnjR agkqbGExABIJaHhoBK5mUyaqKsFONMEKPUgNCkik9IRup8dKO1JkIzRBy8hHsWSA1Dt4cK tTIZrPrzxaN/QQeedCJLq+INtwS3fvpzpbP/eYDqlit4c2nYBnw8Mw6OhNYYRexAn6oBK7 AxNUd5zpOAIO2kNiZvmdCEej19dj2TD9s2c/bb897dUjcsfHFPAAzvqq06oKMHz3mExm/w LHoHi0Jhs+Oz7ChOuyuTOYE6N7rQD/oqJTpXouPmmiv/QjhwJIjwYFe1Xy1C6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XkOua8713XQ7eI/iXSdevtmc0uWcWrSTMJ8lXUicttA=; b=VWGjtSOPyYCPAME5U5gl6nsSknO4siZzMlI5+p2IEvAaRD3xwAm8vexqiD3LckAvaFpLOX om0KJT6OebO9e33kf5jkVp32ObDpup2iRuAmyDsAjVDp9if75rdnJRi+/hEGnX15ufti7V BlJAGwjasNFaufPHE9XY2nLsQnlmsF8MwwQOZP8ajfRbEnjvrCDVKKwNJDvFd3JYegS9Zm XUkWuycVKzmLnU/dzs9fkbSI4y3rwOmRbpmqxawpGr6OTrq19fE+flflCe7e5YG0b5u2CK nAmc8KElxL4Dj1ARGtb10PH/tCBiI9Zti0Vq4FKRrgC1Y46TrNw8cMkPGEkm4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3L0JYhzycX for ; Tue, 17 Mar 2026 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31219 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 00:38:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 89559b5d279c - stable/15 - vfs: add VOP_DELAYED_SETSIZE() and related infrastructure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 89559b5d279c6cccfe6ddd27f81408b1f0d44f15 Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 00:38:21 +0000 Message-Id: <69b8a27d.31219.64610f30@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89559b5d279c6cccfe6ddd27f81408b1f0d44f15 commit 89559b5d279c6cccfe6ddd27f81408b1f0d44f15 Author: Konstantin Belousov AuthorDate: 2026-02-28 16:11:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-15 06:58:56 +0000 vfs: add VOP_DELAYED_SETSIZE() and related infrastructure (cherry picked from commit 45117ffcd533ddf995f654db60b10899ae8370ec) --- sys/fs/deadfs/dead_vnops.c | 1 + sys/kern/vfs_default.c | 1 + sys/kern/vfs_vnops.c | 74 +++++++++++++++++++++++++++++++++++++++++++++- sys/kern/vnode_if.src | 8 +++++ sys/sys/vnode.h | 31 +++++++++++++++++++ 5 files changed, 114 insertions(+), 1 deletion(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 137c86b65058..b6d6fa55d221 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -80,6 +80,7 @@ struct vop_vector dead_vnodeops = { .vop_write = dead_write, .vop_fplookup_vexec = VOP_EOPNOTSUPP, .vop_fplookup_symlink = VOP_EOPNOTSUPP, + .vop_delayed_setsize = VOP_NULL, }; VFS_VOP_VECTOR_REGISTER(dead_vnodeops); diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index e04f328c0b37..76f63b187b65 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -147,6 +147,7 @@ struct vop_vector default_vnodeops = { .vop_add_writecount = vop_stdadd_writecount, .vop_copy_file_range = vop_stdcopy_file_range, .vop_vput_pair = vop_stdvput_pair, + .vop_delayed_setsize = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(default_vnodeops); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 68c0ea952e11..164a6b30d9ad 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1963,9 +1963,74 @@ _vn_lock_fallback(struct vnode *vp, int flags, const char *file, int line, return (0); } +static int +vn_lock_delayed_setsize(struct vop_lock1_args *ap) +{ + struct vnode *vp; + int error, lktype; + bool onfault; + + vp = ap->a_vp; + lktype = ap->a_flags & LK_TYPE_MASK; + if (vp->v_op == &dead_vnodeops) + return (0); + VI_LOCK(vp); + if ((vp->v_iflag & VI_DELAYEDSSZ) == 0 || (lktype != LK_SHARED && + lktype != LK_EXCLUSIVE && lktype != LK_UPGRADE && + lktype != LK_TRYUPGRADE)) { + VI_UNLOCK(vp); + return (0); + } + onfault = (ap->a_flags & LK_EATTR_MASK) == LK_NOWAIT && + (ap->a_flags & LK_INIT_MASK) == LK_CANRECURSE && + (lktype == LK_SHARED || lktype == LK_EXCLUSIVE); + if (onfault && vp->v_vnlock->lk_recurse == 0) { + /* + * Force retry in vm_fault(), to make the lock request + * sleepable, which allows us to piggy-back the + * sleepable call to vnode_pager_setsize(). + */ + VI_UNLOCK(vp); + VOP_UNLOCK(vp); + return (EBUSY); + } + if ((ap->a_flags & LK_NOWAIT) != 0 || + (lktype == LK_SHARED && vp->v_vnlock->lk_recurse > 0)) { + VI_UNLOCK(vp); + return (0); + } + if (lktype == LK_SHARED) { + VOP_UNLOCK(vp); + ap->a_flags &= ~LK_TYPE_MASK; + ap->a_flags |= LK_EXCLUSIVE | LK_INTERLOCK; + error = VOP_LOCK1_APV(&default_vnodeops, ap); + if (error != 0 || vp->v_op == &dead_vnodeops) + return (error); + if (vp->v_data == NULL) + goto downgrade; + MPASS(vp->v_data != NULL); + VI_LOCK(vp); + if ((vp->v_iflag & VI_DELAYEDSSZ) == 0) { + VI_UNLOCK(vp); + goto downgrade; + } + } + vp->v_iflag &= ~VI_DELAYEDSSZ; + VI_UNLOCK(vp); + VOP_DELAYED_SETSIZE(vp); +downgrade: + if (lktype == LK_SHARED) { + ap->a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); + ap->a_flags |= LK_DOWNGRADE; + (void)VOP_LOCK1_APV(&default_vnodeops, ap); + } + return (0); +} + int _vn_lock(struct vnode *vp, int flags, const char *file, int line) { + struct vop_lock1_args ap; int error; VNASSERT((flags & LK_TYPE_MASK) != 0, vp, @@ -1974,7 +2039,14 @@ _vn_lock(struct vnode *vp, int flags, const char *file, int line) error = VOP_LOCK1(vp, flags, file, line); if (__predict_false(error != 0 || VN_IS_DOOMED(vp))) return (_vn_lock_fallback(vp, flags, file, line, error)); - return (0); + if (__predict_false((vp->v_iflag & VI_DELAYEDSSZ) == 0)) + return (0); + ap.a_gen.a_desc = &vop_lock1_desc; + ap.a_vp = vp; + ap.a_flags = flags; + ap.a_file = file; + ap.a_line = line; + return (vn_lock_delayed_setsize(&ap)); } /* diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 6b7448d9f1df..78ba1aa7afda 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -847,6 +847,14 @@ vop_inotify_add_watch { IN struct thread *td; }; + +%% delayed_setsize vp E E E + +vop_delayed_setsize { + IN struct vnode *vp; +}; + + # The VOPs below are spares at the end of the table to allow new VOPs to be # added in stable branches without breaking the KBI. New VOPs in HEAD should # be added above these spares. When merging a new VOP to a stable branch, diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 8bcf2d43ff51..257e5e4f665c 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -268,6 +268,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VI_DEFINACT 0x0010 /* deferred inactive */ #define VI_FOPENING 0x0020 /* In open, with opening process having the first right to advlock file */ +#define VI_DELAYEDSSZ 0x0040 /* Delayed setsize */ #define VV_ROOT 0x0001 /* root of its filesystem */ #define VV_ISTTY 0x0002 /* vnode represents a tty */ @@ -1260,6 +1261,36 @@ vn_get_state(struct vnode *vp) atomic_load_consume_ptr(&(_vp)->v_data);\ }) +static inline void +vn_delay_setsize_locked(struct vnode *vp) +{ + ASSERT_VI_LOCKED(vp, "delayed_setsize"); + vp->v_iflag |= VI_DELAYEDSSZ; +} + +static inline void +vn_delay_setsize(struct vnode *vp) +{ + VI_LOCK(vp); + vn_delay_setsize_locked(vp); + VI_UNLOCK(vp); +} + +static inline void +vn_clear_delayed_setsize_locked(struct vnode *vp) +{ + ASSERT_VI_LOCKED(vp, "delayed_setsize"); + vp->v_iflag &= ~VI_DELAYEDSSZ; +} + +static inline void +vn_clear_delayed_setsize(struct vnode *vp) +{ + VI_LOCK(vp); + vn_clear_delayed_setsize_locked(vp); + VI_UNLOCK(vp); +} + #endif /* _KERNEL */ #endif /* !_SYS_VNODE_H_ */ From nobody Tue Mar 17 00:38:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3M3Lkvz6VH46 for ; Tue, 17 Mar 2026 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZY3M14Wjz42XQ for ; Tue, 17 Mar 2026 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NBosgcqN3U3KjZz7KZiL7IW+x8BGRmNz8LiPort66Og=; b=mmdvv3d8NiiDEdAZHo7Wga+5reh2fHfuqwWz+1f5/efC37CSdIdn0czPEdBTJuX3i+YiS3 PHUCK7uOYCMzH8nKt5KfshBDxxCFri5x7SumDTneDi6F1fzODedgUQ3TdI5JHUr/nCc3Xp 8USwc9gzverdL/Rj414CudVvzVmlosPyQQLR0y8B/eeTkCjB8FdQCCpuvDAtmFptvvMpdH 3t4MyNxH+pxC9m6UD+cZstmOTSorW5/svso/TCRXi/rXhNMvVr35/De5tKbxE/HKY/7xp+ lwRhFuFDa5Bgks0BqI+TwBIXfVeMlAlNOkpC+cq+VS+X5BIL41jvWyerw0gmfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773707903; a=rsa-sha256; cv=none; b=OF3HIzNUg5ADjdpP69mlotzRzJ3HNYlDdaUos4k2BUUSKxDrJs6iaaTsVX9B45KfbXinTF I34BgnvS6pJNhqeyzB+Jsr3AYm/BXuU98UMf4y/7pAtN4fdn7VQe/KFHRNZ1jgnoNdEi7w HD3cvLrPVomYYlapcjIIR651k3cJOCExjnNHq+vuk7Q/eLNeEX8EoDlZQhPT2wIA4f2Jya eZTetzGKXXe2BgjP53CUdtW7kUVE7lzO+jFQIIkwEs/2PY3jIq1zsmqC4ZoDYdVH5fbTlH 1Ekdf0Sz+vDjMireLJgrmucbftWfLwMAxSTr7qo67HtPEEGnM7CyXcxWQD9doQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NBosgcqN3U3KjZz7KZiL7IW+x8BGRmNz8LiPort66Og=; b=s0Gf6GjRnvzb1CZ+rrmTb4yi8y+/WJq082qDQS1i6ebrwjnRshEAFOnKK/Sp/Jph6pp/4e P8naJ1AfII+n8uUbkUoeXvIgNHGlQOwW1V34su9HiFcaY8Udbmj7XfgDwuC++Ri6itQQRz DAvGioL0ZyyyMcvGEHTCeLFuXF7OqG5/XnzK5PFXh6hUlQHpXmQRcRRxXqExAfkWXgqyY5 549d7QLm0fsQnKrZ4mwPrIRi2jlyJUH09kaWuAp+xw2iFyaVdXKQFglkO/8rsS8GbOvfE/ Jj8UPFVULleYd95Wqm0nFvWhNvUSOaHTJveFvQ33PRixR1yGW1wW8rkv3MfusA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3M0LMpz1020 for ; Tue, 17 Mar 2026 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 313af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 00:38:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 47f299838540 - stable/15 - nfsclient: convert to use vn_delayed_setsize() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 47f299838540dbd72061e578d9e6c89092fcdb2d Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 00:38:23 +0000 Message-Id: <69b8a27f.313af.356b4993@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=47f299838540dbd72061e578d9e6c89092fcdb2d commit 47f299838540dbd72061e578d9e6c89092fcdb2d Author: Konstantin Belousov AuthorDate: 2026-02-28 16:26:12 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-15 06:58:57 +0000 nfsclient: convert to use vn_delayed_setsize() (cherry picked from commit 5c71df9850355e20cf8f89fb656b18ef79cdf178) --- sys/fs/nfsclient/nfs_clbio.c | 4 +-- sys/fs/nfsclient/nfs_clport.c | 2 +- sys/fs/nfsclient/nfs_clvnops.c | 68 +++++------------------------------------- sys/fs/nfsclient/nfsnode.h | 1 - 4 files changed, 10 insertions(+), 65 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index e181bf593e23..b534a2eb5555 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -1041,7 +1041,7 @@ again: NFSLOCKNODE(np); np->n_size = uio->uio_offset + n; np->n_flag |= NMODIFIED; - np->n_flag &= ~NVNSETSZSKIP; + vn_clear_delayed_setsize(vp); vnode_pager_setsize(vp, np->n_size); NFSUNLOCKNODE(np); @@ -1071,7 +1071,7 @@ again: if (uio->uio_offset + n > np->n_size) { np->n_size = uio->uio_offset + n; np->n_flag |= NMODIFIED; - np->n_flag &= ~NVNSETSZSKIP; + vn_clear_delayed_setsize(vp); vnode_pager_setsize(vp, np->n_size); } NFSUNLOCKNODE(np); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index c5f7ce0a12c7..1156e1738703 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -646,7 +646,7 @@ ncl_pager_setsize(struct vnode *vp, u_quad_t *nsizep) (curthread->td_pflags2 & TDP2_SBPAGES) == 0) setnsize = true; else - np->n_flag |= NVNSETSZSKIP; + vn_delay_setsize(vp); } if (nsizep == NULL) { NFSUNLOCKNODE(np); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 5eea16d0f129..6b0531dda504 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -155,7 +155,7 @@ static vop_getextattr_t nfs_getextattr; static vop_setextattr_t nfs_setextattr; static vop_listextattr_t nfs_listextattr; static vop_deleteextattr_t nfs_deleteextattr; -static vop_lock1_t nfs_lock; +static vop_delayed_setsize_t nfs_delayed_setsize; /* * Global vfs data structures for nfs @@ -168,13 +168,13 @@ static struct vop_vector newnfs_vnodeops_nosig = { .vop_advlockasync = nfs_advlockasync, .vop_close = nfs_close, .vop_create = nfs_create, + .vop_delayed_setsize = nfs_delayed_setsize, .vop_fsync = nfs_fsync, .vop_getattr = nfs_getattr, .vop_getpages = ncl_getpages, .vop_putpages = ncl_putpages, .vop_inactive = ncl_inactive, .vop_link = nfs_link, - .vop_lock1 = nfs_lock, .vop_lookup = nfs_lookup, .vop_mkdir = nfs_mkdir, .vop_mknod = nfs_mknod, @@ -331,73 +331,19 @@ SYSCTL_U64(_vfs_nfs, OID_AUTO, maxalloclen, CTLFLAG_RW, */ static int -nfs_lock(struct vop_lock1_args *ap) +nfs_delayed_setsize(struct vop_delayed_setsize_args *ap) { struct vnode *vp; struct nfsnode *np; u_quad_t nsize; - int error, lktype; - bool onfault; vp = ap->a_vp; - lktype = ap->a_flags & LK_TYPE_MASK; - error = VOP_LOCK1_APV(&default_vnodeops, ap); - if (error != 0 || vp->v_op != &newnfs_vnodeops) - return (error); np = VTONFS(vp); - if (np == NULL) - return (0); - NFSLOCKNODE(np); - if ((np->n_flag & NVNSETSZSKIP) == 0 || (lktype != LK_SHARED && - lktype != LK_EXCLUSIVE && lktype != LK_UPGRADE && - lktype != LK_TRYUPGRADE)) { - NFSUNLOCKNODE(np); - return (0); - } - onfault = (ap->a_flags & LK_EATTR_MASK) == LK_NOWAIT && - (ap->a_flags & LK_INIT_MASK) == LK_CANRECURSE && - (lktype == LK_SHARED || lktype == LK_EXCLUSIVE); - if (onfault && vp->v_vnlock->lk_recurse == 0) { - /* - * Force retry in vm_fault(), to make the lock request - * sleepable, which allows us to piggy-back the - * sleepable call to vnode_pager_setsize(). - */ - NFSUNLOCKNODE(np); - VOP_UNLOCK(vp); - return (EBUSY); - } - if ((ap->a_flags & LK_NOWAIT) != 0 || - (lktype == LK_SHARED && vp->v_vnlock->lk_recurse > 0)) { - NFSUNLOCKNODE(np); - return (0); - } - if (lktype == LK_SHARED) { - NFSUNLOCKNODE(np); - VOP_UNLOCK(vp); - ap->a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); - ap->a_flags |= LK_EXCLUSIVE; - error = VOP_LOCK1_APV(&default_vnodeops, ap); - if (error != 0 || vp->v_op != &newnfs_vnodeops) - return (error); - if (vp->v_data == NULL) - goto downgrade; - MPASS(vp->v_data == np); + if (np != NULL) { NFSLOCKNODE(np); - if ((np->n_flag & NVNSETSZSKIP) == 0) { - NFSUNLOCKNODE(np); - goto downgrade; - } - } - np->n_flag &= ~NVNSETSZSKIP; - nsize = np->n_size; - NFSUNLOCKNODE(np); - vnode_pager_setsize(vp, nsize); -downgrade: - if (lktype == LK_SHARED) { - ap->a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); - ap->a_flags |= LK_DOWNGRADE; - (void)VOP_LOCK1_APV(&default_vnodeops, ap); + nsize = np->n_size; + NFSUNLOCKNODE(np); + vnode_pager_setsize(vp, nsize); } return (0); } diff --git a/sys/fs/nfsclient/nfsnode.h b/sys/fs/nfsclient/nfsnode.h index 9b2627015612..07c7ccb0ff10 100644 --- a/sys/fs/nfsclient/nfsnode.h +++ b/sys/fs/nfsclient/nfsnode.h @@ -160,7 +160,6 @@ struct nfsnode { #define NWRITEOPENED 0x00040000 /* Has been opened for writing */ #define NHASBEENLOCKED 0x00080000 /* Has been file locked. */ #define NDSCOMMIT 0x00100000 /* Commit is done via the DS. */ -#define NVNSETSZSKIP 0x00200000 /* Skipped vnode_pager_setsize() */ #define NMIGHTBELOCKED 0x00400000 /* Might be file locked. */ #define NNAMEDNOTSUPP 0x00800000 /* Openattr is not supported. */ From nobody Tue Mar 17 00:38:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3N2z3Dz6VHCr for ; Tue, 17 Mar 2026 00:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZY3N1P9bz42SB for ; Tue, 17 Mar 2026 00:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AU6yEj6HeFcsTfimjpn2VCA3FYpCTrCsX2PDDkQb9Wg=; b=j3dy5uRXITrizw+KiVdu5bEcG8AKijOpc+TUArjywG0ub1E7ZYweAZsGIAvaBOI3oFc/lQ 4u8WMObpLbfD4K8Xbm+vbSFogmEesr51kFRh/IPXOZ938r80/cn9uhUP4KBHJZQAieY5cc FgST8PqT9g5fHNhWk2NtGNVPRxG0hyyz9dbPTPjd1Y3hRy9aKzmBfXFRz+y0osrmIkazx+ MvFpqQGUdH6ydyoQ7wH2OZpBiEyx5X8gUclvsHOmp2OrTInpoVz1TCrf7Xe/QQtJJFEcZw JY5n6IMa36Pqq/HYs8QtDESzjim3nnZuSx7DLo6HtNVAhv9RXlPSLQdVPWGiHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773707904; a=rsa-sha256; cv=none; b=th7bNXv0KWV5w/91Ym7BABv5en/H/SgueqvuQfg9CCyASXRJeLHHxP/AWDMFk0huw1HFqc StkOKTrYvsw/7Ef+nuVMxx6ni8lP0H1ba5yxpy0/dj5nLD5aIebJkQB5ghGRkoonMdIYh+ v4AEpcvsjrMSrJxsF/4B+eRlatfvkNIJIkCDo0NSgQ/jQ23mb0ROudgUEnevsbYQJl9iRQ p7/Obfkcm9WfyC2LDpFf2b3m8S4S5VArEhZ7vM10n8azOgprzKv8E3EsbQJYKUl2Tt1cn9 jcLnVVXmmkEmo19JT0rfKJ/944DajLKlT+/CrAU5muh5JfSWK2k0kevrMwGsCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AU6yEj6HeFcsTfimjpn2VCA3FYpCTrCsX2PDDkQb9Wg=; b=pIfLle/xRwrUXpYfUg81q4485IPzyLcZUXytmrqhmR6KbUl688QQHUIrbyA7pcsrZt2KEJ t8XDQ6CPYCChKviQSh7ocvmHIBjS5NYcbSmSq9MdRJx2DS7BGlFn9T6CgNCFO6Glp+nUlE a7vIg5YLhq4KnYOKLQijQGcpcSJo4SCdIElivPI5aIaOJjinVyfbbaHBDlozvHHn0ITeSB gJQrCSqG1Uc+ZXy3L4SgyPU4G1weJvraYZWxdqHm2xqwMqJ/2MCFJPhv0vOrt+ae0owwFL Aw4QHWLf9agKZcchFzhUrZ9hhYSzDAz3YDI/wlQp2NDIrmK7WRHmYe2wqdfJig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3N0qY8zxqD for ; Tue, 17 Mar 2026 00:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 313b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 00:38:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1ff01f6ca2d3 - stable/15 - vn_delayed_setsize(): post-commit review' changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 1ff01f6ca2d302d36946277df14cdea00052dbc6 Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 00:38:24 +0000 Message-Id: <69b8a280.313b3.1994291c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff01f6ca2d302d36946277df14cdea00052dbc6 commit 1ff01f6ca2d302d36946277df14cdea00052dbc6 Author: Konstantin Belousov AuthorDate: 2026-03-06 00:18:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-15 06:58:57 +0000 vn_delayed_setsize(): post-commit review' changes (cherry picked from commit 92d7808d88f0de979d76446c76c7324731c41302) --- sys/fs/deadfs/dead_vnops.c | 6 ++--- sys/fs/nfsclient/nfs_clport.c | 2 +- sys/kern/vfs_vnops.c | 52 +++++++++++++++++++++---------------------- sys/sys/vnode.h | 12 +++++----- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index b6d6fa55d221..c793ef2ebf4d 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -55,6 +55,9 @@ struct vop_vector dead_vnodeops = { .vop_bmap = VOP_EBADF, .vop_close = dead_close, .vop_create = VOP_PANIC, + .vop_delayed_setsize = VOP_NULL, + .vop_fplookup_symlink = VOP_EOPNOTSUPP, + .vop_fplookup_vexec = VOP_EOPNOTSUPP, .vop_getattr = VOP_EBADF, .vop_getwritemount = dead_getwritemount, .vop_inactive = VOP_NULL, @@ -78,9 +81,6 @@ struct vop_vector dead_vnodeops = { .vop_vptocnp = VOP_EBADF, .vop_unset_text = dead_unset_text, .vop_write = dead_write, - .vop_fplookup_vexec = VOP_EOPNOTSUPP, - .vop_fplookup_symlink = VOP_EOPNOTSUPP, - .vop_delayed_setsize = VOP_NULL, }; VFS_VOP_VECTOR_REGISTER(dead_vnodeops); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 1156e1738703..cf163adc02de 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -646,7 +646,7 @@ ncl_pager_setsize(struct vnode *vp, u_quad_t *nsizep) (curthread->td_pflags2 & TDP2_SBPAGES) == 0) setnsize = true; else - vn_delay_setsize(vp); + vn_delayed_setsize(vp); } if (nsizep == NULL) { NFSUNLOCKNODE(np); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 164a6b30d9ad..c1253b4439a5 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1964,25 +1964,25 @@ _vn_lock_fallback(struct vnode *vp, int flags, const char *file, int line, } static int -vn_lock_delayed_setsize(struct vop_lock1_args *ap) +vn_lock_delayed_setsize(struct vnode *vp, int flags, const char *file, int line) { - struct vnode *vp; + struct vop_lock1_args ap; int error, lktype; bool onfault; - vp = ap->a_vp; - lktype = ap->a_flags & LK_TYPE_MASK; + ASSERT_VOP_LOCKED(vp, "vn_lock_delayed_setsize"); + lktype = flags & LK_TYPE_MASK; if (vp->v_op == &dead_vnodeops) return (0); VI_LOCK(vp); - if ((vp->v_iflag & VI_DELAYEDSSZ) == 0 || (lktype != LK_SHARED && + if ((vp->v_iflag & VI_DELAYED_SETSIZE) == 0 || (lktype != LK_SHARED && lktype != LK_EXCLUSIVE && lktype != LK_UPGRADE && lktype != LK_TRYUPGRADE)) { VI_UNLOCK(vp); return (0); } - onfault = (ap->a_flags & LK_EATTR_MASK) == LK_NOWAIT && - (ap->a_flags & LK_INIT_MASK) == LK_CANRECURSE && + onfault = (flags & LK_EATTR_MASK) == LK_NOWAIT && + (flags & LK_INIT_MASK) == LK_CANRECURSE && (lktype == LK_SHARED || lktype == LK_EXCLUSIVE); if (onfault && vp->v_vnlock->lk_recurse == 0) { /* @@ -1994,35 +1994,38 @@ vn_lock_delayed_setsize(struct vop_lock1_args *ap) VOP_UNLOCK(vp); return (EBUSY); } - if ((ap->a_flags & LK_NOWAIT) != 0 || + if ((flags & LK_NOWAIT) != 0 || (lktype == LK_SHARED && vp->v_vnlock->lk_recurse > 0)) { VI_UNLOCK(vp); return (0); } if (lktype == LK_SHARED) { VOP_UNLOCK(vp); - ap->a_flags &= ~LK_TYPE_MASK; - ap->a_flags |= LK_EXCLUSIVE | LK_INTERLOCK; - error = VOP_LOCK1_APV(&default_vnodeops, ap); + ap.a_gen.a_desc = &vop_lock1_desc; + ap.a_vp = vp; + ap.a_flags = (flags & ~LK_TYPE_MASK) | LK_EXCLUSIVE | + LK_INTERLOCK; + ap.a_file = file; + ap.a_line = line; + error = VOP_LOCK1_APV(&default_vnodeops, &ap); if (error != 0 || vp->v_op == &dead_vnodeops) return (error); if (vp->v_data == NULL) goto downgrade; - MPASS(vp->v_data != NULL); VI_LOCK(vp); - if ((vp->v_iflag & VI_DELAYEDSSZ) == 0) { + if ((vp->v_iflag & VI_DELAYED_SETSIZE) == 0) { VI_UNLOCK(vp); goto downgrade; } } - vp->v_iflag &= ~VI_DELAYEDSSZ; + vn_clear_delayed_setsize_locked(vp); VI_UNLOCK(vp); VOP_DELAYED_SETSIZE(vp); downgrade: if (lktype == LK_SHARED) { - ap->a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); - ap->a_flags |= LK_DOWNGRADE; - (void)VOP_LOCK1_APV(&default_vnodeops, ap); + ap.a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); + ap.a_flags |= LK_DOWNGRADE; + (void)VOP_LOCK1_APV(&default_vnodeops, &ap); } return (0); } @@ -2030,7 +2033,6 @@ downgrade: int _vn_lock(struct vnode *vp, int flags, const char *file, int line) { - struct vop_lock1_args ap; int error; VNASSERT((flags & LK_TYPE_MASK) != 0, vp, @@ -2038,15 +2040,11 @@ _vn_lock(struct vnode *vp, int flags, const char *file, int line) VNPASS(vp->v_holdcnt > 0, vp); error = VOP_LOCK1(vp, flags, file, line); if (__predict_false(error != 0 || VN_IS_DOOMED(vp))) - return (_vn_lock_fallback(vp, flags, file, line, error)); - if (__predict_false((vp->v_iflag & VI_DELAYEDSSZ) == 0)) - return (0); - ap.a_gen.a_desc = &vop_lock1_desc; - ap.a_vp = vp; - ap.a_flags = flags; - ap.a_file = file; - ap.a_line = line; - return (vn_lock_delayed_setsize(&ap)); + error = _vn_lock_fallback(vp, flags, file, line, error); + if (error != 0 || __predict_true((atomic_load_short(&vp->v_iflag) & + VI_DELAYED_SETSIZE) == 0)) + return (error); + return (vn_lock_delayed_setsize(vp, flags, file, line)); } /* diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 257e5e4f665c..e48c4db95341 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -268,7 +268,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VI_DEFINACT 0x0010 /* deferred inactive */ #define VI_FOPENING 0x0020 /* In open, with opening process having the first right to advlock file */ -#define VI_DELAYEDSSZ 0x0040 /* Delayed setsize */ +#define VI_DELAYED_SETSIZE 0x0040 /* Delayed setsize */ #define VV_ROOT 0x0001 /* root of its filesystem */ #define VV_ISTTY 0x0002 /* vnode represents a tty */ @@ -1262,17 +1262,17 @@ vn_get_state(struct vnode *vp) }) static inline void -vn_delay_setsize_locked(struct vnode *vp) +vn_delayed_setsize_locked(struct vnode *vp) { ASSERT_VI_LOCKED(vp, "delayed_setsize"); - vp->v_iflag |= VI_DELAYEDSSZ; + vp->v_iflag |= VI_DELAYED_SETSIZE; } static inline void -vn_delay_setsize(struct vnode *vp) +vn_delayed_setsize(struct vnode *vp) { VI_LOCK(vp); - vn_delay_setsize_locked(vp); + vn_delayed_setsize_locked(vp); VI_UNLOCK(vp); } @@ -1280,7 +1280,7 @@ static inline void vn_clear_delayed_setsize_locked(struct vnode *vp) { ASSERT_VI_LOCKED(vp, "delayed_setsize"); - vp->v_iflag &= ~VI_DELAYEDSSZ; + vp->v_iflag &= ~VI_DELAYED_SETSIZE; } static inline void From nobody Tue Mar 17 00:38:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3P49fhz6VH48 for ; Tue, 17 Mar 2026 00:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZY3P24Q4z42hN for ; Tue, 17 Mar 2026 00:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bpRsKN/k80aT9x+yAhZOtsZazPnbL9cobv4R2URXog=; b=nOPrIfzqFIvVH80ZM053X5A2l5WCHZhApIJx2WAAvpYp73kDEd70mt9RXugoIPC3XtMS9m ssBnre4MDBRFymsjviMTJH5BsPT0WDXovkEVxeXxQJY7RDw0VadRWSfIwRuyXRspcm6Ios Qfv6jYnUpVjQrmzqPfLY5cxlhEMDFdbmmTRba3oCqZGNKRF72CsdeJ1r5iqq1vaZ8Gaj5b Up/6ARP7ea4fh4WR57WVBuPZnhhAwgB2B+yTg/Xj0zphuZHbjz3U1OloV3SjvyK2HcBZa1 +3nk6Y+pxnKAhsx7Go4z0+LxstRnnW8QvznnF5CSDZMIAepm+6uMtP2iym8J8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773707905; a=rsa-sha256; cv=none; b=ycjqk4Y9gLFqVIwUDrGRFSSbSu3by6frLEIT1u68zW/e/+NTduwAZ7s11W7R8Xo8m6RZdY UHTYKqiYWz481/7HB8yDOslwd2b4WnIW0lY0PUGJL2XTX1LtpuNFNbnPHgJJAS4l3Jx/q5 UI1KiRSgOrAilR/NT9W5fxKzLM5j+Cc+zvzMzTDE8fd6sJeLTJQGqqrexzWZDY6KPujUfK tY2BgyGCqYd7KB0bb+AlXJig8S38HVYxyEMwIQQmwcBdL0m5ewMioh+rgpuNAlSvFgm2g8 7ki9IgxztKbZM91LkoZkPlWCWx6N/U4AfdJgiwYGmjnIqTBlPBV9HOD20HGAug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bpRsKN/k80aT9x+yAhZOtsZazPnbL9cobv4R2URXog=; b=LjnY/SMLVYaz9v7i71cKpKMve7nTh7bxzhICyb3tHUXPI0n/Qitan3MMbf0CMXtXwk7eOv 5WXMxyMmcgbdgjuK2QL+icgEEr8HlVUq5Y90VLj+Ud43+mbJN+gnsdSAJv6Djy3/hdSA2y c1027bUcAxIwbHu5x3Gn2iRgYbaCemxI8GuYPLGMm1CuiDMeGZq8qsehQYxE8RGiB7i7wj 6tnPaVs0Md6BrvZYfGGtY+Oz2z2leAG6NwD6BI21eMZnUdDAjQs+//cEFhh9aXCwJv92kj nF3iqbWxWdf21NJ4KIz83vYM1Wo0VHCJ8xmnKBXiK8d9NiUdyIyK2zDoIP/L/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3P1YyBzylW for ; Tue, 17 Mar 2026 00:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ce0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 00:38:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: db4caf69d734 - stable/15 - p9fs: locking improvements for p9fs_stat_vnode_dotl() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: db4caf69d73498b137070e90415c3e8b399f3544 Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 00:38:25 +0000 Message-Id: <69b8a281.26ce0.318295fd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=db4caf69d73498b137070e90415c3e8b399f3544 commit db4caf69d73498b137070e90415c3e8b399f3544 Author: Konstantin Belousov AuthorDate: 2026-03-05 12:35:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-15 06:58:57 +0000 p9fs: locking improvements for p9fs_stat_vnode_dotl() PR: 293492 (cherry picked from commit 2b256f00aaee4713b8e6f0e3c0f3493065f710c4) --- sys/fs/p9fs/p9fs_vnops.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index ad1eb50276e3..81cc0e3439e6 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -896,6 +896,7 @@ p9fs_getattr_dotl(struct vop_getattr_args *ap) /* Basic info */ VATTR_NULL(vap); + VI_LOCK(vp); vap->va_atime.tv_sec = inode->i_atime; vap->va_mtime.tv_sec = inode->i_mtime; vap->va_ctime.tv_sec = inode->i_ctime; @@ -916,6 +917,7 @@ p9fs_getattr_dotl(struct vop_getattr_args *ap) vap->va_filerev = inode->data_version; vap->va_vaflags = 0; vap->va_bytes = inode->blocks * P9PROTO_TGETATTR_BLK; + VI_UNLOCK(vp); return (0); } @@ -951,16 +953,36 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) { struct p9fs_node *np; struct p9fs_inode *inode; + bool excl_locked; np = P9FS_VTON(vp); inode = &np->inode; + /* + * This function might be called with the vnode only shared + * locked. Then, interlock the vnode to ensure the exclusive + * access to the inode fields: the thread either owns + * exclusive vnode lock, or shared vnode lock plus interlock. + * + * If the vnode is locked exclusive, do not take the + * interlock. We directly call vnode_pager_setsize(), which + * needs the vm_object lock, and that lock is before vnode + * interlock in the lock order. + */ ASSERT_VOP_LOCKED(vp, __func__); + excl_locked = VOP_ISLOCKED(vp) == LK_EXCLUSIVE; + if (!excl_locked) + VI_LOCK(vp); + /* Update the pager size if file size changes on host */ if (inode->i_size != stat->st_size) { inode->i_size = stat->st_size; - if (vp->v_type == VREG) - vnode_pager_setsize(vp, inode->i_size); + if (vp->v_type == VREG) { + if (excl_locked) + vnode_pager_setsize(vp, inode->i_size); + else + vn_delayed_setsize_locked(vp); + } } inode->i_mtime = stat->st_mtime_sec; @@ -979,11 +1001,12 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) inode->gen = stat->st_gen; inode->data_version = stat->st_data_version; - ASSERT_VOP_LOCKED(vp, __func__); /* Setting a flag if file changes based on qid version */ if (np->vqid.qid_version != stat->qid.version) np->flags |= P9FS_NODE_MODIFIED; memcpy(&np->vqid, &stat->qid, sizeof(stat->qid)); + if (!excl_locked) + VI_UNLOCK(vp); return (0); } @@ -2213,12 +2236,25 @@ p9fs_putpages(struct vop_putpages_args *ap) return (rtvals[0]); } +static int +p9fs_delayed_setsize(struct vop_delayed_setsize_args *ap) +{ + struct vnode *vp; + struct p9fs_node *np; + + vp = ap->a_vp; + np = P9FS_VTON(vp); + vnode_pager_setsize(vp, np->inode.i_size); + return (0); +} + struct vop_vector p9fs_vnops = { .vop_default = &default_vnodeops, .vop_lookup = p9fs_lookup, .vop_open = p9fs_open, .vop_close = p9fs_close, .vop_access = p9fs_access, + .vop_delayed_setsize = p9fs_delayed_setsize, .vop_getattr = p9fs_getattr_dotl, .vop_setattr = p9fs_setattr_dotl, .vop_reclaim = p9fs_reclaim, From nobody Tue Mar 17 00:38:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3Q4JTMz6VH0g for ; Tue, 17 Mar 2026 00:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZY3Q2vX1z42bW for ; Tue, 17 Mar 2026 00:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707906; h=from:from:reply-to:subject:subject: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+MKgru4zb+ct6SVbnSffRIYwppZKQKHK6vMQ7GlqTA=; b=u0VpfKFDt0JJg+Z1RqVJ0n1vp7XHyRayjv14fbxVMhZJrDUORZksGAKbuRE4lvginZ8w+7 kKAiv4IBn3MAouVbGS+kYyej0kmYiImhiFNCgNvxyGrEdxbMLBPZ2Jvku2wec4sMTi48qF eobXy+bPnwDTvtIgNP+y0FhzzxdgD2pJxe4xM/K5gpKK2SHqNWI8MC+gNuVJ2BTftKfP3e iaSBX784yUmAkZmLRtLSfnIv5OHuXThiOGdKBWneso3IcYkVoAHWbttaILVAkrZXtkBQFJ 9UwRUnRQi0NYn5qV9fVy2qaHwMUIw7Zlo1g/L1xOHHv7uPsXg19tOvI0oCyFJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773707906; a=rsa-sha256; cv=none; b=yya5w/KzM7Ps071ndFsCyFgmFcsErJdfOAgyHPqlmQaq9UXC68gXQS7l0MqMbDRGOcG2r/ 7GUbRPN4OCCtP8WnQUtHkiGN+RA9kdPUzlA5f1AM9TprUMOaqtN1hOj0bWk2ej+KLTbVGd ZHML4STvnpTUbA05NL7zBq+S+8UGOtO6d6aIvH3jESWLBRNvYHrshb06rZYLd0a1sDs3Go R31pokGDj9MkbeCor8DDjiRxGkCproHMWYPXr42CuGuTwR6GyjK3MFTvsHR46nfdcLrsZw qeJJ/Olm6Rp6OYNMnwWxVnqQaPsXU4Oyl3VhGhWJ36ywCBBIoPROJXfqjIm6Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773707906; h=from:from:reply-to:subject:subject: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+MKgru4zb+ct6SVbnSffRIYwppZKQKHK6vMQ7GlqTA=; b=WDwbIXN8NxN/TiJzE1Ay1lKcHGPGye9cI24DVzT+F2vs0SCaURbqGiCO1NkotgXXowFt6h eSakq54i+09LmWzMn2XdswzJ2oleztXmo2dp9REPQGUclYRVP63GoUjNxKYOsPmUJLWPKZ o0X6/BZtrOxcRW5HFHEUEscl/s6H7spBQBK0D2rBZ+D97RQ25QyxN9NAkIZjsjALimzmss kZtFwSv2HDY0E1K0D/GzEign/QVvRYuRGlprnQDZBkRp0rVm+SeDb2Jd0OECCv8uCAsmjr hWNVJPP1hMQWjvwjhtqU2cdJLy6dTNWWWQ38DhvHF3bt8u2YeHFNnnCsxBtgUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZY3Q2MpTz1021 for ; Tue, 17 Mar 2026 00:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30c85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 00:38:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fc1c67912bf1 - stable/15 - p9fs: use atomics for updating node->flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: fc1c67912bf1110ce7119240b1ecdfa136d54377 Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 00:38:26 +0000 Message-Id: <69b8a282.30c85.48e14356@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fc1c67912bf1110ce7119240b1ecdfa136d54377 commit fc1c67912bf1110ce7119240b1ecdfa136d54377 Author: Konstantin Belousov AuthorDate: 2026-03-08 04:44:33 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-15 06:58:57 +0000 p9fs: use atomics for updating node->flags (cherry picked from commit c2012c7faf74c9e7b4e3de2472e10b58ed096996) --- sys/fs/p9fs/p9fs.h | 9 ++++++--- sys/fs/p9fs/p9fs_vfsops.c | 6 +++--- sys/fs/p9fs/p9fs_vnops.c | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/fs/p9fs/p9fs.h b/sys/fs/p9fs/p9fs.h index a270d8b5ce5f..2470734fef4d 100644 --- a/sys/fs/p9fs/p9fs.h +++ b/sys/fs/p9fs/p9fs.h @@ -103,7 +103,7 @@ struct p9fs_node { struct p9fs_inode inode; /* in memory representation of ondisk information*/ struct p9fs_session *p9fs_ses; /* Session_ptr for this node */ STAILQ_ENTRY(p9fs_node) p9fs_node_next; - uint64_t flags; + u_int flags; }; #define P9FS_VTON(vp) ((struct p9fs_node *)(vp)->v_data) @@ -111,10 +111,13 @@ struct p9fs_node { #define VFSTOP9(mp) ((struct p9fs_mount *)(mp)->mnt_data) #define QEMU_DIRENTRY_SZ 25 #define P9FS_NODE_MODIFIED 0x1 /* indicating file change */ -#define P9FS_ROOT 0x2 /* indicating root p9fs node */ +#define P9FS_NODE_ROOT 0x2 /* indicating root p9fs node */ #define P9FS_NODE_DELETED 0x4 /* indicating file or directory delete */ #define P9FS_NODE_IN_SESSION 0x8 /* p9fs_node is in the session - virt_node_list */ -#define IS_ROOT(node) (node->flags & P9FS_ROOT) +#define IS_ROOT(node) (((node)->flags & P9FS_NODE_ROOT) != 0) + +#define P9FS_NODE_SETF(n, f) atomic_set_int(&(n)->flags, (f)) +#define P9FS_NODE_CLRF(n, f) atomic_clear_int(&(n)->flags, (f)) #define P9FS_SET_LINKS(inode) do { \ (inode)->i_links_count = 1; \ diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index e0e91e7e1709..94a67fdef428 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -284,7 +284,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, node = vp->v_data; /* Remove stale vnode from hash list */ vfs_hash_remove(vp); - node->flags |= P9FS_NODE_DELETED; + P9FS_NODE_SETF(node, P9FS_NODE_DELETED); vput(vp); *vpp = NULLVP; @@ -372,7 +372,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, if (*vpp == NULL) { P9FS_LOCK(vses); STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); - np->flags |= P9FS_NODE_IN_SESSION; + P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); P9FS_UNLOCK(vses); vn_set_state(vp, VSTATE_CONSTRUCTED); *vpp = vp; @@ -448,7 +448,7 @@ p9_mount(struct mount *mp) P9FS_VOFID_LOCK_INIT(p9fs_root); STAILQ_INIT(&p9fs_root->vofid_list); p9fs_root->parent = p9fs_root; - p9fs_root->flags |= P9FS_ROOT; + P9FS_NODE_SETF(p9fs_root, P9FS_NODE_ROOT); p9fs_root->p9fs_ses = vses; vfs_getnewfsid(mp); strlcpy(mp->mnt_stat.f_mntfromname, from, diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 81cc0e3439e6..0ac86343649f 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -111,7 +111,7 @@ p9fs_cleanup(struct p9fs_node *np) P9FS_LOCK(vses); if ((np->flags & P9FS_NODE_IN_SESSION) != 0) { - np->flags &= ~P9FS_NODE_IN_SESSION; + P9FS_NODE_CLRF(np, P9FS_NODE_IN_SESSION); STAILQ_REMOVE(&vses->virt_node_list, np, p9fs_node, p9fs_node_next); } else { P9FS_UNLOCK(vses); @@ -675,7 +675,7 @@ p9fs_open(struct vop_open_args *ap) error = vinvalbuf(vp, 0, 0, 0); if (error != 0) return (error); - np->flags &= ~P9FS_NODE_MODIFIED; + P9FS_NODE_CLRF(np, P9FS_NODE_MODIFIED); } vfid = p9fs_get_fid(vses->clnt, np, ap->a_cred, VFID, -1, &error); @@ -1003,7 +1003,7 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) /* Setting a flag if file changes based on qid version */ if (np->vqid.qid_version != stat->qid.version) - np->flags |= P9FS_NODE_MODIFIED; + P9FS_NODE_SETF(np, P9FS_NODE_MODIFIED); memcpy(&np->vqid, &stat->qid, sizeof(stat->qid)); if (!excl_locked) VI_UNLOCK(vp); @@ -1549,7 +1549,7 @@ remove_common(struct p9fs_node *dnp, struct p9fs_node *np, const char *name, cache_purge(vp); vfs_hash_remove(vp); - np->flags |= P9FS_NODE_DELETED; + P9FS_NODE_SETF(np, P9FS_NODE_DELETED); return (error); } From nobody Tue Mar 17 12:03:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fZrFf6HKkz6W8sw for ; Tue, 17 Mar 2026 12:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZrFf4JjTz4PQ5 for ; Tue, 17 Mar 2026 12:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773748998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSElpWEHxRJtgbFGiGw0N3YpQcKngjKjM7UWKoPS/8A=; b=wf/c+5/ESP+9BHxmPudh3PxkPvWy4qXphWenVKYZLROLotO+H/ZNs12pBMqxGsNmYhIqbg s9vUQHEzs1d2evmEhhPqZi130rMQBQZRZuFC/AxeXKuzGKH6IKqT7SfOzNMnm99wV7ScuO esI8e6waRMe2KiLCYMqNB+Cn2VXIanit9yaaIDttHI4coRYc4QAm+sdDCaTIM+wjrG2GZ+ 9FZPLKgtWy5k65GayQKupJSvDyVSK7QcA7xKkZffmFePb9k1E6rkHIepto5uWyu999oc7P gbU/CUlBvsui/Kd/oU7x9ZxcOKeKbAti/J6Cg0GlyGrG8hRQRERwlaACnVnc+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773748998; a=rsa-sha256; cv=none; b=GklNaUS7TOJFhQL+VcqSXxBJW8vAgg7xZzW30X8L1dPwXfy2XtAJJq6W5hTv0ymrPqj4CQ 8p0p2F2EHVGuUjGNvpJZ6+8u2O8C1F7YL8xXaj9IKFi4/nYy+5+FHzvb8iII9uEs2dqY+/ ZyLi3vzE33nvlZJQCwjlu6+Wei7vJOwJGQiSv2a/EYu4Bgw0meITWVY1ZA1BR7QiFotlx8 44uqhYg1KNfcDYIX4r3Ehi5C0Dvynwq0m9CtQUgkRHsIVOz9QrrR5xcWKQTBvTYZjHoEbb scyheHUCj0Hfl+qh40xQq2qs3wW4I6ZDj4gp3kq4AL35hTLcud3ywPvfxG/sHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773748998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSElpWEHxRJtgbFGiGw0N3YpQcKngjKjM7UWKoPS/8A=; b=Lv5wH0jBQMn+XItzYjRNXEoz228/ES3jMtuFKHrjlq9wKZ21eGJwDP6ZxaJ8UcJg+Qgj2O cSrNQM/O+9GiEDnpQYn/7QS6vv/GKIt62BeNXi68oNiOiLInaH4khvl4vWLWZfwiXf3nle pq88u3sWSZZfiYllk28lqwA9Uuf6hDQ/ypnTYFr0LkK6jIt7rQweg4ubGYDyWh0wHOUrsp 6MSf5Wkp5G0zQFjQBUjHfNqHeNHlsLF7EbBq1XmI5ePWMNeynzfG2BoIh2fHkE5msK4sas DhK8RTjhP1TdbpCEtDpNkakuDZxP5yrBf3QM3+H7XEyHxHe5bIMY5praCn5kBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZrFf3222z5yF for ; Tue, 17 Mar 2026 12:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3208f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 12:03:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: edc9c3ee463e - stable/15 - virtual_oss: Combine -d, -l and -L option getopt code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: edc9c3ee463e04475602a665e89b17e6a32f5e96 Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 12:03:18 +0000 Message-Id: <69b94306.3208f.7ee1d0db@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=edc9c3ee463e04475602a665e89b17e6a32f5e96 commit edc9c3ee463e04475602a665e89b17e6a32f5e96 Author: Christos Margiolis AuthorDate: 2026-03-10 10:55:21 +0000 Commit: Christos Margiolis CommitDate: 2026-03-17 12:03:14 +0000 virtual_oss: Combine -d, -l and -L option getopt code Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55671 (cherry picked from commit a2b601343bf9261c4ada51e4d4c30c5b9320bb2b) --- usr.sbin/virtual_oss/virtual_oss/main.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 28095880c201..7e677b6c5dbe 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -2226,24 +2226,6 @@ parse_options(int narg, char **pparg, int is_main) strncpy(profile.wav_name, optarg, sizeof(profile.wav_name)); break; case 'd': - if (strlen(optarg) > VMAX_STRING - 1) - return ("Device name too long"); - strncpy(profile.oss_name, optarg, sizeof(profile.oss_name)); - - if (profile.bits == 0 || voss_dsp_sample_rate == 0 || - profile.channels == 0 || voss_dsp_samples == 0) - return ("Missing -b, -r, -c or -s parameters"); - - val = (voss_dsp_samples * - profile.bits * profile.channels) / 8; - if (val <= 0 || val >= (1024 * 1024)) - return ("-s option value is too big"); - - ptr = dup_profile(&profile, opt_amp, opt_pol, - opt_mute[0], opt_mute[1], 0, 1); - if (ptr != NULL) - return (ptr); - break; case 'L': case 'l': if (strlen(optarg) > VMAX_STRING - 1) @@ -2252,7 +2234,7 @@ parse_options(int narg, char **pparg, int is_main) if (profile.bits == 0 || voss_dsp_sample_rate == 0 || profile.channels == 0 || voss_dsp_samples == 0) - return ("Missing -b, -r, -r or -s parameters"); + return ("Missing -b, -r, -c or -s parameters"); val = (voss_dsp_samples * profile.bits * profile.channels) / 8; @@ -2260,7 +2242,7 @@ parse_options(int narg, char **pparg, int is_main) return ("-s option value is too big"); ptr = dup_profile(&profile, opt_amp, opt_pol, - opt_mute[0], opt_mute[1], c == 'L', 0); + opt_mute[0], opt_mute[1], c == 'L', c == 'd'); if (ptr != NULL) return (ptr); break; From nobody Wed Mar 18 09:41:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbP4119zpz6VXpK for ; Wed, 18 Mar 2026 09:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbP3v5gxsz3FNZ for ; Wed, 18 Mar 2026 09:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773826907; 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=Tx7NcZgZZtzpxAkRBr/3gtcSjWPveTAJkJvH3YhPmsk=; b=PUQd6CAUweXkY4TZHdPuUJwWrmdhmSVWJahMdXxnxplR4b91FT6DA+53T6RWzkgvFtfUWX ZHVY3weniyAahqfaXZkV1KXpFC8UVvNl7IHNfvEU9IXkSTcedrqzK912DuZm5PG5lE8ydI 7B+mzRG+g4Bbhz6Czi+23xKEOiXpHzauDJu5QDExV1083OvrDyjOtxh9Qgv02gRRu6muz5 Or146OGQ67qw8DCZnOX55x5T7BHAF9z3D4YePoWiWOPrm0m5jOPrN3Cu/04JT2TQ1HIg// kRAI3GiFLViIQzb27/c/6FiJ7PR9DrM5UnkKceHF5nFIMofsJAoPgsPfR2BuvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773826907; a=rsa-sha256; cv=none; b=gSKEjQKFMFiABmJiBIHLo68rywhoQDdT7kI4DGNNEb6miBFBKySOHZCxspI+cK+7gE4nDi Wpv3oas1d4CPI0xiEHJ20OOyogP0hBTGG3SvFhSbv376HqeCtxV5hAntCzxKBLBUBFT/lr z4ujguSfX9+wtkaXilISJGXR3VrHrcXI8gDHLbArsG4x1veLYl4S/FzdXhLN70rpoFQSMp MpzRlDqCHNzFJH5nNB7RTbNjpQP196KKs1T7UZMRmBvHzZQmHLiqWkJUo1a/lNhPik/GTu /qOyx4YENA/Y2e2Olic+eATopVnofQWwCaOrEvOatEBe1YtuYMMQm6aZ0K/w1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773826907; 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=Tx7NcZgZZtzpxAkRBr/3gtcSjWPveTAJkJvH3YhPmsk=; b=dTt3S//KB/5lDjLHD5QfFGfE1H+obaeNuc8+41rdOfkq1hlgHDg0jghnNDldC3YG7tnvV1 FvwBNlJGRAPDDCdOoZ6V7oohF1Fru8CMQFl/GBxgs0laEewl00uHWtAp2tnwd9jVtbtHxz 6WPyje+ywH1JIP0Rp3fWAVK2soA6TthikBCZvIo6iFfHQ6XWaiLs1dZY3p+Obp/5XLfC0f 1FvZVdUH9fyybYO7zhWVh/3P/Pmvw8PzkfRG6f3WN/+4T+knqCLnUjck4IUDt/xqz8YmY3 MmeHPVuQjkUmfd+f50lIWfIhGROn02h/rTAxLIQ1wfxI3llyHKda0od8UWRcHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbP3v4y8Dz12yq for ; Wed, 18 Mar 2026 09:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 09:41:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Seth Hoffert From: Kristof Provost Subject: git: 9031b83ac133 - stable/15 - pfctl: consistency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 9031b83ac1334094c90e1242b478c8ca4a72bc47 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 09:41:42 +0000 Message-Id: <69ba7356.1be4a.ee99a03@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9031b83ac1334094c90e1242b478c8ca4a72bc47 commit 9031b83ac1334094c90e1242b478c8ca4a72bc47 Author: Seth Hoffert AuthorDate: 2026-03-03 21:56:45 +0000 Commit: Kristof Provost CommitDate: 2026-03-18 01:41:58 +0000 pfctl: consistency % pfctl -F ethernet Ethernet rules cleared % pfctl -s ethernet pfctl: Unknown show modifier 'ethernet' pfctl accepts 'ethernet' (or any prefix of it) in the -F flag but accepts only 'ether' (or any prefix of it) in the -s flag, which seems inconsistent. This change brings the two to parity while remaining backwards compatible. Reviewed by: kp MFC after: 2 weeks Signed-off-by: Seth Hoffert (cherry picked from commit 36acf1bd32ed5749af4a9f735aeea1a3434fe42f) --- sbin/pfctl/pfctl.8 | 2 +- sbin/pfctl/pfctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 5a74a8fd3444..b65ee5adb1b2 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -450,7 +450,7 @@ When used together with .Nm will loop and show updated queue statistics every five seconds, including measured bandwidth and packets per second. -.It Fl s Cm ether +.It Fl s Cm ethernet Show the currently loaded Ethernet rules. When used together with .Fl v , diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 19a20ce0ec3a..a9839304d0c7 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -252,7 +252,7 @@ static const char * const clearopt_list[] = { }; static const char * const showopt_list[] = { - "ether", "nat", "queue", "rules", "Anchors", "Sources", "states", + "ethernet", "nat", "queue", "rules", "Anchors", "Sources", "states", "info", "Interfaces", "labels", "timeouts", "memory", "Tables", "osfp", "Running", "all", "creatorids", NULL }; From nobody Wed Mar 18 14:21:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbWGj6Pttz6VslL for ; Wed, 18 Mar 2026 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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbWGj5l3Jz3kCZ for ; Wed, 18 Mar 2026 14: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=1773843693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0nFgbtQDrQ7mblB2p2dP2AIfis0qJ0mqTXp6l/QA9Y=; b=tVsQ+mkQdDjOqEFYE1ZDcfZ9xZPplsCBvSP0ynZxolw3k/4vrVXjO1p2f0mysj0my8/Uy5 ktZiSarZHZO1C9EWuqTgN0iJWWP+dMcghH5PnvqRNdiVajM5+gBuyJVIeoTZ2o3hs3LbX7 oquaE1IxHvsZ7AM07pujG4z1c3aZPCPTE1Tc8s5wfqLIUEUUqW6ygoTtfalTB+Xb5iUnFh FYWiaiVkGhnnI5G/Ymv1b62FdZaoPczSa+WIvTmc5rCUi8tfnGnGGXvu5DrA9bL52FdZk3 TJ3Y/v8jRBGDuOQA5/94j4o5uLKtZfxgHZ7KCKRr755ej8i4PL6ysXSJd1fBNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773843693; a=rsa-sha256; cv=none; b=XkF97eh5lSKEp/xAntJbtKzdg4Dr94Hqr29NIl7UJ/iJVu8EJcU2v0AaABxE7GBz49zRfC g3B99xlKPI7ygpXkdrFUcIjJh5jGZbQoXZXpp+i3iTemEmAge6kgbD1cf7s/wmpJNx2QVo JcKSz1gzXdIlbYGVeJUmXNtsgLj1BpycGU2ubvcNwaJl5CK/O/R7anai662a+kGi6LkBm+ ihwrt/ESEvdrRbB8CFtSC5SfI4INEVCZxU561SfA0UU3vjcUphWYX5TPkbiEN7zinHT1Jt FIzRE+OcgNgyegraO9FfX34kcAA2/X8K0oX0j/SAHe1xiMf6wmM2keRMp6b4ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773843693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0nFgbtQDrQ7mblB2p2dP2AIfis0qJ0mqTXp6l/QA9Y=; b=J3N/DF7IrXx+CMZ4IAe3fFi0j9bL5iO2Ert7EwrlcWqm+bPQnucsGC6zrWfpZ/UXzInCci a9VUS0Yk6a2MjaYBJv8M8m4749aSggJ9aF5EXAAdzHYacJcfhMlj3bO1bCdN1YXazMQe+C gXOyPS44BnAwnviayO6dXfg5qybzJYj/2hU3BayOVdtEG5ZbV4B0kr5+a0wUGdeKKOGHMZ 2IwHzXFE11dNLGw3prLkp8YrQWrlk7Oa4MuHDAP20HqCtStzTKFMJoaA7TnNxXwev9lyHB 9UolpFisYwaG/Lg3lurmX1bKPq15K1qUTK3m610L1kEcpdFkDjkZfbw3WggAgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbWGj5LCFz19nD for ; Wed, 18 Mar 2026 14:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 414dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 14:21:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 317c242462bb - stable/15 - tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 317c242462bb3c34452bf61eb7d99b741eb766a6 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 14:21:33 +0000 Message-Id: <69bab4ed.414dd.6175c045@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=317c242462bb3c34452bf61eb7d99b741eb766a6 commit 317c242462bb3c34452bf61eb7d99b741eb766a6 Author: Siva Mahadevan AuthorDate: 2026-03-14 03:54:46 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-18 13:49:53 +0000 tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0 This change is needed to MFV zstd 1.5.7. Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55835 (cherry picked from commit 922d73540d2d9897e5e8160c445cefa13581564e) --- sys/fs/tarfs/tarfs_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index e250c5cbce5a..0eff12c21d3f 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -355,7 +355,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) if (reset) { zio->ipos = zio->idx[zio->curidx].i; zio->opos = zio->idx[zio->curidx].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); TARFS_DPF(ZIDX, "%s: skipping to index %u = i %zu o %zu\n", __func__, zio->curidx, (size_t)zio->ipos, (size_t)zio->opos); } else { @@ -511,7 +511,7 @@ fail_unlocked: zio->curidx = 0; zio->ipos = zio->idx[0].i; zio->opos = zio->idx[0].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); } return (error); } From nobody Wed Mar 18 14:43:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbWmC0SWsz6Vty7 for ; Wed, 18 Mar 2026 14:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbWmB6wT8z3lyB for ; Wed, 18 Mar 2026 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773845019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLMttQgsIKiPD8jlw3URCNkJ8c7jx1zDbrq9/2udWpE=; b=hy086Ju6CVlZ+IXzS7gEzbiPb+2aKeNBZdBvqGBckoZi2wJ9KA6AOtjf9UnnEILhEHECQu /Wm0dtWTvkc37oK19yYsU0oUK+HRnp/QRkLiisA77MEApHBZZLzWuMKwx3GT5N0YlPYVNy q5qYyU9JcJKqLzUZ7myonB8rq/6g8giOmip6wNelDp3zH4Ez09YPqs0GondfGEIRXP4jOp top28EIhnEA2xm3UEl4cwUy+zI8cX7C0G2Gy81tLff/FAZRDrQo0kZ87O5KNdowE7saA/5 X2dteRlR4iy43eWLKPboczqTqQFalAC0T7PA4U2nt7FLp+wTbcEqUGI0YjBuWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773845019; a=rsa-sha256; cv=none; b=cO8sdX6XxWqceczMZQNWxxNElXkixl7M3QOsbcXctQ5sbCzhsGdxVQoxmXklZ3mlwg5Ejd Me7bzpYiBzLcBzO9CxWbUyPj8/svoZBDtMxV5NiOa/cVKsdJVeoNAoLf7fVNHcCgb3oB+r t6Ts2E94S3rOkjscUkD/S3oHelGH/bfX7Uem7CKj3tpFGFppEMZRE2KSXGvjxg6sLoAlox o7Bb40NhKOGledh0jmUJPAUrPn3Opl0/qfOLDcfrgSsNKE+28iVqCfaVYow2xoxOkH4R3Z WX4PeiLhFQNx9NBsn/YctA7rRzuvhn7RMp/rAz+5N++a9vkClY74qGG7nUiWfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773845019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLMttQgsIKiPD8jlw3URCNkJ8c7jx1zDbrq9/2udWpE=; b=sWSICO7QJK8wv+bO4o1DHCd/xQKJPD6kdJvPuFANxOqU9k6pt/npeMiveL3c+zosrtUp91 NG3RyPpnso7O41i16wzlgyppEk6VbF8sE0OTGnq40J5HAmrHyf3AX59C0lXijWzghZBS4Y Fx3aiAHFkftZcH84ubFkO0E68qGNs28hyQXUuS8UYG54UIZ3kWV2s+aK4P8tR7/GldRtHD MckL9rN99EEhANeH+P4Vku9JLaodHzeeLQyEarxg6IpNmOOxt7bqjcpVBsnPv5C1Av8oRy 5quenZ/CXbL3m8pp0YV89iN5N+81WopcIbzYG3D6WZPzxPdoDczahcqdLUSWLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbWmB6T7kz1C17 for ; Wed, 18 Mar 2026 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42921 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 14:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: b0b6364eadf4 - stable/14 - tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0b6364eadf498c985f8312195e37eed5780347c Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 14:43:33 +0000 Message-Id: <69baba15.42921.40bc405e@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=b0b6364eadf498c985f8312195e37eed5780347c commit b0b6364eadf498c985f8312195e37eed5780347c Author: Siva Mahadevan AuthorDate: 2026-03-14 03:54:46 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-18 14:15:47 +0000 tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0 This change is needed to MFV zstd 1.5.7. Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55835 (cherry picked from commit 922d73540d2d9897e5e8160c445cefa13581564e) --- sys/fs/tarfs/tarfs_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index e250c5cbce5a..0eff12c21d3f 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -355,7 +355,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) if (reset) { zio->ipos = zio->idx[zio->curidx].i; zio->opos = zio->idx[zio->curidx].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); TARFS_DPF(ZIDX, "%s: skipping to index %u = i %zu o %zu\n", __func__, zio->curidx, (size_t)zio->ipos, (size_t)zio->opos); } else { @@ -511,7 +511,7 @@ fail_unlocked: zio->curidx = 0; zio->ipos = zio->idx[0].i; zio->opos = zio->idx[0].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); } return (error); } From nobody Wed Mar 18 19:10:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbdh45rX3z6WBwV for ; Wed, 18 Mar 2026 19:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbdh45DgBz3Kkr for ; Wed, 18 Mar 2026 19:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eLs52T2FFCurq+QKx51iTJ6SaNmK9z3r6GF7Fa37w1A=; b=NsITTUBxNfwJCa6Vx5xCa0Pd133YQotpWGR3T0+YiW77UJ0ZTX0t/iR5uybk+Y7p8D1pj6 rwZTGlgg0pDBiASmOZiaVxsdd/u60X/hMnK2n2Ej1gncVh7juOOOlfNQViLW0acC7mo8+U mbCJewEVkFtz55468pVVdO93qFKqZ+ITzCiwJBFyiOmavPpmcAgT50Cv5Dp2Yvg9fNhFYK NVPlqdaAmiykXhcQotX6eb6KvlCdsQYpQfnlzVcGoxOp6xCsOLw68k3mP7rsXeatyb44Nd CSimAIvhMePmtAZjvLRMjr15M+6wO2fNjzRpb3SI6Gba8KqReTtwA/Ut/vJB/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773861028; a=rsa-sha256; cv=none; b=qFDCuwiqzeZWoUi5cwfIllgKaR/0lGGPv5Da9MKbHMhsLWNKkb5V+PSeFXCDah8TtudHO2 DuKiT8IRSr664Y8v4cY9vu1FgF0WRSOZSlwCyjd58ApqtAXkblGSdyHnX5dCmYxme/6uFN uRaqDYp/2PYyTlINW52X2qw+EjzPM94+3e3DHwrWdQTQD1R9TCbZmvVjRqqU9WE8B5UrVv BkkS80ozw0ep4EGvQjdGP+TKJbwBHSfCAGxRA2NOcEOO26P4npawM/bJNZQFgHxN14nzzL ouTdvBZ0Fub78QtSanNc0tnVl9gKIRKGT7OfvvY61U+LrLciEf+RZls9E8wKGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eLs52T2FFCurq+QKx51iTJ6SaNmK9z3r6GF7Fa37w1A=; b=XvlWhiGB+v2RkDITA+BlgPvPDP8nV6ffPFdsuLGkXCBW/u0+pEtsvLjbrRdymuxr3T+DVC kKsa6tp8k+ts6zM1Hmy6RXgB1sFLnu4n6Pq3hnciJ9L9w8dQwcQpicoAVMJtXN0L2Z79/0 oW5MHdCNXEnVFgXzXeL4aM/G1lUip1IflvGq+wWMu+k+w3vCalx4cg/o6jZnavGg1ajzUF y0n9thZI+Vy87DegIp7/mpU3h6zVhpLcwOyyoZ2UQfuu+frftk+lCV454WKVDCu6tLPq0p tNERq4UDUHVFaKdwyUTn4HhtQ1Oannjuz8EadHIJwKy/WDS69jxfiQTMYshFJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbdh44Vlrz680 for ; Wed, 18 Mar 2026 19:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38237 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 19:10:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b1098090b7cf - stable/15 - intrng: Shuffle unhandled interrupts too List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b1098090b7cff96f92f56456324e176b9b4a60a9 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 19:10:28 +0000 Message-Id: <69baf8a4.38237.7803b4e5@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b1098090b7cff96f92f56456324e176b9b4a60a9 commit b1098090b7cff96f92f56456324e176b9b4a60a9 Author: Colin Percival AuthorDate: 2026-02-14 00:35:26 +0000 Commit: Colin Percival CommitDate: 2026-03-18 19:05:16 +0000 intrng: Shuffle unhandled interrupts too When interrupt vectors are first allocated, they get assigned to CPU #0; at SI_SUB_SMP / SI_ORDER_SECOND (aka once we have multiple CPUs), the intr_irq_shuffle SYSINIT clears their CPU sets with the effect of forcing them to be assigned to new CPUs later. In case where interrupt vectors were allocated *but not yet bound* this code did not run, with the effect that those interrupts would remain pinned to CPU #0 forever. This affected the ena(4) driver, which allocates interrupts for I/O when the device is attached but doesn't set them up until the interface is brought up much later in the boot process (and, crucially, long after intr_irq_shuffle runs). Adjust intr_irq_shuffle to clear the CPU set for an interrupt source even if it currently has no handlers, so that it will be properly assigned to a CPU when it is used later. Reviewed by: andrew, mhorne MFC after: 1 month Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55284 (cherry picked from commit b2ba4131b9b08d6231392c0b798d0ff35809f600) --- sys/kern/subr_intr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 3de753a5192f..52170f083624 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -1291,10 +1291,22 @@ intr_irq_shuffle(void *arg __unused) irq_assign_cpu = true; for (i = 0; i < intr_nirq; i++) { isrc = irq_sources[i]; - if (isrc == NULL || isrc->isrc_handlers == 0 || + if (isrc == NULL || isrc->isrc_flags & (INTR_ISRCF_PPI | INTR_ISRCF_IPI)) continue; + /* + * We can reach this point with isrc_handlers == 0 if a + * driver allocates interrupts but does not set them up + * immediately; for example, a network driver might + * postpone calling bus_setup_intr on I/O IRQ(s) until + * the interface is brought up. + */ + if (isrc->isrc_handlers == 0) { + CPU_ZERO(&isrc->isrc_cpu); + continue; + } + if (isrc->isrc_event != NULL && isrc->isrc_flags & INTR_ISRCF_BOUND && isrc->isrc_event->ie_cpu != CPU_FFS(&isrc->isrc_cpu) - 1) From nobody Wed Mar 18 19:10:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbdh574HPz6WByV for ; Wed, 18 Mar 2026 19:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbdh54yPNz3Kks for ; Wed, 18 Mar 2026 19:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMtg0JsL22+7K0FQ97JLB7Ij5tw7TXs52z5rbynGfZE=; b=ltubr5ChypcqKNm2JT3zOdq9lBCpBanGaoXNfyF905vhVOadj+1baiz4a8C2cFgokpyKN3 n0ZWSC26wod6SHhbtHF+rSSUfUzI8yNgHmcuHq8sOkxH84PKdEBib4lgAuaXyfUuYT3w0j nnCzMyXlcpbsIQcYMqUnsJuNe7ppUppv2y/h2lwGnGu+55HRKN9dBLsWeG+EGIvW2iLhTa IEjA3r/SmZ4L1OiBS/73JAzQGByng9kk21tkOurjnnj4Yj8OYYg8v7GMdn4dS3tvnf/Z9S COTNIJzezaMSCcgR+xWgf0PIF/MyGwOGU6cXvRC+pD2aEFB0+QPRahwMU1D6sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773861029; a=rsa-sha256; cv=none; b=tZ/FtnHsCDRq1LajInYMUqQPmlQLVEl1Nusv4cyIS4ptJDqhHLJowlrxCPYXDb23dJ/A5k 8EMP6IMnALcAya9NASJZy7orTzWJ/bB6xjeF9MhWmKqRMZVUFOOKnsFO8rcxsB2BAFX5T6 ElyfAQ4MreqOEyJPgUbCABd9EqKzxwzta+WxDo9RqcJeNWucHfRVkOiHCVB3WzyUQYEfd4 jUthBxjTLKG1xt6tezVwXRcB1JaWIZzQGXcwNlFJYvZkIR+UmvLsksNJeEj4kFovsVYIjf GKp1dTSH+MYCvw7c02VIhwkwMMNqMFJl8wpx76gl9XQxq3tT5XCwvWJFc8ifpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMtg0JsL22+7K0FQ97JLB7Ij5tw7TXs52z5rbynGfZE=; b=pfxC4lRaJDmA8lvhvW/VZylMIG4XiHJ11obISvR+IDkxhJrfnSUG3XHQ10BJfJppune2ha e7IucwqGkUjMpmYhlcjvYcZxqxDrfALCSX4eFJ+xAimTwjPSv7D60fod7ajXsg45d8WYTp /lmIlfvDKHVXfg/0TR34MRklE6d1tePeOepstFkruF3VnwLbluJO80Hc/ArBLa3wyWUWBj guAdmhZKRdE4IAfU+f96smZe8KSKaPdyNO9nAfanukL42/SqO330PxOTnpwDANwXe26MeB LZx2CKhvogtOxeSjG2pGO5bdGvsBzSTQBDlq6UGgkw8MXkKiNBWvxWl/Y93Nwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbdh54Rhpz681 for ; Wed, 18 Mar 2026 19:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ea3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 19:10:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 660a79ef4f11 - stable/15 - EC2: Don't use unicode in boot loader List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 660a79ef4f1112c90690b56c6e5ac7532428ec8c Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 19:10:29 +0000 Message-Id: <69baf8a5.37ea3.6651907f@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=660a79ef4f1112c90690b56c6e5ac7532428ec8c commit 660a79ef4f1112c90690b56c6e5ac7532428ec8c Author: Colin Percival AuthorDate: 2026-03-13 20:45:05 +0000 Commit: Colin Percival CommitDate: 2026-03-18 19:05:33 +0000 EC2: Don't use unicode in boot loader The boot loader menu is disabled by default in EC2, but if it is ever turned on, the default (unicode) output breaks EC2's web interface to the serial console. Set loader_menu_frame="ascii" instead. MFC after: 3 days Sponsored by: Amazon (cherry picked from commit 277830b4d3ae9999c80bf915b5491850e91c6516) (cherry picked from commit 251907ca480eff7f6177f52959b71a6cfce45579) --- release/tools/ec2.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 335db6cca93a..b8a7bac2ce00 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -45,9 +45,12 @@ ec2_common() { metalog_add_data ./boot.config # Booting quickly is more important than giving users a chance to - # access the boot loader via the serial port. + # access the boot loader via the serial port; but if users turn the + # boot loader back on, avoid unicode since it breaks the EC2 web + # console. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf + echo 'loader_menu_frame="ascii"' >> ${DESTDIR}/boot/loader.conf # The EFI RNG on Graviton 2 is particularly slow if we ask for the # default 2048 bytes of entropy; ask for 64 bytes instead. From nobody Wed Mar 18 19:11:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbdhy6bbTz6WBwk for ; Wed, 18 Mar 2026 19:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbdhy644Jz3M44 for ; Wed, 18 Mar 2026 19:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8jRccIjrJ1gePIIbuVT/H2dqb6GbzEB+4LdA6h8JuI=; b=MHS7moYFKE4HuFcuDc8ZvDt1AyrgZ7AKFhyAMHIVjvG/kfBn9zGHoOayIF7TOlL2+d0Dyl GICFwGSeH7DqnqGdroWOsZ4d04dlu2RBD73eMARfQvah2VAI3yt5z5sv4lzMPqkNt/hCAx u7SrqwHQ9QRp7tlROV1vwC1rJrL1ESAr2SQxOKacb8TCf63T2BDMEJfNdSMgbFRcNy0KsI M61uYifJl8DqilkD8CasuaquiWXr9rZq4llbPMP3pKnQj6iP9VS8Y/+ZmqK9AEp+ABLMHn Xr7eWauNGvf2y7IHwhlqiPERkqKTBEemOUXVQuE88BTFL4m5uQWcB9sSDF0f5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773861074; a=rsa-sha256; cv=none; b=RNnixuZzTZBnJvmPyFRZQHY8+O6r7yhHCvrAd4Zl46d26pJkw2d3otVEnbxY9zRmFhNBRX B4tELkJrLYjQKQTWeaQoBJRqyRU+S78gX+Il5HwNkd9tL6lN85kvghmrXWA2aPECzyDtvn 9X/Bab/LEko/GKtL84xbZChoEnhpUazY44hQMePlXv3MzmtcpQnC9dkY3B2LJD2Esin6rO +XUVva0MbvV7+auMhjlf1eWTsrYPxrsn+XmQvUALM6diCFYSJZawTp0wp7wzRWO2b5tpZi 9yKycn6NHIm29XfRjeWcIDMExDXnVUA4849OhakPdwt8sXF9n0UIrDBPQJYRbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8jRccIjrJ1gePIIbuVT/H2dqb6GbzEB+4LdA6h8JuI=; b=eHYc5Iq0+WBR3oztJjV46NfCug/kmuhIYAs2bSPwdB9BfRDLK8pTmT8uOMrkjBsbC+C00b YfFsZH8DK4IYxK0+O8vsVOZRqlFh8g7KkjF3GfVLC62N2t4RFIbj2hUqSUNB7nMoyV7sAc FbIWbIipbrgtwICVPMMQJe9yvZr1UEDejwvruaresHQdtRGDKoMInM+7AwDG7Q91FD4mte LDtDm33PJw3mQcACsUpKmWpRArgU46PCF2gRv0pMXuQAomr1ZM35lwjrhCTKzJZTdsuDoh Q1lDOalZ6AGaTsQUrkD4TEaZVZbprpWCGnubElQIciWwryfIlzu9iMBwUqN2UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbdhy5gDxz5xL for ; Wed, 18 Mar 2026 19:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3891e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 19:11:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c25839cda69f - stable/14 - intrng: Shuffle unhandled interrupts too List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c25839cda69f5c207b7685ec25a32a67914b0708 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 19:11:14 +0000 Message-Id: <69baf8d2.3891e.67a908ad@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c25839cda69f5c207b7685ec25a32a67914b0708 commit c25839cda69f5c207b7685ec25a32a67914b0708 Author: Colin Percival AuthorDate: 2026-02-14 00:35:26 +0000 Commit: Colin Percival CommitDate: 2026-03-18 19:10:42 +0000 intrng: Shuffle unhandled interrupts too When interrupt vectors are first allocated, they get assigned to CPU #0; at SI_SUB_SMP / SI_ORDER_SECOND (aka once we have multiple CPUs), the intr_irq_shuffle SYSINIT clears their CPU sets with the effect of forcing them to be assigned to new CPUs later. In case where interrupt vectors were allocated *but not yet bound* this code did not run, with the effect that those interrupts would remain pinned to CPU #0 forever. This affected the ena(4) driver, which allocates interrupts for I/O when the device is attached but doesn't set them up until the interface is brought up much later in the boot process (and, crucially, long after intr_irq_shuffle runs). Adjust intr_irq_shuffle to clear the CPU set for an interrupt source even if it currently has no handlers, so that it will be properly assigned to a CPU when it is used later. Reviewed by: andrew, mhorne MFC after: 1 month Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55284 (cherry picked from commit b2ba4131b9b08d6231392c0b798d0ff35809f600) --- sys/kern/subr_intr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 6198603adfe8..d63a0e3629c5 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -1271,10 +1271,22 @@ intr_irq_shuffle(void *arg __unused) irq_assign_cpu = true; for (i = 0; i < intr_nirq; i++) { isrc = irq_sources[i]; - if (isrc == NULL || isrc->isrc_handlers == 0 || + if (isrc == NULL || isrc->isrc_flags & (INTR_ISRCF_PPI | INTR_ISRCF_IPI)) continue; + /* + * We can reach this point with isrc_handlers == 0 if a + * driver allocates interrupts but does not set them up + * immediately; for example, a network driver might + * postpone calling bus_setup_intr on I/O IRQ(s) until + * the interface is brought up. + */ + if (isrc->isrc_handlers == 0) { + CPU_ZERO(&isrc->isrc_cpu); + continue; + } + if (isrc->isrc_event != NULL && isrc->isrc_flags & INTR_ISRCF_BOUND && isrc->isrc_event->ie_cpu != CPU_FFS(&isrc->isrc_cpu) - 1) From nobody Wed Mar 18 19:11:15 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbdj00pm0z6WC4V for ; Wed, 18 Mar 2026 19:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbdj001Jgz3Lhg for ; Wed, 18 Mar 2026 19:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5D9gQgbX9ZiyXqV+hlJ/G9wa5EbOCQmECaS3XH5iu0k=; b=eyfZLZuuIt3BRCR6tObO7ibly+p5QQqcTxn1/ebhIOZxoc7tRkrpwKURd63aRtpkzgHY6t rHjXTfAkl3HfUBSickYGb8MhIeQNyw7fc6gXEGs+C4WeYQcLiy3E1UZ9tGi+4tn6WeXZTj 8IVU+mGR/RLDR2xBhxeF3YnWSlyY6/Nf/BzJESg6/IIpOhoH9VFZOYCwi2GTz0U8fWdr3B lD9CWaQR+XNI68sXAJ/uVkKFB7JK1srslwLYHV7lhLELY6ig+PlOLY7QJxBHjUKDTDsS0m S03o2ThqqVx8FjtVuQ7BHQBLU1okc160pNBeC92KuOG13+eLUColAodl5OsfGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773861076; a=rsa-sha256; cv=none; b=yAgdDwqGPPlvWeG8nDjpYzQxP0F0iJi5NcVS0AiBwwIGIiaVEMK0cxVPF74CKo0aIS50Kg myvlJZw4fNlgDDHrFqi7k23lLkMF9IVn1XlT/JZGlbZuLzrS4SoYikPJYoSmpcM+IzdYqk scgGUcadK7hTAq4N9IIgpCLGn3gjotT4ts23fQSggc/GLcU7pH5OSl6nkPBGjFWRw+fErZ /E9TZQR5+s/v1LPsI1hJ6VVQ8DO8Un361Q7mYwn+qqP41BJFTWg4l4/HTY6PMMoNwoz/pj Xo1C/x1dfj2vT1pjGw8WesA3hKrEc23p7uqaScUYT4//ELji6oLj7WkZpQpKCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773861076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5D9gQgbX9ZiyXqV+hlJ/G9wa5EbOCQmECaS3XH5iu0k=; b=lYpkcu1CUDdc6/qtis+Ef37hnh2WWZ7QSJIzzDyVd0lcy4eRyvBS+XmJOPz+8K1pTTDIAQ q/BqebFKHfr7A11IrAqssuUY/T3CFnE5DSStmbSrWUo+xLQVOw7kEhaWK75t4HL0aZGM/U zepDl28/O3nO4t92KKu0trjgxB0JvvxDXVLndrlJgqnN/yerk2thDdArTJEujNV3Y4MCW5 w3tqN5DvZxWpsEZBHYwyJ86QNQs1y6z5K2Gry139ZScvA1Vz4D1B6MJGcTIbL9z3kgQN4g cFm8ltbX+lMM9DArgqfan0+iWZdNdCcM/mdCnbAYUCz4F7sWJv5jaVewEOXMWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbdhz6Rtwz68B for ; Wed, 18 Mar 2026 19:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36854 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 19:11:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1acf5071506e - stable/14 - EC2: Don't use unicode in boot loader List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1acf5071506ee0b5db16800069eaef861b4a2e12 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 19:11:15 +0000 Message-Id: <69baf8d3.36854.1e000c2d@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1acf5071506ee0b5db16800069eaef861b4a2e12 commit 1acf5071506ee0b5db16800069eaef861b4a2e12 Author: Colin Percival AuthorDate: 2026-03-13 20:45:05 +0000 Commit: Colin Percival CommitDate: 2026-03-18 19:10:48 +0000 EC2: Don't use unicode in boot loader The boot loader menu is disabled by default in EC2, but if it is ever turned on, the default (unicode) output breaks EC2's web interface to the serial console. Set loader_menu_frame="ascii" instead. MFC after: 3 days Sponsored by: Amazon (cherry picked from commit 277830b4d3ae9999c80bf915b5491850e91c6516) (cherry picked from commit 251907ca480eff7f6177f52959b71a6cfce45579) --- release/tools/ec2.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index c0561227f72c..54fe15590d3b 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -35,9 +35,12 @@ ec2_common() { echo 'net.inet6.ip6.dad_count=0' >> ${DESTDIR}/etc/sysctl.conf # Booting quickly is more important than giving users a chance to - # access the boot loader via the serial port. + # access the boot loader via the serial port; but if users turn the + # boot loader back on, avoid unicode since it breaks the EC2 web + # console. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf + echo 'loader_menu_frame="ascii"' >> ${DESTDIR}/boot/loader.conf # The EFI RNG on Graviton 2 is particularly slow if we ask for the # default 2048 bytes of entropy; ask for 64 bytes instead. From nobody Thu Mar 19 12:17:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fc4Tf5pK1z6V2MV for ; Thu, 19 Mar 2026 12:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fc4Tf41GGz3wLW for ; Thu, 19 Mar 2026 12:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773922678; 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=a9axtZepJ+fcUNr8KGf7KIFhiyOCdN87g1Mi/CNJUzY=; b=fFIRse7H9KkrJgSXAxiyCnLs/IoK+AjPZzG7hZ4uzJmstdlqqv4FklwaWsx5guWU0VEsHy kUBlOUCZlj9WoZFIBtqFmiF+a/o5pc0hWm3F0APtSmyhonJM97h5FSkwepZsBXGGNay9Ja zt7u/uvjO9c6Uji831rwpETjyN2MHW5jWRwjtCB94r/hQ3KJGB4QJYMTd0zeXS5oOBiYND DedZ6m7O9KGuG+Yt8hS4uYpz6jB5dzrUcv9uBnt77kB2zm1VnfQ+CU0RFn4lhbTAZcjVtH P6jIi35YuhGFmvT6NLEDNctW5c2bNxsP/4+aRs3ylpP/j0g5bCeYP7wLJWffpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773922678; a=rsa-sha256; cv=none; b=EIhsCrsBw/Hq/eiL7ftbZYTEPtCz+qCXo5FfjbbNnWr1nUA6htZq4ItnIF2iIS8Y9FoFve 3bKh2CYOl8gJz3BRjNVCds1KX1vWxMdzDwth9ktLFD7WDV5cMFlIEjmVFknYyE5HAztgUA CJHIrfENMAapVZ0ASHox2jZhrBPGXL67ChSNQ/QV83UntCHky/WRy4AyxEJrFXboBh8qye s7wVA2UWivfRigENYMS5qG5wL6jJp8Whm68VuRCuFNHPmjxsLoxYVRGfyOEc8KIAvTaign 7SEq1gfgKi2s5GDw/cSL/+EvjP1xyCd79GvXdG51RHUeKPk6bpq0l/WbgO1Lhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773922678; 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=a9axtZepJ+fcUNr8KGf7KIFhiyOCdN87g1Mi/CNJUzY=; b=VlT3kBsEnxlskqQFwESIgJvoY3qIR2LgriW+Es5jysU/ME88xwhyif/xaW5+Vb7/mvol0l 5b8fdHXANy2cZZT6CI5mHThFHlR7aagCEierYfCWZFKMeBGa0eSlVBRhRgdtJmG+o7Ud7F LMfecT2rENdee3UW4rKnqzFtZT/tU7RMzCpFpqaepkb4VfhfCBgxJhnogFwNo+x7NxLQym AN9RxVI2ra+Ytww1gV04Ykue/ppvAkNjPd2qzn9AbEuHjoYVUbBDqGCZ9yxodeCez4koQ8 plCJp+L7OLdKFjUbMcS9XTg6jgUOYzPlQHoQ9t128Te9gmaEARwiGUMCq9uXDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fc4Tf3903zvh6 for ; Thu, 19 Mar 2026 12:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Mar 2026 12:17:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sean Farley From: Christos Margiolis Subject: git: bd5ce67416b5 - stable/15 - sound: enforce MASTER volume mute during playback List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd5ce67416b56d895c2e1a7f0497163c3814e982 Auto-Submitted: auto-generated Date: Thu, 19 Mar 2026 12:17:53 +0000 Message-Id: <69bbe971.33d0e.e734c4d@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bd5ce67416b56d895c2e1a7f0497163c3814e982 commit bd5ce67416b56d895c2e1a7f0497163c3814e982 Author: Sean Farley AuthorDate: 2026-03-12 18:22:02 +0000 Commit: Christos Margiolis CommitDate: 2026-03-19 12:17:35 +0000 sound: enforce MASTER volume mute during playback MASTER mute (vol.mute) works while audio is playing. However, if a stream is stopped and restarted (PCMTRIG_STOP -> PCMTRIG_START), the audio will resume even though the mixer shows the MASTER volume as muted. Other streams that are already playing remain silent. New streams may also start playing audio regardless of the MASTER mute state. The volume feeder now considers the MASTER mute when determining whether a channel should be muted. This ensures MASTER mute is consistently enforced for all streams and removes the dependency on trigger-driven state propagation. Tested with Creative Labs CA0132 card. MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D55605 (cherry picked from commit ac5ff2813027c385f9037b47b2b164d4c1bebd09) --- sys/dev/sound/pcm/feeder_volume.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index fc4ed1bbb0a5..e43b2594c7e0 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -242,11 +242,14 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, { int temp_vol[SND_CHN_T_VOL_MAX]; struct feed_volume_info *info; + struct snd_mixer *m; + struct snddev_info *d; uint32_t j, align; int i, *matrix; uint8_t *dst; const int16_t *vol; const int8_t *muted; + bool master_muted = false; /* * Fetch filter data operation. @@ -278,8 +281,14 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (FEEDER_FEED(f->source, c, b, count, source)); /* Check if any controls are muted. */ + d = (c != NULL) ? c->parentsnddev : NULL; + m = (d != NULL && d->mixer_dev != NULL) ? d->mixer_dev->si_drv1 : NULL; + + if (m != NULL) + master_muted = (mix_getmutedevs(m) & (1 << SND_VOL_C_MASTER)); + for (j = 0; j != SND_CHN_T_VOL_MAX; j++) - temp_vol[j] = muted[j] ? 0 : vol[j]; + temp_vol[j] = (muted[j] || master_muted) ? 0 : vol[j]; dst = b; align = info->bps * info->channels; From nobody Thu Mar 19 16:12:57 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fc9hn3vYmz6Vb7D for ; Thu, 19 Mar 2026 16:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fc9hn35bTz3Zg8 for ; Thu, 19 Mar 2026 16:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773936777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YScbL+MeYqwB+IOKyc9sY9dB5XGWWQRCoQ9Q3nMuuhI=; b=YE0X1G+b+RtTe9uHvnPur2vR7rp8/vF3d0775ZHlDRpHFAEOdCd9JFuC00fqMV6pjKdSAr CM6oa4h6xvMKtCOBeMSTEhnslHavb5rninBCWL8NL9/9/Txu/taAi/CGUn5pTnV6oYWu9t aptS4wfzGIA/S6755n3C/Rwo/6n+6i7XxQ79DlZRaVjkfa+uFRnSSmNwIg0nArwuyTmTMv AiUD5sazDJBvlZjITn54HzB+psbbcuphw3Uh2C2lU/2FZ7kefN/Jm5PTzVecVOUpIr41su aBielJFa9yeXwcex/oo/tXNxR27rbeomYSh56xfzfkJ90DVpLv6tQDJPG+9wrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773936777; a=rsa-sha256; cv=none; b=XZOIKsEPBc76QI44iFJ6XWEGbyJKsPqE0DTfSvTksk/iw3nGelI76haTGmLQQ5t+CT1IUe spehf29ZCHlk3VSwBmvfL/Y2o01R/rmiVaHF9Am64auZiaU5yWGPoDAByb7J7Ujr+xokip IZTzF3tN5pyxBI+/aFZ0+yvDjksOhZCUDDChdRzG45ICVUXpRT0ECP3nLRW6roD+BawM9x eCqXTVOB0MNG2ci41NaUWSXzIycG9vnC1VWC7B2dF9zyOmpmKXBBrKUYzUAJvCsQiXSTIi fqqUGysj53FxRn9q1/5wK1V+zSQ7wlNNImLOV2BS8R7L3b7r0r+iayiq///oyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773936777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YScbL+MeYqwB+IOKyc9sY9dB5XGWWQRCoQ9Q3nMuuhI=; b=tC8Pc1iE02HaCIlVFwqLZHKGXlscwupHW7Lj0Q1FwygsVPUy49nahy8/zizbpYnXe8uimt zrL3Xv46gKkrODGqNM+XkQy0uD3hqJA+JpINGp+14CtNjuezwY4HR0wHBDlsrxHr8LWUta c8F/DCj2WZM+KI3oipQ1rNe0otys5sXTCEgAOU2DgrAS+d2EW37maQgTe8QSmudy+e4iBN QGGd1q6mqjTmo9BVvkdtdyDCA4V9lWecuufyXryM5iKHWQwF6yD/5WR2kajbK5QC4gKsaF 2wILKkrogGqBswK3YMHHaVZfi+O245cUJKQzGJ7sdwdxW84TR2Oye/B5YVWeOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fc9hn2SR7z12bl for ; Thu, 19 Mar 2026 16:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2555a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Mar 2026 16:12:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2fd7680a6c81 - stable/14 - elf_common.h: Sort SHT_ entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fd7680a6c8194ef3fe51fa9ec472b8f831e86c1 Auto-Submitted: auto-generated Date: Thu, 19 Mar 2026 16:12:57 +0000 Message-Id: <69bc2089.2555a.5536f4a5@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd7680a6c8194ef3fe51fa9ec472b8f831e86c1 commit 2fd7680a6c8194ef3fe51fa9ec472b8f831e86c1 Author: Ed Maste AuthorDate: 2026-02-24 14:26:55 +0000 Commit: Ed Maste CommitDate: 2026-03-19 16:12:28 +0000 elf_common.h: Sort SHT_ entries Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55488 (cherry picked from commit 0ff08b8c402b3c555125e4c72df0b80b4d084d56) (cherry picked from commit acf90e2e337572737e73567eacf655e44df760c0) --- sys/sys/elf_common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 8905f54caa16..b0b940b4cae3 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -468,8 +468,6 @@ typedef struct { #define SHT_HISUNW 0x6fffffff #define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ #define SHT_LOPROC 0x70000000 /* reserved range for processor */ -#define SHT_X86_64_UNWIND 0x70000001 /* unwind information */ -#define SHT_AMD64_UNWIND SHT_X86_64_UNWIND #define SHT_ARM_EXIDX 0x70000001 /* Exception index table. */ #define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking @@ -510,6 +508,9 @@ typedef struct { #define SHT_SPARC_GOTDATA 0x70000000 +#define SHT_X86_64_UNWIND 0x70000001 /* unwind information */ +#define SHT_AMD64_UNWIND SHT_X86_64_UNWIND + #define SHTORDERED #define SHT_HIPROC 0x7fffffff /* specific section header types */ #define SHT_LOUSER 0x80000000 /* reserved range for application */ From nobody Thu Mar 19 16:12:56 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fc9hs5P6Lz6VZwX for ; Thu, 19 Mar 2026 16:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fc9hs4Y63z3b6M for ; Thu, 19 Mar 2026 16:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773936781; 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=Z8OnV6BfdTQ3YsiGDZVda0zDq0SkK7nOr1Fts7O4p5s=; b=ZWxGyPWBzaMzD5y8Jslxm5Kz7lwFoEtA0WtO+RZfoffWAF0RzPF5oRPATvD3rBkTMBhFc0 FpfReJzH3Bt9mrYw9pNwUdOAsgegFYLqh13IoStlG5+PVTj14DGbZ9fSt2IWYdONnCa/99 wnUmN51O6daOrUyre1a4inN3kYeYn+ylZ0Oa0WyU8OvcLetXqhcIV0Lx+MyYvpCTkvGJax kCmS73rd4MDcMZcmgAedTssNsmeWrEK0Z7s2kZzutpdp5HJ+dPLOltORjN8CmXstzQwoSu P5eXf4KAGB7AIGIV3uguxfKoLNAnCFYeDUKzOuhJ7VCJN4lAU72amuEYs0QVdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773936781; a=rsa-sha256; cv=none; b=tgTes4xuA11oa/14rCNIrFwT2WhhYrl1wHDpQrD2Vv+oOlVAGzaHYBiTI7JZn8lqhrl4Dw cUu1jwq+CGd2g5tHVLUB5/Tv5SogY4zD60rhyw3ORV6fPS7BZeVZZSOhfElhEzZRVLqWyP cogWrkGvd5813lPbg8+DMMhgFcuzPl3j7o0vbmxzKgqlXoQ6JhEm/pejRHeYCeZiU+d5C+ V39NAMAG8RXr8lCC6ZeNs5PygJEJtQfHz6Sb8KmRJjRwudmg092i9EK5JwFSIK6WMEKte2 YXECgmEhzKw+IVjNbcWyxMNZsAaF0mvLZ/vyrfer9XrtvftXYoSFrH3WPbL2Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773936781; 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=Z8OnV6BfdTQ3YsiGDZVda0zDq0SkK7nOr1Fts7O4p5s=; b=izGP/flpuCarVYsrJQ0bUjGcGTzcJRXORQCB0Llx2+WLAMyDZ00FhmwhxYwn2fU95vdNLN o1UirfYnLaeSmCe1yIzo5ToUHkqU62adpBWbkFa6V3xNILkqluqr4n2BFwxWtEeJhsxLZr +Oo53D2XywT0loyQVfiTy9tSmBMmvdp7S2S36H0VMHY6ox6oyDZxkMuQF/UOptUbCB3xvf s7W5z6zIEHsDrKbbVoDvPMuV2tYOl1r0XzWdzj/Nv4ttSwvS85oKBSEK/vDfYDyjHWLKUd tPFyUCUkkyP9oX7dm2Czhi91Z1FeqWoqg5/JeA6JgMZM8N3xVTFPZRQJe10i7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fc9hs3tXgz122F for ; Thu, 19 Mar 2026 16:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cf0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Mar 2026 16:12:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Ed Maste Subject: git: f31a6686ba85 - stable/14 - sys: Restore sorting in sys/elf_common.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f31a6686ba85edb1e49b0a55c50d084608631c0e Auto-Submitted: auto-generated Date: Thu, 19 Mar 2026 16:12:56 +0000 Message-Id: <69bc2088.25cf0.5d544fcc@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f31a6686ba85edb1e49b0a55c50d084608631c0e commit f31a6686ba85edb1e49b0a55c50d084608631c0e Author: Jessica Clarke AuthorDate: 2026-02-24 13:52:21 +0000 Commit: Ed Maste CommitDate: 2026-03-19 16:12:27 +0000 sys: Restore sorting in sys/elf_common.h These various definitions are meant to be kept sorted by machine prefix. Fixes: 2bb61497ca76 ("elf_common.h: Add definitions for LoongArch ELF files") (cherry picked from commit b7ef4f4b230f01968473269f280bd7e4e86a3ec9) (cherry picked from commit 2b6ba65cee4e2e4f0cddfb32c4e21b6e20fa89e6) --- sys/sys/elf_common.h | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 83c8c58d4f4a..8905f54caa16 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -344,6 +344,25 @@ typedef struct { #define EF_ARM_VFP_FLOAT EF_ARM_ABI_FLOAT_HARD /* Pre-V5 ABI name */ #define EF_ARM_MAVERICK_FLOAT 0x00000800 +/* + * Loongson LoongArch Specific e_flags + * + * Definitions from LoongArch ELF psABI v2.01. + * Reference: https://github.com/loongson/LoongArch-Documentation + * (commit hash 296de4def055c871809068e0816325a4ac04eb12) + */ + +/* LoongArch Base ABI Modifiers */ +#define EF_LOONGARCH_ABI_SOFT_FLOAT 0x00000001 +#define EF_LOONGARCH_ABI_SINGLE_FLOAT 0x00000002 +#define EF_LOONGARCH_ABI_DOUBLE_FLOAT 0x00000003 +#define EF_LOONGARCH_ABI_MODIFIER_MASK 0x00000007 + +/* LoongArch Object file ABI versions */ +#define EF_LOONGARCH_OBJABI_V0 0x00000000 +#define EF_LOONGARCH_OBJABI_V1 0x00000040 +#define EF_LOONGARCH_OBJABI_MASK 0x000000C0 + #define EF_MIPS_NOREORDER 0x00000001 #define EF_MIPS_PIC 0x00000002 /* Contains PIC code */ #define EF_MIPS_CPIC 0x00000004 /* STD PIC calling sequence */ @@ -1188,6 +1207,162 @@ typedef struct { #define R_IA_64_DTPREL64LSB 0xb7 /* word64 LSB @dtprel(S + A) */ #define R_IA_64_LTOFF_DTPREL22 0xba /* imm22 @ltoff(@dtprel(S+A)) */ +/* + * Loongson LoongArch relocation types. + * + * LoongArch ELF psABI: https://github.com/loongson/LoongArch-Documentation + * (commit hash 9b3bd9f4a497115913c22f1a2a47863798fbc02a) + */ + +/* Relocation types used by the dynamic linker */ +#define R_LARCH_NONE 0 +#define R_LARCH_32 1 +#define R_LARCH_64 2 +#define R_LARCH_RELATIVE 3 +#define R_LARCH_COPY 4 +#define R_LARCH_JUMP_SLOT 5 +#define R_LARCH_TLS_DTPMOD32 6 +#define R_LARCH_TLS_DTPMOD64 7 +#define R_LARCH_TLS_DTPREL32 8 +#define R_LARCH_TLS_DTPREL64 9 +#define R_LARCH_TLS_TPREL32 10 +#define R_LARCH_TLS_TPREL64 11 +#define R_LARCH_IRELATIVE 12 +#define R_LARCH_MARK_LA 20 +#define R_LARCH_MARK_PCREL 21 +#define R_LARCH_SOP_PUSH_PCREL 22 +#define R_LARCH_SOP_PUSH_ABSOLUTE 23 +#define R_LARCH_SOP_PUSH_DUP 24 +#define R_LARCH_SOP_PUSH_GPREL 25 +#define R_LARCH_SOP_PUSH_TLS_TPREL 26 +#define R_LARCH_SOP_PUSH_TLS_GOT 27 +#define R_LARCH_SOP_PUSH_TLS_GD 28 +#define R_LARCH_SOP_PUSH_PLT_PCREL 29 +#define R_LARCH_SOP_ASSERT 30 +#define R_LARCH_SOP_NOT 31 +#define R_LARCH_SOP_SUB 32 +#define R_LARCH_SOP_SL 33 +#define R_LARCH_SOP_SR 34 +#define R_LARCH_SOP_ADD 35 +#define R_LARCH_SOP_AND 36 +#define R_LARCH_SOP_IF_ELSE 37 +#define R_LARCH_SOP_POP_32_S_10_5 38 +#define R_LARCH_SOP_POP_32_U_10_12 39 +#define R_LARCH_SOP_POP_32_S_10_12 40 +#define R_LARCH_SOP_POP_32_S_10_16 41 +#define R_LARCH_SOP_POP_32_S_10_16_S2 42 +#define R_LARCH_SOP_POP_32_S_5_20 43 +#define R_LARCH_SOP_POP_32_S_0_5_10_16_S2 44 +#define R_LARCH_SOP_POP_32_S_0_10_10_16_S2 45 +#define R_LARCH_SOP_POP_32_U 46 +#define R_LARCH_ADD8 47 +#define R_LARCH_ADD16 48 +#define R_LARCH_ADD24 49 +#define R_LARCH_ADD32 50 +#define R_LARCH_ADD64 51 +#define R_LARCH_SUB8 52 +#define R_LARCH_SUB16 53 +#define R_LARCH_SUB24 54 +#define R_LARCH_SUB32 55 +#define R_LARCH_SUB64 56 +#define R_LARCH_GNU_VTINHERIT 57 +#define R_LARCH_GNU_VTENTRY 58 + +/* + * Relocs whose processing do not require a stack machine. + * + * Spec addition: https://github.com/loongson/LoongArch-Documentation/pull/57 + */ +#define R_LARCH_B16 64 +#define R_LARCH_B21 65 +#define R_LARCH_B26 66 +#define R_LARCH_ABS_HI20 67 +#define R_LARCH_ABS_LO12 68 +#define R_LARCH_ABS64_LO20 69 +#define R_LARCH_ABS64_HI12 70 +#define R_LARCH_PCALA_HI20 71 +#define R_LARCH_PCALA_LO12 72 +#define R_LARCH_PCALA64_LO20 73 +#define R_LARCH_PCALA64_HI12 74 +#define R_LARCH_GOT_PC_HI20 75 +#define R_LARCH_GOT_PC_LO12 76 +#define R_LARCH_GOT64_PC_LO20 77 +#define R_LARCH_GOT64_PC_HI12 78 +#define R_LARCH_GOT_HI20 79 +#define R_LARCH_GOT_LO12 80 +#define R_LARCH_GOT64_LO20 81 +#define R_LARCH_GOT64_HI12 82 +#define R_LARCH_TLS_LE_HI20 83 +#define R_LARCH_TLS_LE_LO12 84 +#define R_LARCH_TLS_LE64_LO20 85 +#define R_LARCH_TLS_LE64_HI12 86 +#define R_LARCH_TLS_IE_PC_HI20 87 +#define R_LARCH_TLS_IE_PC_LO12 88 +#define R_LARCH_TLS_IE64_PC_LO20 89 +#define R_LARCH_TLS_IE64_PC_HI12 90 +#define R_LARCH_TLS_IE_HI20 91 +#define R_LARCH_TLS_IE_LO12 92 +#define R_LARCH_TLS_IE64_LO20 93 +#define R_LARCH_TLS_IE64_HI12 94 +#define R_LARCH_TLS_LD_PC_HI20 95 +#define R_LARCH_TLS_LD_HI20 96 +#define R_LARCH_TLS_GD_PC_HI20 97 +#define R_LARCH_TLS_GD_HI20 98 +#define R_LARCH_32_PCREL 99 +#define R_LARCH_RELAX 100 + +/* + * Relocs added in ELF for the LoongArch™ Architecture v20230519, part of the + * v2.10 LoongArch ABI specs. + * + * Spec addition: https://github.com/loongson/la-abi-specs/pull/1 + * + * Note that the 101 and 104 relocation numbers are defined as R_LARCH_DELETE + * and R_LARCH_CFA respectively in psABI 2.10. But they are marked as reserved + * in psABI v2.20 because they were proved not necessary to be exposed outside + * of the linker. + */ +#define R_LARCH_ALIGN 102 +#define R_LARCH_PCREL20_S2 103 +#define R_LARCH_ADD6 105 +#define R_LARCH_SUB6 106 +#define R_LARCH_ADD_ULEB128 107 +#define R_LARCH_SUB_ULEB128 108 +#define R_LARCH_64_PCREL 109 + +/* + * Relocs added in ELF for the LoongArch™ Architecture v20231102, part of the + * v2.20 LoongArch ABI specs. + * + * Spec addition: https://github.com/loongson/la-abi-specs/pull/4 + */ +#define R_LARCH_CALL36 110 + +/* + * Relocs added in ELF for the LoongArch™ Architecture v20231219, part of the + * v2.30 LoongArch ABI specs. + * + * Spec addition: https://github.com/loongson/la-abi-specs/pull/5 + */ +#define R_LARCH_TLS_DESC32 13 +#define R_LARCH_TLS_DESC64 14 +#define R_LARCH_TLS_DESC_PC_HI20 111 +#define R_LARCH_TLS_DESC_PC_LO12 112 +#define R_LARCH_TLS_DESC64_PC_LO20 113 +#define R_LARCH_TLS_DESC64_PC_HI12 114 +#define R_LARCH_TLS_DESC_HI20 115 +#define R_LARCH_TLS_DESC_LO12 116 +#define R_LARCH_TLS_DESC64_LO20 117 +#define R_LARCH_TLS_DESC64_HI12 118 +#define R_LARCH_TLS_DESC_LD 119 +#define R_LARCH_TLS_DESC_CALL 120 +#define R_LARCH_TLS_LE_HI20_R 121 +#define R_LARCH_TLS_LE_ADD_R 122 +#define R_LARCH_TLS_LE_LO12_R 123 +#define R_LARCH_TLS_LD_PCREL20_S2 124 +#define R_LARCH_TLS_GD_PCREL20_S2 125 +#define R_LARCH_TLS_DESC_PCREL20_S2 126 + #define R_MIPS_NONE 0 /* No reloc */ #define R_MIPS_16 1 /* Direct 16 bit */ #define R_MIPS_32 2 /* Direct 32 bit */ From nobody Fri Mar 20 10:01:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcdPQ6sHyz6VjZy for ; Fri, 20 Mar 2026 10:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcdPQ4MsMz3PVV for ; Fri, 20 Mar 2026 10:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wtg6WTo+s7oo11o0VDT7TYToQm2unKSdvY9ZaAdBm2Q=; b=i/5bD67F5uj16XTjZ/Pl+drAjTa39YT2C0fw2ARRnOe26fsYfQEsqly7sbFiOqyqQNXCqQ Bu9Q+e0YrGFMAXPlU+fRfOLp1kCRx7ZJuR8mL8rcNWjYFx/TH5+BGeJ6YyrWP+bKk/U1GK mNV7BxfjmQU/SLJElwhluJYlzsoc9x4oU61l8Nq7A46KyJJ+1/Zm5VjUN5IdTnJgn5Wo7t z/j7Rj3QA+x1TMjVhgw5pyLmtF9o1lnrooBdu2XD2wckPkCK6Gc/fgskNGw2jqY0JzNt7h cUsVRrfVkFnpgU4BW8MucODFKBjCIZPd3dvRGEgEVhLt1G97gwqpIwkO5Iym7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774000874; a=rsa-sha256; cv=none; b=A8gHBkUu0yXWCaW1x582uaxrV3xxPdhqWgHX+bKjLU6RSKuKPSva3vvyo9KauoNJNpy2yu tijCpqmuHz13BN6+AYVHbGfvcmRrA7bvnvSA0RCeigS7VfZ/wc+PIFwqbkNv0vPux57/pR lS5lcPvOw0iXxNXXZKk4pAS6xilcTdDBEOw6mV5ahJj8JoXvxqXhL1xCsYHaJ8ALk577VN FcvK8L3SWE8jnBu9FOgxzi/tEzIv7seIUst/4o9Ls1aOBGU3aDAkiBTgJzQjlkSY0siGu7 fbPVMFGkIh+H1BHKUn/fe7aUGspdvrsz47Gx85ns/uZqe6iez257vKhAn6dOJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wtg6WTo+s7oo11o0VDT7TYToQm2unKSdvY9ZaAdBm2Q=; b=BRU4/XEvxsnzsGR8LcBM1XaPv6NyRHcfGdMhDsD9XTzP5OkuITTvCBg27CUu7ggPfmN5Z2 u6drlKBB4biHQW8ko5v0ZgarpINXnR4kqrbZNcOo0NWuMzccmmRFgT4oD9+EYB9uo8D1Sr IpXHrZXkh9pLJAOqe4hY1L9zPfAEN7O1IfK9zTzz7RghCj4c/DOFabSl37XZi9JOrNwXhy Z9V7KZxr9Ps0UwV5EQQ5aq8V5EyzoBqFAHwbw+xoFn+XkExwLpQOnMq7If6l9ZA5x5V6Aj oODUwNwlX4UD1IvEZhSEQUSNzjrnggof3JqJOTZ12jFGZ33MX8uDvL190QIeZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdPQ3wBwz50y for ; Fri, 20 Mar 2026 10:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:01:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f521487cd935 - stable/15 - amd64: Make start_all_aps() static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f521487cd935a0a547a9d7b54eeadebb200f5148 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:01:14 +0000 Message-Id: <69bd1aea.1de7c.78f23ab2@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f521487cd935a0a547a9d7b54eeadebb200f5148 commit f521487cd935a0a547a9d7b54eeadebb200f5148 Author: Zhenlei Huang AuthorDate: 2026-03-12 04:24:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:00:21 +0000 amd64: Make start_all_aps() static It is not used elsewhere since the change [1]. [1] ac3ede5371af x86/xen: remove PVHv1 code MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55668 (cherry picked from commit 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f) --- sys/amd64/amd64/mp_machdep.c | 3 ++- sys/amd64/include/smp.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 9af87787e7cc..91f725c93158 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -110,6 +110,7 @@ smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = */ static int start_ap(int apic_id, vm_paddr_t boot_address); +static int start_all_aps(void); /* * Initialize the IPI handlers and start up the AP's. @@ -317,7 +318,7 @@ amd64_mp_alloc_pcpu(void) /* * start each AP in our list */ -int +static int start_all_aps(void) { vm_page_t m_boottramp, m_pml4, m_pdp, m_pd[4]; diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index bff92570ff82..f49827627915 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -34,7 +34,6 @@ inthand_t IDTVEC(rendezvous_pti); void invlop_handler(void); -int start_all_aps(void); #endif /* !LOCORE */ From nobody Fri Mar 20 10:01:15 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcdPR6r10z6VjLY for ; Fri, 20 Mar 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcdPR6299z3PhG for ; Fri, 20 Mar 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jc27HTX3SWcwyob/Gq8bE+ESFrNJKxzRojT69RIevqk=; b=IwUMlTGGU0nhbU3gI+Ihb+aSfAQYCX2M4eNYPuQu8QqfpYE+SEgSt7Sfssg+lwVm0KhIoa ZpjoE7Pl40fwKVB8YFsy5ACgDK6Af0PpoxQcrMmBYz4AKuOzXEar8sHnSKH4ON63AJpZCK bftNeyrTZq7V875JVhTUuwFep4SamYzY0wo7hNhAJy2C9WdTaTYNE0b1EK5PtMVuZfN3k6 W/9U9x+k+q3QHDOb1CGnOeuFqcY6RRfXc/wMF4nqFyPT8ty01JW7UG6CmGnad1Ga5Zpq9v efQZZkayll25XJQEfmLx0Ugt2FwlL+qM1bleXiG/UYa+b2XDrR+yFHBVIoNIMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774000875; a=rsa-sha256; cv=none; b=N6n7ULR2bEmE+ZfqGQqBvkqZq7Btf2bgLeSWKNj+q0M9lV1Kes/FCl7UvEI3BpajwPmTBF scIjZS6iEEtKQRhPXKvYSQUeFoF3nUnuZSRY+zoVgr8l6uQ/2+PpjRAUeXZNyQLYQ3zFvd oDwsFNFPP09D6YRdTCohHypIE8bNj0fmj4vTilsbWTL2vnoTxV8Zcm0lgEoFzeS/0FNwfz AhEcIbRdtchqfOY6a0neQGIouCCS3MbFbZKmi/wb5BWUuSoWgC+oFN9zhxMhSNiuoIk6R8 4EwFKqIEntBrIQFeDyyZhrz3pfs8JJYtFh2//W5YubG3NnwHXB13aaHmNCevVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jc27HTX3SWcwyob/Gq8bE+ESFrNJKxzRojT69RIevqk=; b=VV8WSkDnGzVkSqArOOYuKxC9S4YBm+U9S3ne5UhBlks0HIPUUoNAFYCE0P/MAflFiCM1/l Rsz0XKTu/t2ntfghwHWI/hYPxFUj+nhblz7sHOkHAivugj/i+utqurjVw1pOeoMfmOW/m/ z4ry1fHi4pHcIVIo8RA/g0q7UzNWDk3mwAoJBO5N8hYAH/aKABE1Xaf/jEK7gs7cjxGnq4 Rp9njIEcIMOG1oOKfuEV3R2qz8Gp+3r7O/W2d7Iw0aDoMAvBm5+0BMUhC9r3AUcE3YfksS lEXS8BvPIIlVyyM1HERAhCu1Ird1ScqcrVBLCgyYHnYs1b5s9hTH8a7pBn6bjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdPR4mjYz5lG for ; Fri, 20 Mar 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efe3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:01:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1b7687f053af - stable/15 - ifnet: Fix decreasing the vnet interface count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b7687f053afcf251ee7643ee5a4f22a225f4a02 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:01:15 +0000 Message-Id: <69bd1aeb.1efe3.75b69569@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7687f053afcf251ee7643ee5a4f22a225f4a02 commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02 Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:00:21 +0000 ifnet: Fix decreasing the vnet interface count It should be decreased only when the interface has been successfully removed from the "active" list. This prevents vnet_if_return() from potential OOB writes to the allocated memory "pending". Reviewed by: kp, pouria Fixes: a779388f8bb3 if: Protect V_ifnet in vnet_if_return() MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55873 (cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7) --- sys/net/if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index cb9c47c14c32..9ea5f9778d98 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -457,14 +457,14 @@ if_unlink_ifnet(struct ifnet *ifp, bool vmove) CK_STAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { CK_STAILQ_REMOVE(&V_ifnet, ifp, ifnet, if_link); +#ifdef VIMAGE + curvnet->vnet_ifcnt--; +#endif if (!vmove) ifp->if_flags |= IFF_DYING; found = 1; break; } -#ifdef VIMAGE - curvnet->vnet_ifcnt--; -#endif IFNET_WUNLOCK(); return (found); From nobody Fri Mar 20 10:03:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcdRp3hTlz6Vk19 for ; Fri, 20 Mar 2026 10:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcdRp1Jb3z3RHv for ; Fri, 20 Mar 2026 10:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z6lPsrWpg5LE3EXn3Q8Qi08dlTnezQTdcUBu/lIHi4=; b=k99LPj+XPt5j8DDXbYjEV5EnuYI8T/ENRq43O1/NDXt2g5JhK65mS5harVeZN3bRcZdrBP zuwX+v1o+AbWybXjDphRHnv4VhwaqXqgW0L31itX1hMyt42nuhgohCbGX+hq0jI7KrGksg i8HnZyWNVIxwNbh3izZG/I4sB7abqb2dNc77H7VmYegU+/Z3B4YjqIu2Bw78YAUSi5/FNA EIa7n/kGyyUBicFhs7GCNekxnN7CdFZgj36RjBaLe6Tqqin2CDcFrBXbxyapb4GuyZ/Rhd IGBS0jx3ToT65BOZjr7ibiDwY+a/wUZo047e8Ie1hpClkoUCXG0HA76LYvMfUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774000998; a=rsa-sha256; cv=none; b=IQlIKb+c9O5WL4JWMC1+pCFRXLns/0axXjKeQIdCOg7Tkdat2Dy/xQAvA5rteoWan09zOr hI8WAO89lrALBhTPX1907bi8+BJw2ut287p3W/OHzzXjrMhmMKX8vKUJVK47jPza+Uc/v8 c08VlCTUdRTmoTuEf20lKVN9aqM5rn4I67Pt+QG7Qww82w4w/iSTc2QLyuEWb/hmLtdNJH gY/zSbW9ETVkbvaKkwy0ylDuZhoQUKQcPWfxCMzRPSHfwAzuWPJ0ZkYj6X78iCMbW0+1ED gr688tihsgUfM6yzfpfN5SQkITvmhTdJOVg65umLQZ9FPsf8cYYorw82fzVuPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z6lPsrWpg5LE3EXn3Q8Qi08dlTnezQTdcUBu/lIHi4=; b=RmqrHZYAwSz4yCEqsJWS8rb4wf2OMT45Y0ynMq/GjV5Xt4WOiTY7nKrjuklV5ASqhtNiG+ adzplsoxTX2n7R4qPetkDymUzU9Ut57BrHjxL+qo7PoajXdE2U3TWC+WI1tI9aKbdXXrPW 2RsSF4lfJFM/Vc/mseOV7p9Jodwl8zZImOyoOkTeL4SaPROX6S3BPhPaAxJ5tW3GZnNpD2 iTgzi88yEXdcqT+PUXy9V6Ibslx6mvgbifY5GsiVlV/j9Qh4XgVS5oOCdAdqMKJD+vmLaz uGlZ9zYTXPYuAHpjkF0PSGvtHTJdtlvkB9ny/ylb7OR5OOW7Fm72210X74rEYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdRn6XFdz5qw for ; Fri, 20 Mar 2026 10:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ee9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:03:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 47339e4a9209 - stable/14 - ifnet: Fix decreasing the vnet interface count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 47339e4a9209c1d1323f58d792e277792990e060 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:03:17 +0000 Message-Id: <69bd1b65.1ee9e.2aec72@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=47339e4a9209c1d1323f58d792e277792990e060 commit 47339e4a9209c1d1323f58d792e277792990e060 Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:02:19 +0000 ifnet: Fix decreasing the vnet interface count It should be decreased only when the interface has been successfully removed from the "active" list. This prevents vnet_if_return() from potential OOB writes to the allocated memory "pending". Reviewed by: kp, pouria Fixes: a779388f8bb3 if: Protect V_ifnet in vnet_if_return() MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55873 (cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7) (cherry picked from commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02) --- sys/net/if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 0c7e32e858bc..44f80a51eea8 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -459,14 +459,14 @@ if_unlink_ifnet(struct ifnet *ifp, bool vmove) CK_STAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { CK_STAILQ_REMOVE(&V_ifnet, ifp, ifnet, if_link); +#ifdef VIMAGE + curvnet->vnet_ifcnt--; +#endif if (!vmove) ifp->if_flags |= IFF_DYING; found = 1; break; } -#ifdef VIMAGE - curvnet->vnet_ifcnt--; -#endif IFNET_WUNLOCK(); return (found); From nobody Fri Mar 20 10:03:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcdRt4H79z6Vk0D for ; Fri, 20 Mar 2026 10:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcdRm6spzz3RBt for ; Fri, 20 Mar 2026 10:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ixlWl+C7CdbR+vsJY1ROxzqf8wkVGms2cqLE9emwNrU=; b=D/jHwNJSSaz1CvE7sxF+mJhM6sMwgGevWI0/gc5prUnEwB+i6vSA55M6P1t1cVPDWx83tU lnur/Tv6vY1mbTPC2MkHna5ZPbyEbgqaqEyb366edQADbsKrEF43zAjh6idhaw91BnZaX0 sWUIsEZgA5H6xaglW0JNj1zZB2lBCpFXQKSi2cHP8voH4C472VOB1SpeBfzmGNF4XhaETn LLKsJpykQnaRn31474UiZea34j3i7kcAgFHixgEoo12gJ/Nw3Z9esvZDZkPdzgXqOmOKpA yEiYdmxnWEQ1fgXTvbz72ImfTj4YZeGNJsFrFyu84l8PC1efRFGtXaHLtvVzpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774000997; a=rsa-sha256; cv=none; b=ATtMlHCRrLAwpLb0Jdu3UiBnyni87JCx8jp3WS0JSkV5ROfEctU85BXH8nviXl3mqHfKH+ 42jne6AY0EKty6/prio3Wk/8CX0JGQVoi/5PW+f0qUsa3ShyVuHOTupCXSxKTluGKlcwm9 LtSC23jERlDZBS+QybRIEJ4fqlST/o7sn03VYP6alMWu+XAK/tBBa5QDkadBfKs8Ip9ZJ4 Y2UPe+yWI5gLO983vRyAGIG2hebpYH2pjYVUoI4/tpD4NjwTibv86OlZN0bUTz0BpiRQzc pzBfET+2GxB84xSmtmii+6QDBotWgj2mwvI6K0qajFTzV6Jp0RScRF6P/bzjaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ixlWl+C7CdbR+vsJY1ROxzqf8wkVGms2cqLE9emwNrU=; b=ajQPR3lUdy4STodby3JwIWgor3SsnNdSw9XjKsuAPg74oRFEWCWyOQpewcBZFdNTbAEYqK DNhoE9Ggkhz+0o1V68WX5NuBgPw5AivaMYsCGRUyYQkcp2/Y3RdHAWfxNzgEmvXgUv+Bal z8sZSizeByJcyrDA1JnJT4HH6HIeoen0vU+DvDQ869Goy3RsMqWFKQtG/gFMG6pGZ1uGNP NN2/i3lA8/Ncl/baH/zS02PRTu6kcq6+y/lcK09lUMQHe9OEjpqlWSabDT/2VokDNyAR0F 350dU+moAoDTb675ZyiZrpaR9/GFM7fqxWkZEhae928LiGBKdTBkOv8Kst/UbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdRm5k01z62D for ; Fri, 20 Mar 2026 10:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f502 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:03:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fa5f0d95be25 - stable/14 - amd64: Make start_all_aps() static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa5f0d95be25f670f9752e4785f55cbdeb830bab Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:03:16 +0000 Message-Id: <69bd1b64.1f502.1ccb4a11@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fa5f0d95be25f670f9752e4785f55cbdeb830bab commit fa5f0d95be25f670f9752e4785f55cbdeb830bab Author: Zhenlei Huang AuthorDate: 2026-03-12 04:24:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:02:19 +0000 amd64: Make start_all_aps() static It is not used elsewhere since the change [1]. [1] ac3ede5371af x86/xen: remove PVHv1 code MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55668 (cherry picked from commit 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f) (cherry picked from commit f521487cd935a0a547a9d7b54eeadebb200f5148) --- sys/amd64/amd64/mp_machdep.c | 3 ++- sys/amd64/include/smp.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 00e99f9df192..8f3d339d9dc7 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -110,6 +110,7 @@ smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = */ static int start_ap(int apic_id, vm_paddr_t boot_address); +static int start_all_aps(void); /* * Initialize the IPI handlers and start up the AP's. @@ -317,7 +318,7 @@ amd64_mp_alloc_pcpu(void) /* * start each AP in our list */ -int +static int start_all_aps(void) { vm_page_t m_boottramp, m_pml4, m_pdp, m_pd[4]; diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index 26eb227211da..545d30fca6ae 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -36,7 +36,6 @@ inthand_t IDTVEC(rendezvous_pti); void invlop_handler(void); -int start_all_aps(void); #endif /* !LOCORE */ #endif /* SMP */ From nobody Fri Mar 20 10:04:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcdSw65rdz6Vk1L for ; Fri, 20 Mar 2026 10:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcdSw56M1z3Rl7 for ; Fri, 20 Mar 2026 10:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774001056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUtwJ0qOdPehrPulMKqPqxxJlcIe2EatL+SjMI65x9M=; b=wDcVXZZXWYCElVeDmH4TV9j4UF+9W6hmdzA0zq615RLk73g2Frglqt4bZCv3MsvI4dev/Z MJ2qRwGeWq3EKA+Cz2/EU5DLq8aoOQznwJVPlnLabbZblhowT4Oa11RKLtJUcj4iYkvglR C5eEs2BiVbgQComEXNizOYvNbGFCMoc0UzIE8U+vdldWJ7VXuR7iRxyQc4coFufQJUpVJW woIE+9XrvcxOBI4o9BqhAEx0NvJhtBnM6h59fqQ1XoEuRZZdLRlkTl2LvBJETI7u7li4kJ BsRpgV778Tdh4mbaxSvyz3Rbpio5A7NrgT29qlDotV6HBnBP323vsWT7J4Euww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774001056; a=rsa-sha256; cv=none; b=SCGFusQxNkfMcWMzNBo1sNLqshxYdW0pRGg809GAcP97745EerxWErvz5oAqAEL5d2dwDr pVw2/7CkW+z5YBsecGub3UK5WNyinKyXPRHeCyimimICXOpbySEq/M6Y59+hSi3ROGJidP sgjvA1UvRCBOxCQLETJVh6uL7axh/J86HhciZX2ENL02RnM4CCmQhO6K6FgwLiKHRfu3uN MxE1VOOJ0PRYASdZf4DpOe/gosKypRlsMFC7HufiHiU0N7U405exfoxhR5jv+DnKnPTymb /0Hqelv6tnDJPysRPF0NsfwVDnxa17cM4Fn1Gkq/Q5/J9WcXmJpAXeubhltZyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774001056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUtwJ0qOdPehrPulMKqPqxxJlcIe2EatL+SjMI65x9M=; b=K0PbZTSVYWSMpYVPxzLyNSkw2EoYnaMycy0nNO/NUPj5DPGcCqgntvqftrasKDho/T4T8n MY73Ywo8/UercBC9ASHxhcHJGWw6Pr+8jCfeN1ibqd1hlPbp2ZziH2jsVLuh74UQQaPJ5E GCQoYs7T9akkwrGJ38ity4EpR1kF+bPsWGfYqveIUwFMnl7CZv+bSB9zCS1i3u/klFt3rW uittG19Bd8FCLzKY/rEFZEuX2RxWMeBXTNvKp+uAA4g9UEKeGXY0NRnNEvUsYMQn52uPhl 7rTgC308oPLv0nPa7L2V+GV5+Ezfay0R3Cis0F2MWSEV3qjowCjdVQ/fNR/V7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdSw3r44z5ng for ; Fri, 20 Mar 2026 10:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efe8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:04:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2265cf938ec3 - stable/13 - ifnet: Fix decreasing the vnet interface count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2265cf938ec30d9658d787d4128541cc7b9bd67a Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:04:16 +0000 Message-Id: <69bd1ba0.1efe8.390e2980@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2265cf938ec30d9658d787d4128541cc7b9bd67a commit 2265cf938ec30d9658d787d4128541cc7b9bd67a Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:03:43 +0000 ifnet: Fix decreasing the vnet interface count It should be decreased only when the interface has been successfully removed from the "active" list. This prevents vnet_if_return() from potential OOB writes to the allocated memory "pending". Reviewed by: kp, pouria Fixes: a779388f8bb3 if: Protect V_ifnet in vnet_if_return() MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55873 (cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7) (cherry picked from commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02) (cherry picked from commit 47339e4a9209c1d1323f58d792e277792990e060) --- sys/net/if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index c642e99136d8..3835ed57fea9 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -485,14 +485,14 @@ if_unlink_ifnet(struct ifnet *ifp, bool vmove) CK_STAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { CK_STAILQ_REMOVE(&V_ifnet, ifp, ifnet, if_link); +#ifdef VIMAGE + curvnet->vnet_ifcnt--; +#endif if (!vmove) ifp->if_flags |= IFF_DYING; found = 1; break; } -#ifdef VIMAGE - curvnet->vnet_ifcnt--; -#endif IFNET_WUNLOCK(); return (found); From nobody Fri Mar 20 13:36:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fckB40YlBz6W0hc for ; Fri, 20 Mar 2026 13:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fckB371Qlz3tDT for ; Fri, 20 Mar 2026 13:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774013804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOLNoY3d5dqfaA8lT89iUj38gW0bfqI5yKYlFR6TxzM=; b=Xebeo/AHXbiPV7klmwkH73J50J+m9hZrXbUzXsnHFJXmc967yPkgZ0IpxPEQRy2i/4nLFb 1W2l6BBUtcIOD/vnHW73jeXuI4S+xSDeLiPgzPXEfyRADiKzILlxhdHLAH40z/kzSrSBlY N9/if8Ko9de1Ty7Fe+tMa8+2pTNm3qxlnaocuVuOy9Mah9ht0q/LPeEStiRoL1bUkKZFaI 0L/wQshPnru8rp65tpdmVQ5V9iBXEGeq4XbOoAeRkQC61B0EpdKqOM5A6o6bxopl6ZnJX8 MuNkSjjL7XQ4Es6MBzOgln51B7CRk1dpNaOT+LBxeOnX54fztabezNSgZyy6ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774013804; a=rsa-sha256; cv=none; b=da6Ds+d0CYdiu/f7rCXk2LQcmgmylbV7zYI35xh33Nhs5pt/PcEHJEOh1ap3nS27YtSgX2 8N4Oz9DlT1Ps6ocb+nSBYy3To8OnAKLVaxJkhLn6beVTLQv9zZWzo2HpOcYrk+uwnZEhV2 bvN9ZRjVbeQv0gB8ljYpNBdY78A8ZASS/+oopg/mlQyUxfZMa+fW2BWELkGSfGy5Hrhz10 OURKf0jysLITPuM+ljF4AxqnPDVzg8o7O/s0YBgM9zpOYXjI7IehaUZzuwH6SOXVSpa0gl MfDKHq1UPlNDnMSfCBrAMVv+joNcP2yS77S2n6YX+lZy5H6/pSyzBv/4psgFvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774013804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOLNoY3d5dqfaA8lT89iUj38gW0bfqI5yKYlFR6TxzM=; b=AzwJnK5pWufYf+D3qLImhXYqMs4xI/qpfeQw0gIoWWurxRbnYMKyjTA/aXDB+NnU0btfGm nB/e5E91zEkUbE1ioWV8XIcVac8vu4acO+1RrGRGpJ4h4Jzio4GBcHp/+oURp+aO3+yQ7G f64SSbUge0cda3UwcEjC6tRWDAw8s96Iij8D2raoFvSy6tSO/XCNWgxNv87iwpAG4QA3E6 QJXlB6JUW6leWheRbWaDVFnj7DuAtxyfmuNQjIez2e+N6FtMV5mR1rpbxvfi9gSNvjcQMA JJt2reNZlsyPp9xJtwS2+9N3qWdlk0feBPXdxNkWzTFHiI/Xb6X4GVf+Dp4mBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fckB36JBkzCMh for ; Fri, 20 Mar 2026 13:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c718 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 13:36:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6348a5fd0d47 - stable/15 - shm: Zero struct kinfo_file in sysctl handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6348a5fd0d4792e752cb714f2a536c3287b8d580 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 13:36:43 +0000 Message-Id: <69bd4d6b.3c718.34871d05@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6348a5fd0d4792e752cb714f2a536c3287b8d580 commit 6348a5fd0d4792e752cb714f2a536c3287b8d580 Author: Ed Maste AuthorDate: 2026-03-11 01:59:07 +0000 Commit: Ed Maste CommitDate: 2026-03-20 13:36:35 +0000 shm: Zero struct kinfo_file in sysctl handler Reported by: Calif.io in collaboration with Claude and Anthropic Research Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55806 (cherry picked from commit 25cc459286a02b646751541ccde5a33319471c73) --- sys/kern/uipc_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index fe3feab4149f..0ad5be2e8d71 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2149,7 +2149,7 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) { struct shm_mapping *shmm; struct sbuf sb; - struct kinfo_file kif; + struct kinfo_file kif = {}; u_long i; int error, error2; From nobody Fri Mar 20 13:36:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fckB50bs3z6W0hd for ; Fri, 20 Mar 2026 13:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fckB46wRsz3tBK for ; Fri, 20 Mar 2026 13:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774013805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNkXpHbkWKG6ZNVH7BtZEetSmn4TMQdXhQbEPWajes8=; b=JSjLPJtOYPyB+xVbVnvb6Rv31rkgEOqsJl1RlWqKfUCwsplDr1GFqdZrDxmB5eHeVLFdE7 Ai7jrp2LrBdwWT1dNRAC1YOALG7S6iHspFcKmlApaTE/W8V7/H/C8w6Nsq3jaAnb8fXEib SeyOpM7tTO8McbNIVClGGDag5UwYkbG6eumiQGTSPhlany509+0RuCO1DGpEffotlaTlfD HY/5tKfPvMzj5WUxb+ILYueGzfkvDMIhJ/2w0NNs8EBrOgnhqEidYRNcBmz6VkZgawFK7e sbVxbMecK7iEYmyu7Hc/C7KbZbcK2JRE7sJDXQjMXqk1lFptCXxczHKoDgIE3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774013805; a=rsa-sha256; cv=none; b=F8Mo62F8S/+1kaFAKn/DIRBUy8q6EwDaFmsZag659ok6sgK2YUql883jk2+zhhSN8n4kNO U5pfnIp5mssbMGc5XaRep0sMDVxVZdewcd1CFxvu04eQamSYVIvLCZshFqlchkgJ/xBgte 35k0T53mHo2ZRA6qbMD8UK74BLmv38CqAIxfGv4fq72MWhPNXVmG8tR0w2cUGo+I3T3pWW tDtTaPFUjuFgqdwCMq1KH+QDDOJUv+SzdNDpMyQxeRSjQ4qZt4z11z9uSOm/GiILsbrlrZ fwX1pvX3IIxiSe0ZF9oedeuCn/l6aXO64cRdmdQ4hs/Vb4NsJjGoG0jq2A3blA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774013805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNkXpHbkWKG6ZNVH7BtZEetSmn4TMQdXhQbEPWajes8=; b=jjsvKPcl9i5AULk9VxDbhKIDqqdJKLpKIeMenGoVDem/wEs5C11znM55A7eiqHihFAKowB nhklaWtsADv8ihTBB/LdxjHwyDIW2eWg46Us6JMEQqPDxMgRiBpOG4Gh/teXtGRLGzPoC5 o33qhdhddBXvxu7pKCFxLT2NrUGnMW59qnhnTjz7rKmDrVnPrqgqQ+t1vve6aV8L40jaIf F7ICv+rOnfWgBeXylp26kIMVAKgmG8xHcmJ8mOyZHpPJ12bt7aQlobplLfM+dGch+UArS9 qTtfDbef1St9d6+FJlGoTDe9HEv0eDxYtImbeVMxp5nZAQEkMtkq5jFhpPPnNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fckB46VzCzCJ3 for ; Fri, 20 Mar 2026 13:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b8b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 13:36:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4551ea3b3f04 - stable/15 - compat32: Zero struct to avoid stack disclosure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4551ea3b3f04650cd5300a9eae8994bdb080db91 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 13:36:44 +0000 Message-Id: <69bd4d6c.3b8b3.3ab02fbf@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4551ea3b3f04650cd5300a9eae8994bdb080db91 commit 4551ea3b3f04650cd5300a9eae8994bdb080db91 Author: Ed Maste AuthorDate: 2026-03-11 15:02:18 +0000 Commit: Ed Maste CommitDate: 2026-03-20 13:36:35 +0000 compat32: Zero struct to avoid stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55811 (cherry picked from commit 097cb4e9f0432c543c704cec712ce1cd3302335c) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 1064987c3abf..4ec6dd452b32 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -757,7 +757,7 @@ static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; + struct kevent32 ks32[KQ_NEVENTS] = {}; int i, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); From nobody Fri Mar 20 13:36:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fckB62jKtz6W0hf for ; Fri, 20 Mar 2026 13:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fckB60SQ9z3tN3 for ; Fri, 20 Mar 2026 13:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774013806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ig4Xzm0EqZFFsDRc4Jkb/5BzYJ197c8uzei3RFmrOs=; b=Xh5DAEyC0HTkVIrpR1HqE5pY0Yn8QuQ3jSzzdKRVdW5GKYs8Tz8KNSO7xIfX2bVIL1BhlS cb8yuu6U1OjET3iY15aNrn+YwFyX2YaS6qMgbzURDd4CG1QDgdW6qqZW8eD6IfHJjScUVE buTbnTAp9asCZDs4gXXW+RS+NMROSHQ1az98xKXYXVqO35eMAihGLP3MOsEszuKY/B7isP x/EDDj3KPMoX+ClgcCg0S9VT+Logs6yTLHPiCgo+5nRs7rB3Y6rdkW3rZPg39YehdwFbGB rD7sGBD6BR5qSN5FGEwSd2fLEtGhiOXwpXjEu+L6cLYRFPREIURQCgp5+lpN/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774013806; a=rsa-sha256; cv=none; b=jFL1NKmlDBOFyWCBz7hWlklHBMOqIoXaJm2LlSv5pJl7Hz7C3CQaMUpdBfLB5c2hHzpK8I KzC6RCixjyaBTQlTS+GEQ38MIXSN8BeiE2A7WDISdKRM6zrsrQOviKeDMpw4/T7GbKVSrh FBHk4DAx/IPwX5oURScXgorbVaXvIy37l0davUCXZpbrPvOOruKpTOXGYg5+khxLnxebHf Z3SW6O68v3M2kJfTGHCNU9sQCorhl8nUjNEsXFSsq3X2G6u4UCS+lLVOqQNaSMSeMrSFxR 4VYIYwPygqoVhFUPDRcoluwxg+yhRfzS3e+FOZ734uiFkEa450gVg2ORNUK+vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774013806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ig4Xzm0EqZFFsDRc4Jkb/5BzYJ197c8uzei3RFmrOs=; b=I3wG76HK0aeHEocwX+iZATD41jIqZwFyjdvbRX4Z8ymDU2vbTgYcBj3iKBOuNqg2GiPS0J +axwd3+8Vupq7qkGBVKMhoDWE0sNUZW6++aXMf7UhllxsWVo4/WKd5v997XSO9GtHs84xt 3IRyeyBb2OSUhfnDz4yujqtJQyei7kg9fkM1DcPQDbl43zOS9RvIkcyXQaOUEcZmCgTr9U zW212E6dSLamgtEYmIxIK/1J3oFtRwiIBL9jalMGtYN5bcMjjwSyQdk0NAEyERK6ChHCzS cTGFAJV0a9PzvOIRE7jG9byQmjnQA0GeHFKQ5sgBgjBuZpA4qf+N46EOBp64MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fckB571CDzBr0 for ; Fri, 20 Mar 2026 13:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ccd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 13:36:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9f8db9cc67fb - stable/15 - compat/linux: Avoid waitid() kernel stack disclosure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9f8db9cc67fb86eeb2b645ce7f8aa748e99241a9 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 13:36:45 +0000 Message-Id: <69bd4d6d.3ccd8.7db92bd3@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9f8db9cc67fb86eeb2b645ce7f8aa748e99241a9 commit 9f8db9cc67fb86eeb2b645ce7f8aa748e99241a9 Author: Ed Maste AuthorDate: 2026-03-10 13:53:46 +0000 Commit: Ed Maste CommitDate: 2026-03-20 13:36:36 +0000 compat/linux: Avoid waitid() kernel stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55812 (cherry picked from commit 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd) --- sys/compat/linux/linux_misc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 69fb9935a9ae..937b010c8435 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -750,6 +750,7 @@ linux_common_wait(struct thread *td, idtype_t idtype, int id, int *statusp, error = linux_copyout_rusage(&wru.wru_self, rup); if (error == 0 && infop != NULL && td->td_retval[0] != 0) { sig = bsd_to_linux_signal(siginfo.si_signo); + memset(&lsi, 0, sizeof(lsi)); siginfo_to_lsiginfo(&siginfo, &lsi, sig); error = copyout(&lsi, infop, sizeof(lsi)); } From nobody Fri Mar 20 16:33:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcp5X2rNCz6WCdD for ; Fri, 20 Mar 2026 16:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcp5X0nnmz3NF1 for ; Fri, 20 Mar 2026 16:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774024384; 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=3CgKEtYImiRV7+WYzl0iiuErOMiZU+TVfxoRqHHCJEk=; b=WntXiOFnKkvSt7GFCikV1lcXTpXSKR0WmBWWQN4eb9FeE+qp4TKPM223NTed32eQkmsoR8 bOHBOEIWp9Yq28LrLH4t6Qn1CGqAvESJSIVNdrIrMZUBo/HL97xW498xxDXD2+5GEEWF1K ylGSOQp0khBe0xpuvFtiPjptVVRYLqKDmIllQcQgVX+LeDxuCrx+nOz2biki2iEefucvUh o9EmPJ1nDJ9G+0MpZ57cJxItwna/MjEhxIeCzzEj8mlxD9hers9pm089PwvESNtQ0R988x u1A3b9J0MhfKV2Tu9vGaXjioqR2ldbC5O592/lsFyXPqEWRymtKVliYLjvivqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774024384; a=rsa-sha256; cv=none; b=szPavzSlL6lnRnt3nkx3EG2v5SRPTFQvJGCSCX69HPj/59xeHJglkIDzcozb63/jatw5Fs XMmuAa/mevU1abZkvBXGyL2uC1tvBw+rRG10l8fSbG6RhO+abfAvO2gpd9w3uV2aK89AJi 66JvosFYPMtzOoH/nwnlOkmQ6tRKctvuw1So1JwYsj+4t6G2K2rwi6+F4aBAG5UfSXepW6 vC1EOQD3GT4Q1mKfcNV1Pzt6TRjj6UzT55/4JoaoKPcBZOSRO2toFnYab6vj4HP9le5sOg qpFnWjYUMN7RztBRbCSQZa024va6+bh64nEmfcXTkw8UEwZiGHu8AbvnvhB3dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774024384; 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=3CgKEtYImiRV7+WYzl0iiuErOMiZU+TVfxoRqHHCJEk=; b=hKQc37tmZjp/W8YL65py6dbO2tHbnOjxMyAfwJQGlAlJzjVEWW3k+I5Jiqi58VgPz3uPfJ 8ZSaidvDM99S22YFm8cJdvosVnJ7SasU+HadGOK3xW9WI1xtnIRH8TS3ZR1iD5sw9RmSfh lfrnOoqTI4L8FbyTGtKp0nK68J7aYshgWoiPi8WTUy2IK8mEr1FZQ8iVywdXImIr3l8uca 2xpDd2JBodfnl7h5Xmbugb1TjDjginnnFdMoU58/o7FMMwsfxgnMa6JGg6PW5AxAZjaJZi V1V4Osh3ncCU9kddpmduyQS8NTu8l0200Ht8xyfRb/sXEitcq4lQIMVqZPxFZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcp5X0FFBzZks for ; Fri, 20 Mar 2026 16:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 271bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 16:33:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jonathan Matthews From: Alexander Ziaee Subject: git: 3bfda6f6b856 - stable/15 - nuageinit.7: fix cloud-config header line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 3bfda6f6b856f91a44b202e82107e470a09ad3fd Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 16:33:04 +0000 Message-Id: <69bd76c0.271bc.77399c74@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3bfda6f6b856f91a44b202e82107e470a09ad3fd commit 3bfda6f6b856f91a44b202e82107e470a09ad3fd Author: Jonathan Matthews AuthorDate: 2025-11-12 09:24:24 +0000 Commit: Alexander Ziaee CommitDate: 2026-03-20 16:32:57 +0000 nuageinit.7: fix cloud-config header line This updates the nuageinit man page by aligning mentions of the cloud-config header line with the cloud-init documentation[0], removing an unwanted "!" character. [0] https://docs.cloud-init.io/en/latest/explanation/about-cloud-config.html#how-do-i-create-a-cloud-config-file Signed-off-by: Jonathan Matthews Differential Revision: https://reviews.freebsd.org/D53706 (cherry picked from commit 4ab2d625e1462e9a78cb8086906c1a3da3aa6713) --- libexec/nuageinit/nuageinit.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index ba219f031c50..9651abba868f 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -131,12 +131,12 @@ If this file starts with a it will be executed at the end of the boot via .Cm nuageinit_user_data_script . If this file starts with -.Qq #!cloud-config , +.Qq #cloud-config , it will be parsed as a YAML configuration file. All other cases will be ignored. .Pp The -.Qq #!cloud-config +.Qq #cloud-config configuration entries supported by .Nm : .Bl -tag -width "config-2" From nobody Fri Mar 20 19:35:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fct7z4XnZz6Vxdf for ; Fri, 20 Mar 2026 19:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fct7z2HwTz3jrY for ; Fri, 20 Mar 2026 19:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774035327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h/STE7fj1Wo2R1e9CNBLNjcySZ9kL+3yhmS5Yq3qmgQ=; b=vOD+4InQ0xlqjqelTj7N4GovlsSMy15B/zfgZq2sy7nzmCw2/JTh8Kbtn6DZz/33swHgyX C1GygJho8oyUtP61K7iRd9+ihK1WWmBJsgNl+bpHKMjbOJpUDWSPzEZPKWFGW1OjDq9L0R k5lTZOiaxMRL7pHRoGPQBCugRhKmfYBrN8xzqlcYGQcvhlhnTvWiAwl2/AweaX5OfQBVZU 4Emi9V/5mAPiH8l7DHWRHYiaiK6hpHPXt4ULC3kV3o4M+JJOHg1tWB8FgLfoCcIKzX/LSG Lj0gtJlvpJs12Z6G59cPYZDmW+rOgWAHzHs+gp/tvy29o5+v9ZFTrrhwIGaBWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774035327; a=rsa-sha256; cv=none; b=c9uRy7tRDgQH2C2S0XD040vGFSby8Xk7hD4BQl08C7h77FhMN3jE5xtdJm+4sHrE0lhZWR 65qqu8r8aFy4IIw5SswxkKB70rvYK3YP49vH+5MLOX5bd+ylRjyWMY4FJxBsMrasfK3kjd JuN24Sig+FA/6UMbTdp3sxVA8jDkCWGTr8fdbk5hSUoJ26LgT4TjakPhSfgJ4dXRbpNxvf QE4NyKvNxpKcHlV1stGzgkY9X3bsn460TlvSIrjEhXI//MJT/P/2mCWUAQx91VipPMjJ1P Y/uMFvBMVhDsaeMuI7DsBZN9wNN03eeXpCdyoUiVr13nujo5pPVd3nf3UO7Gyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774035327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h/STE7fj1Wo2R1e9CNBLNjcySZ9kL+3yhmS5Yq3qmgQ=; b=eyNFxko0Ih5km2rIJYLS+1hHQCwXzLPxP6q4KC4B3GIPn2H19qZKa8udYb9oswGiAs7Bfa Y0uRvgq5WBI8H6LHK7451q0JrJSU43728TW6tYV6ks3sdgKCDjrPsgz9Fc66j1TctV6CsZ NI9Ylb8ejb64BwdPj+TvEK1jXQTM+qWZT4gMJS4IDbG9g4OPjfRPUsU+bM05R9vnLm4gkD Q5p7Op/s4lc9/a0+q6GYQ4EHG8SJ62a7iNtXYmlWtK+/o+FUNmDXxW6igUkQDJMDyqbmE5 nx6k+U7klCVndT8udR6gumDqG/bbY+kk/6/pWzB8W4cNBVfemePyQhC3aWfmlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fct7z13KSzfSy for ; Fri, 20 Mar 2026 19:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 410c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 19:35:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e61804ae6380 - stable/14 - shm: Zero struct kinfo_file in sysctl handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e61804ae6380c8d1db4b8c43bf7821e5d31ca04e Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 19:35:27 +0000 Message-Id: <69bda17f.410c1.b37d0b9@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e61804ae6380c8d1db4b8c43bf7821e5d31ca04e commit e61804ae6380c8d1db4b8c43bf7821e5d31ca04e Author: Ed Maste AuthorDate: 2026-03-11 01:59:07 +0000 Commit: Ed Maste CommitDate: 2026-03-20 13:37:14 +0000 shm: Zero struct kinfo_file in sysctl handler Reported by: Calif.io in collaboration with Claude and Anthropic Research Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55806 (cherry picked from commit 25cc459286a02b646751541ccde5a33319471c73) (cherry picked from commit 6348a5fd0d4792e752cb714f2a536c3287b8d580) --- sys/kern/uipc_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index a07dd097f7b8..1fc398e93ae6 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2157,7 +2157,7 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) { struct shm_mapping *shmm; struct sbuf sb; - struct kinfo_file kif; + struct kinfo_file kif = {}; u_long i; int error, error2; From nobody Fri Mar 20 19:35:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fct803qCyz6Vxdg for ; Fri, 20 Mar 2026 19:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fct802Gj1z3kJq for ; Fri, 20 Mar 2026 19:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774035328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7BUbDCLsrW7Bg3Jxgy8unf46SXQD2rYC8iuH8BAoME=; b=LHDFZL86K7rY3OheG+HvXGDfCffoAFayh2RfqLixhWtWgqReYYvIzFJule5Pxa+ZMdo/9d aUw1EAMs6yMviLKgmSHq+cRYiqe2x/dPifq7cSE0hRFE/JPTzHttUfR+01/sRchxEz6zVQ dB8qJ3K8NvE9ty60CP/9XN4VNBvGE2hAr8AHUh3M5o+cs0dIXE8fz+4a6AiFhT1aVTHhgB wFVAcvpykudJTw3NlreWtkhGldyX1nlXhmT1j3gJbWVN4MQL47gEc8y0E63oqIpLEEZkLG yec2RUx7IfTMuPHJUJ40kppm50L9+vsZP0bluw5PhBDDB8yDztTdQiQ2yxU/nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774035328; a=rsa-sha256; cv=none; b=oRm+48WtEJ6fehdq6UABe2WCP7TM67Ef7seQ0mTppYpKOEugBq2G04p4xiNKmV0tJRHQJr Nw197jQXVcTTYmVtfFl6oyjtAxQ5jhgNRSutMuX8Ctp8IDH4gh27FaCnyNNYbzjmsI8c/w +3G+XClHopOzG0qreKvmCvZ54IkyVi+EsjZwEvqw6phFpV5g/tE5XsQ/4KZ8Dkjv9o2csO pt4wiL+zzIEUvYalji9HRWSOLseXkpbKe9W8bOd33OWr0l241htI1+TjKMH8keNBFSK2mO YmVdP7TWW86L2PB693/xs7tMUfUMgdRbtFG5DjtrL6CcJmrzgoPoSc60k5ElYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774035328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7BUbDCLsrW7Bg3Jxgy8unf46SXQD2rYC8iuH8BAoME=; b=Esj/QhccdFLyRassh3m0zO/T3+IfLVyqmGivuDx+NPVlfStmclWeDzQnKBP1hvn7zr5dJl 68e/zLMwyHN56R50OlGw+/+HuVWGmYbNxKNmn4YMwkW8raxjFJ2D/sgJ1W50vdCxgj0166 TGMnZL7NTp1IKuAfy8wVSr0NoLjvfQVnLhf5/EW0rHOi9Kenc253qDn3cWcXj5VOvJ8wvx Jysic+tPmhEf4UyLDEfDvSa2g2SZJWaggBjdkRYo14LrUGx3Cc2+F2l4SdoEvpK606IJqc HVoq7h4S4yZAbjRTFn6cdB1v/oQapgmgcS6GAy7Jryr7nwWBtEtkX0ucTGJvuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fct801ppBzgNF for ; Fri, 20 Mar 2026 19:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42acb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 19:35:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6a808cd75348 - stable/14 - compat32: Zero struct to avoid stack disclosure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a808cd7534802d30010fb0a7f46381ff9f6ef3f Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 19:35:28 +0000 Message-Id: <69bda180.42acb.19ce8d0@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6a808cd7534802d30010fb0a7f46381ff9f6ef3f commit 6a808cd7534802d30010fb0a7f46381ff9f6ef3f Author: Ed Maste AuthorDate: 2026-03-11 15:02:18 +0000 Commit: Ed Maste CommitDate: 2026-03-20 13:37:14 +0000 compat32: Zero struct to avoid stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55811 (cherry picked from commit 097cb4e9f0432c543c704cec712ce1cd3302335c) (cherry picked from commit 4551ea3b3f04650cd5300a9eae8994bdb080db91) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 13152d9d3588..df388a7d67d1 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -765,7 +765,7 @@ static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; + struct kevent32 ks32[KQ_NEVENTS] = {}; int i, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); From nobody Fri Mar 20 19:35:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fct814lmsz6VxLg for ; Fri, 20 Mar 2026 19:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fct812zyDz3kR2 for ; Fri, 20 Mar 2026 19:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774035329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BqCALavGZXSmkczhMPKj1kW21f+F6zI+qLHLaoqL9o=; b=IFbFGvzW8x/abnyKHKzb2zQN5x8Pu7sFnvthAqQy+CDLNYUKqdbZ229Vps8gmSPnCxscYN 47YEkdcRBt8hCg6tCkuPkGXjPnqtIbKb+qHos02QG7V1BPKUMgNmodWVTOloIR8cSjPWfu 4h8uNWTe1OifHsSaTC2GTjzfDmJfG0ULKn9bUrLGi9gbDipyVgO72oflPs4N0ugFUuoA1u D/EpAc7wmk6cYfuuUnGrqXqiH6YCCGyHtMUU2aUP/GLJ938TgHCgkpgniGiHN5rAmVhPn6 3PVAHg8pAEO7XqtTf8jk9CDJ9CW0QJ99CHW/TF8wLOK5DpI0gUB4tS7a5jysVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774035329; a=rsa-sha256; cv=none; b=Srwr2JyNEg1yZAhMoGErVSbTOiqMUSVD6yVhFmIeiI5CPgLyI3NSKQ3+SW7wAgtWFnwRRL BsSTQPMJmmUe9F3qcMDuhKz+oug/pAqqvclHqC2gU353S/BYIoMd192cWA+CN0kY1YUT7s neX5LGQzPLFED4ZRjf6Z/jFDkgqpIIXGfGZeo6GSgPcaK+LNaFoyj8HV5sjErpXYNRCkwT cvlNGdgqVWWNh/2GBVxTxAKtfhmPsDoUuAS8vpw+WBwwwdIImYiESWIje2v4lBLNlKtMhw Q8ph8qjsCVKhlP6TKtSIScnFqQRvFkSI6ZVOkfcqVNNLAuYnqtmVqgSb1Z8jew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774035329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BqCALavGZXSmkczhMPKj1kW21f+F6zI+qLHLaoqL9o=; b=X9T0Dn8pelKNhoIcjLebtegz+Ca2ylsOXfCaT5ZOuVe1NmMaV2SisgIkzoi9X4QpRBA18T 92nwJMuug93BBkDrwdVDVHkezk675t0VmmivrMm76q74kFWIfumavVvA9oL3ZOvfNak/0O 2reQY34F3tVG+cOtcfxYV1caS8/ca0zbvHABZLfvJ+cCsHMUGR/PrcZtb+jvQWEnt244FN VrM4jr1fuoPKcIyUM1Nl9BsZLjBiFWGXbUriLUaNO0m1SbpIlhaAEFM4MVDtH/y7c2Ask2 nlaHKgqd8gkC4Wm29SGqggyN8Sb2/pxw3bnwlnfRJ+/XmvD24IJ/p6Q6qezCAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fct812ZSzzgNG for ; Fri, 20 Mar 2026 19:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43252 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 19:35:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a347e6e20e75 - stable/14 - compat/linux: Avoid waitid() kernel stack disclosure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a347e6e20e75ad6224afefcf650ef738c3de094d Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 19:35:29 +0000 Message-Id: <69bda181.43252.108fdfa6@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a347e6e20e75ad6224afefcf650ef738c3de094d commit a347e6e20e75ad6224afefcf650ef738c3de094d Author: Ed Maste AuthorDate: 2026-03-10 13:53:46 +0000 Commit: Ed Maste CommitDate: 2026-03-20 13:37:14 +0000 compat/linux: Avoid waitid() kernel stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55812 (cherry picked from commit 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd) (cherry picked from commit 9f8db9cc67fb86eeb2b645ce7f8aa748e99241a9) --- sys/compat/linux/linux_misc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 2ae10a487813..00ab48e8781b 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -748,6 +748,7 @@ linux_common_wait(struct thread *td, idtype_t idtype, int id, int *statusp, error = linux_copyout_rusage(&wru.wru_self, rup); if (error == 0 && infop != NULL && td->td_retval[0] != 0) { sig = bsd_to_linux_signal(siginfo.si_signo); + memset(&lsi, 0, sizeof(lsi)); siginfo_to_lsiginfo(&siginfo, &lsi, sig); error = copyout(&lsi, infop, sizeof(lsi)); } From nobody Sat Mar 21 06:38:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fd8rd47XSz6WhS4 for ; Sat, 21 Mar 2026 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fd8rd2g4wz3pnJ for ; Sat, 21 Mar 2026 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774075089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AIgT93PYqGuP8UbEGpRMre0RkPQIdgfcorhCn14SxC4=; b=CNt2LDCC9ML/sn3HHMbXzg4QUMPzWaw9c8ahQuUeTcj0AGjwFT4iajkYuIpDwMoMQ7c3wI ODTDCCXKv365t9DLlVDZKypYeA58KA+TYNJWZh4pOtg9+YtR9wj+akdwmALB7SvgrYLnCO 40ONYvN3Oz5xrZI8xBmZKeNhjWM282zojYXRxfK7TWgiFKaF5Km4D03A/Njbyy2fkNapSW zLZolEYcvdv/L/sP6Cr/GCr4AKdkPsc7MNcRldl80TeMIafNJlrI+DXLMQCWV8DnTVDe4k 6JlVYCKc4RFS+SOSL1bRp0fAbADIoDV+2MtKct2meIYlLMAX43BniZ5sHsqqRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774075089; a=rsa-sha256; cv=none; b=dSUBHZGio7Agrt7lkBHe/5imxPNsH3I2e7FbTpi52gBVHRerwIwUNUvIMqK59OOi2zCruy XNUfEfUs8YSswF95JCjmQ+oMlI25WiyoxrxMUSE53acJEfWU6DBrO7dBFPl3u6qKe0OmK8 DCPb6WeExJtjjl8SY7YXylyqKIYcYPKk6pV4hA8TQv8pELcp6fe8/5HmOtEhd16I8FWi6t etpcwgu6Eqf7MKHjGVa4YZivdgyw/hYZea4pnr3V+h0A4VVpx6lPuNiGqpJS6t0a+rHPGw 9VfoI4c/KbIVsqkxuNWOmMCa7oZhYYE6ABt2UsIW/w+8/i/fmsVgFq/6AjOEiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774075089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AIgT93PYqGuP8UbEGpRMre0RkPQIdgfcorhCn14SxC4=; b=V0ZngjXtX/liC/bplVyBH2lI5F+vpxAan8xQ8c152t+nfneCGCFIXQZuS1mU696X41qnap qFPNPN1MmbVcuq5hQXpyVmaoXu8hbY+yURoUlZxFoAyEyH6y8KmLPzKsyco+QEStCGd1rW tG35EIpk33FPoswt2skLrHF5A98rvDp40JROP83+utd9Y4t0hav+WRUn16JrrQNPg3RIqE KLnCw/aC7rDMrsPeGPjB144FIV01keEA0d6kDRO+fd3uy0vus24kPJnOHTTnj0ERG4SXF4 FOPBJkmGsafBqoOZH2r8MmDh0q9By9vRqm/xVKnJ2xv03UQtOpl6dIF2rsxrZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fd8rd28nBz11Fx for ; Sat, 21 Mar 2026 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Mar 2026 06:38:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: 81d2c7d3e102 - stable/15 - alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 81d2c7d3e1025d05e9d0e24014e13c7953739755 Auto-Submitted: auto-generated Date: Sat, 21 Mar 2026 06:38:09 +0000 Message-Id: <69be3cd1.38d23.fd8ec50@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=81d2c7d3e1025d05e9d0e24014e13c7953739755 commit 81d2c7d3e1025d05e9d0e24014e13c7953739755 Author: Aymeric Wibo AuthorDate: 2026-02-19 14:47:06 +0000 Commit: Aymeric Wibo CommitDate: 2026-03-21 06:37:09 +0000 alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS Refer to alloca() as a (builtin) function or macro, as it could be defined as either depending on the compiler. Paragraph about bug comes from Darwin's libc, and example added to illustrate it. Reviewed by: bnovkov Approved by: bnovkov MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc (partially) Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55370 (cherry picked from commit 4da237aee328f368cd85b659854c4556a39f15ef) --- share/man/man3/alloca.3 | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/share/man/man3/alloca.3 b/share/man/man3/alloca.3 index fd88014dbb33..9e905d4487f3 100644 --- a/share/man/man3/alloca.3 +++ b/share/man/man3/alloca.3 @@ -1,5 +1,6 @@ .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2026 Aymeric Wibo .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 29, 2025 +.Dd February 19, 2026 .Dt ALLOCA 3 .Os .Sh NAME @@ -38,16 +39,14 @@ .Sh DESCRIPTION The .Fn alloca -function -allocates +function or macro allocates .Fa size bytes of space in the stack frame of the caller. This temporary space is automatically freed on return. .Sh RETURN VALUES -The .Fn alloca -function returns a pointer to the beginning of the allocated space. +returns a pointer to the beginning of the allocated space. .Sh SEE ALSO .Xr brk 2 , .Xr calloc 3 , @@ -55,24 +54,20 @@ function returns a pointer to the beginning of the allocated space. .Xr malloc 3 , .Xr realloc 3 .Sh HISTORY -The .Fn alloca -function appeared in +appeared in .At 32v . .\" .Bx ?? . .\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd .\" The first man page (or link to a man page that I can find at the .\" moment is 4.3... .Sh BUGS -The .Fn alloca -function is machine and compiler dependent; its use is discouraged. .Pp -The .Fn alloca -function is slightly unsafe because it cannot ensure that the pointer +is slightly unsafe because it cannot ensure that the pointer returned points to a valid and usable block of memory. The allocation made may exceed the bounds of the stack, or even go further into other objects in memory, and @@ -81,3 +76,26 @@ cannot determine such an error. Avoid .Fn alloca with large unbounded allocations. +.Pp +The use of C99 variable-length arrays and +.Fn alloca +in the same function will cause the lifetime of +.Fn alloca Ns 's +storage to be limited to the block containing the +.Fn alloca . +For example, in the following snippet, +.Va p Ns 's +lifetime does not extend outside of the block, whereas it would've if +.Va vla +hadn't been defined or had been defined as a fixed-length array: +.Bd -literal -offset indent +char *p; +{ + const int n = 100; + int vla[n]; + p = alloca(32); + strcpy(p, "Hello, world!"); + printf("Inside: %s\\n", p); /* Valid. */ +} +printf("Outside: %s\\n", p); /* Undefined. */ +.Ed From nobody Sun Mar 22 01:51:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdfRD3kSnz6VCHH for ; Sun, 22 Mar 2026 01:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdfRD3DD1z3x4v for ; Sun, 22 Mar 2026 01:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774144280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49LwEeCGGuCW1qrmy02lOvZNmvltM6pKa49LR+MZz9I=; b=x1kimnW+7zDqRD2ivnfnCT+BGajb7j5V8cCzUoUvVHVJfK1/mqJk4RYJcjUznmcgwp4lds yBannG4FqSzCk9OMlDutY680rpTBc1a3xbXmIzM+GiEqYV44Y28Movi+Wke1+y++FmFP/4 W7MpN/EH3ZMnXON1GOj2gXP4W4j5u3RTLqAcDxdVQPmEDWdrcQYHuERlORwz8E8UCvhG9S 7tOTV9b0m0shGEVqzZguhDS906w2S7m3MlbVhCaN7QOX7LoNBtolxWqAMlQsncHoeN/ZsE weYtcWT3z2IxcNGUeQdhEA4ZrzK/MxF8cQQ1TRRi4YhX4aZAKgdz+LFeAflQCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774144280; a=rsa-sha256; cv=none; b=ihvJLVSGpVVN8rnae4/ZtliBoFKQtM94RnOErEwImvz5/tIwrLi+V5DisdNBqiYCTN9Bcb 9WWHl5QoGFall6p9Fk4Xh21p8UY50AzvlqKOH7p/eTyCgc+Tg/1xZ15119va7nuJ6LojZ4 qMQyx+taeAQntYKghh0p/nQRurwJUUjka0laK4I09ApNXhgUza+0nXukpdgnxC+CSH3wr0 6NYh2CCtAAaueoAKZeFHVDTl6ijaNUI0ZU3igLFVHRPDmBENglbKwtpV8mwUJsaDbzy4rB OdhDMC5Lm5KU/DqS12rBMtTWmPk/ngFupUygLmbdC6sgW5h8k/0hu7m9dgjGPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774144280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49LwEeCGGuCW1qrmy02lOvZNmvltM6pKa49LR+MZz9I=; b=nKHJ2Yecu9ObsEMEet16AahU8UPWxSQ2dBbVYjHEVXlyipU2Tchw8cPjy22+v6YYCEv1HT wkDtBlSuZ1QsXGvwyDPdn0ITVVv9wj2opbKFcjel2wBRgNgjmg8n+eW6ek17N9W2kRqWUy T/epxNzOQ0iiGzl/qRf0g02YIDGJyP+U1qg4SNw1U+kXQ3TJjMF22xMdgnNh+lxYgVwOs7 AWry5TorhUB0hAsfWMqwsWv0oWo28ggdWLqFpnsEUOu1MCKZE8TK93ehiGZyXOgeyZ3OvM 3VgQZKmbqbjDAaMl1/YXe5sRAX5yP8TrrLul9xrsCfwESII0ot+xXW2pvxkr2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdfRD2hSrzfdc for ; Sun, 22 Mar 2026 01:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43a0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 01:51:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: b2fc2556c1ea - stable/15 - nfs_clstate.c: Handle the same stateid case correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: b2fc2556c1eae29eb58529800ed0a213740df4e6 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 01:51:20 +0000 Message-Id: <69bf4b18.43a0b.6eaa7c54@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b2fc2556c1eae29eb58529800ed0a213740df4e6 commit b2fc2556c1eae29eb58529800ed0a213740df4e6 Author: Rick Macklem AuthorDate: 2026-03-08 21:09:36 +0000 Commit: Rick Macklem CommitDate: 2026-03-22 00:49:33 +0000 nfs_clstate.c: Handle the same stateid case correctly When an NFSv4.1/4.2 sarver upgrades a read delegation to a write delegation, it does not need to change the delegation's stateid. Without this patch, a DELEGRETURN of the stateid was done for the case where the delegation stateid had not changed. This return was bogus, since the delegation stateid now represents the new write delegation. This patch fixes the priblem by checking for "same stateid" and only doing the DELEGRETURN when it is not the same. PR: 289711 (cherry picked from commit 016570c4463d5908953355ee1cf9a385ad9601b4) --- sys/fs/nfsclient/nfs_clstate.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 712d49c7160c..6dc97142b77f 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -433,9 +433,11 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, { struct nfscldeleg *tdp; struct nfsmount *nmp; + bool trydelegret; KASSERT(mp != NULL, ("nfscl_deleg: mp NULL")); nmp = VFSTONFS(mp); + trydelegret = false; /* * Since a delegation might be added to the mount, @@ -467,6 +469,9 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, * Read delegation. Otherwise, return the new delegation. */ if (dp != NULL) { + if (NFSBCMP(dp->nfsdl_stateid.other, + tdp->nfsdl_stateid.other, NFSX_STATEIDOTHER)) + trydelegret = true; if ((dp->nfsdl_flags & NFSCLDL_WRITE) != 0 && (tdp->nfsdl_flags & NFSCLDL_READ) != 0) { TAILQ_REMOVE(&clp->nfsc_deleg, tdp, nfsdl_list); @@ -485,7 +490,8 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, } NFSUNLOCKCLSTATE(); if (tdp != NULL) { - nfscl_trydelegreturn(tdp, cred, nmp, p); + if (trydelegret) + nfscl_trydelegreturn(tdp, cred, nmp, p); free(tdp, M_NFSCLDELEG); } return (0); From nobody Sun Mar 22 01:55:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdfWy0Vf3z6VC1l for ; Sun, 22 Mar 2026 01:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdfWx6VYRz3xnd for ; Sun, 22 Mar 2026 01:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774144525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IF+yUw4pMqZptwbHNoSPxNJcr35bkZMs2pDggDJbBCU=; b=KUD+6D1GhBWSGwPTEuH6xzP0qQ9xr+gpSRsv0bJ64iQfQasTe933z4nHpiM9A6l+euGQjx nlrP/ktOBK9SPOpZPVzi6KrZulwmjr6q4Y6k59RiqB7XqUhcOGtn4UMBVdDF0UONt5Kbu1 3tqUp6r7WbyNy5e0llVSSzybY8aqhBYb5roW/zjv2rthLPntzE+u2BWUpZQwkxHR9jioWf aeJq1MVUmRgQWLSQuFeqD0OYCAJspxJ9cpUVAYxPwm9vnpvQQGrnmDAGDz+h8qfhp+6sFd rky+0MWENg+JoIair/1bkeICWn7YHWzzfX9/MzchmJpNAzBTZ8+mgnBJkcnVIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774144525; a=rsa-sha256; cv=none; b=OohjAnCyxWRTNvgwWHHC2K4R3oFDbPz8atYHmdnCLk+jHLMk82LssLwNlNQVwa0SWdlaH5 Ue/KpdZ2YrDkVIxIoLjAwd+5EjpSHr0cuTM5oniRE8Zgd2QOQjNQm6ycZwb27PlZ5JVe9q APLptkUz8fXXfGpPey0Ti8n8IDeXqqR0xJdcdLZIuk+WJdruq2H1Bgd90rbnDSNikfk0f/ nv/RZHBuWyLL/JZCWC7Fatsnv/qUksUJ0NvN8pO42pCeccq8HSi/q0KYr/Rqdyr9QbSuWa QpqTdQ7UKnP4hBW0DYxkPHc0i3vcM40rEX9hnIOFCRZDvD3s/G3Ph/YhfIuuNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774144525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IF+yUw4pMqZptwbHNoSPxNJcr35bkZMs2pDggDJbBCU=; b=wOOv9YXjx4043O1k/WxWL7QiffwY4C8rcujq+3Tio8vUy2f5XO9nfYgoIGEptvzeuFkfOY 9HUJ+nfYB6UUI9DBVG6a/hZjM6UqsGYACisTJJSyH4xyzT+JjFYQDuYyW4V1yLak0Oe7GK NzcPreZvDO8Suv0qiTZzU6vfF8D2BX271L1CnPQBqa5IMDG6t0WO97yYD6UsYU4z8b/fZv 63zo82Y3HCxs99pj24ulFA4i28sNRL47eWU2t/QMj3VItvYaeexVnDPz5TeeEAIaYUyHcB Ou3DA/f5I4zc3cyzdGSp5MftiFkVProgzoNVMmwVe8fOje3/YQEBDcAc+NRkxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdfWx63DRzfmw for ; Sun, 22 Mar 2026 01:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 435c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 01:55:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d288383b4d80 - stable/14 - nfs_clstate.c: Handle the same stateid case correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: d288383b4d80e4b5e1bac09722e63d27074f4244 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 01:55:25 +0000 Message-Id: <69bf4c0d.435c9.41917522@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d288383b4d80e4b5e1bac09722e63d27074f4244 commit d288383b4d80e4b5e1bac09722e63d27074f4244 Author: Rick Macklem AuthorDate: 2026-03-08 21:09:36 +0000 Commit: Rick Macklem CommitDate: 2026-03-22 00:53:32 +0000 nfs_clstate.c: Handle the same stateid case correctly When an NFSv4.1/4.2 sarver upgrades a read delegation to a write delegation, it does not need to change the delegation's stateid. Without this patch, a DELEGRETURN of the stateid was done for the case where the delegation stateid had not changed. This return was bogus, since the delegation stateid now represents the new write delegation. This patch fixes the priblem by checking for "same stateid" and only doing the DELEGRETURN when it is not the same. PR: 289711 (cherry picked from commit 016570c4463d5908953355ee1cf9a385ad9601b4) --- sys/fs/nfsclient/nfs_clstate.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index bbfcd96408c2..7d0d5e2120bb 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -433,9 +433,11 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, { struct nfscldeleg *dp = *dpp, *tdp; struct nfsmount *nmp; + bool trydelegret; KASSERT(mp != NULL, ("nfscl_deleg: mp NULL")); nmp = VFSTONFS(mp); + trydelegret = false; /* * Since a delegation might be added to the mount, @@ -468,6 +470,9 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, * Read delegation. Otherwise, return the new delegation. */ if (dp != NULL) { + if (NFSBCMP(dp->nfsdl_stateid.other, + tdp->nfsdl_stateid.other, NFSX_STATEIDOTHER)) + trydelegret = true; if ((dp->nfsdl_flags & NFSCLDL_WRITE) != 0 && (tdp->nfsdl_flags & NFSCLDL_READ) != 0) { TAILQ_REMOVE(&clp->nfsc_deleg, tdp, nfsdl_list); @@ -489,7 +494,8 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, } NFSUNLOCKCLSTATE(); if (tdp != NULL) { - nfscl_trydelegreturn(tdp, cred, nmp, p); + if (trydelegret) + nfscl_trydelegreturn(tdp, cred, nmp, p); free(tdp, M_NFSCLDELEG); } return (0); From nobody Sun Mar 22 08:05:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplN6khJz6W9DK for ; Sun, 22 Mar 2026 08: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplN62Ftz3YfK for ; Sun, 22 Mar 2026 08: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=1774166752; 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=cLEJuZWe2n2QemnkvQHfPYF35uHk2XanJ4RsZBlIcWU=; b=plrOmG+ADnne+wsi1Ou52UjU0g5SihgEcF7EXX0ydZBJDuyZPwAqIqWLleKoYib/ld6b3U /ro2F9IA47naVKAqchfkED9dW7QYKKAIkkuA8Jb/y8XUDNWHhm+DcCChJyZ3BJ0aW93FLn G1UXmE8GT9xRGRlq6+K+kHqLmf/EIK6DlJaTWBu0GWNV1UWRkJ83r8OhdwBaYRUZkQ5uWm VWDokUunjrsuqwWpefyySry1rRDKQni3KogGjKM68pDzu3GYD3aAvopeXOBzE8w0Dh870w hqVo9KDVy47mIuDjHlz5l7W2mlX2mhtKCqUqPqTIewPqzA2tWDZ7bxt6blRrTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166752; a=rsa-sha256; cv=none; b=v08sqqgveF7tFljg/9CU8jpGNnHHb/C5v3ZTq161EI6e9mGHAi3StZ6sGkDqPCQ/0PicA+ 3kthjWjhR0z5RE9iV/94t2q3JMLZi4O0uraeiP/XoWPxGTQNLq5xHjDsIN0SyXsbJ6V7Tw meOrxQOD3rkQDTIc5wC3JjmVFHCrBEmFR5ffC7CudoWqevAosRzZqOTODQmHPcExbz2ADk 2fSu+CFY0cBR7F2p02BeNZ4hbzIDk+PuuSxlTlQ7Dq4ExkdutMrV42H3RcM5DUxLHgOrYA +s9ZCJZKeg1CIwjZEQwZkypotDNv3Hc/RI3aCnxLpXu3ILNlu3ayvBnvGX5Kkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166752; 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=cLEJuZWe2n2QemnkvQHfPYF35uHk2XanJ4RsZBlIcWU=; b=LD6p9gleDz1/VgJxyuJrXvvpeXubSm/ow5HOxUPUbKSVAW+NgYN0XW4db5Yi/TFrVdtok1 5CapohMQZsQInOi4Fn/bWN9iN+7q1xJnEb5nfIePrV+HJm+hmLkKPeca1+nU3BCJ9RikoT QSIPg3LLxeBwkVqvdFjmaz/KFNp4h5RPBEUBM+HO3Zgob77lsyQHG2DdOHd1f4ZisueV++ kwsEmPGfzmxWxNJRcnwh5nryIYwykFS68dGF1k7Uw0ITfMjoowOM6FeTjnXQkUDIgLGkLS +VbEze78VDtDuhc+B/YacMi/6mudQ8PeIJSYQ8Eh85trNL42LkQ7qkOVZBQv/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplN5H02zqvg for ; Sun, 22 Mar 2026 08:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1beeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 898db3e2978b - stable/15 - diff3: fix diff3 -A List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 898db3e2978b154949fb64dee302cbfe4f10d497 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:52 +0000 Message-Id: <69bfa2e0.1beeb.a38f6eb@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=898db3e2978b154949fb64dee302cbfe4f10d497 commit 898db3e2978b154949fb64dee302cbfe4f10d497 Author: Baptiste Daroussin AuthorDate: 2026-02-13 08:33:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:58 +0000 diff3: fix diff3 -A for cases where file2 differs but file1 and file3 agrees, the code stored the file2 and file3 line numbers in the de[] editing script entries but used them as if they were file1 line numbers. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D55276 (cherry picked from commit 8d442cf32e4fb29fbb85090ac29d32d1e30fd824) --- usr.bin/diff3/diff3.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index d010a0b1d067..4f3239b10625 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -118,6 +118,7 @@ static struct diff *d23; */ static struct diff *de; static char *overlap; +static int *de_delta; /* file1-file3 line number delta per edit */ static int overlapcnt; static FILE *fp[3]; static int cline[3]; /* # of the last-read line in each file (0-2) */ @@ -365,6 +366,7 @@ merge(int m1, int m2) d1 = d13; d2 = d23; j = 0; + int f1f3delta = 0; for (;;) { t1 = (d1 < d13 + m1); @@ -383,6 +385,8 @@ merge(int m1, int m2) } else if (eflag == EFLAG_OVERLAP) { j = edit(d2, dup, j, DIFF_TYPE1); } + f1f3delta += (d1->old.to - d1->old.from) - + (d1->new.to - d1->new.from); d1++; continue; } @@ -394,9 +398,10 @@ merge(int m1, int m2) change(3, &d2->new, false); change(2, &d2->old, false); } else if (Aflag || mflag) { - // XXX-THJ: What does it mean for the second file to differ? - if (eflag == EFLAG_UNMERGED) + if (eflag == EFLAG_UNMERGED) { j = edit(d2, dup, j, DIFF_TYPE2); + de_delta[j] = f1f3delta; + } } d2++; continue; @@ -436,6 +441,8 @@ merge(int m1, int m2) j = edit(d1, dup, j, DIFF_TYPE3); } dup = false; + f1f3delta += (d1->old.to - d1->old.from) - + (d1->new.to - d1->new.from); d1++; d2++; continue; @@ -723,7 +730,7 @@ Ascript(int n) prange(old, deletenew); printrange(fp[2], new); } else { - startmark = new->to - 1; + startmark = new->to - 1 + de_delta[n]; printf("%da\n", startmark); printf("%s %s\n", newmark, f3mark); @@ -811,7 +818,9 @@ mergescript(int i) else if (de[n].type == DIFF_TYPE3 && (old->from == old->to)) { r.from = old->from - 1; r.to = new->from; - } else + } else if (de[n].type == DIFF_TYPE2) + r.to = new->from + de_delta[n]; + else r.to = old->from; printrange(fp[0], &r); @@ -859,7 +868,9 @@ mergescript(int i) exit(EXIT_FAILURE); } - if (old->from == old->to) + if (de[n].type == DIFF_TYPE2) + r.from = new->to + de_delta[n]; + else if (old->from == old->to) r.from = new->to; else r.from = old->to; @@ -870,7 +881,7 @@ mergescript(int i) * additions to this file should have been handled by now. * * If the ranges are the same we need to rewind a line. - * If the new range is 0 length (from == to), we need to use the old + * If the new range is 0 length (from == to), we need to use the new * range. */ new = &de[n-1].new; @@ -879,7 +890,7 @@ mergescript(int i) if (old->from == new->from && old->to == new->to) r.from--; else if (new->from == new->to) - r.from = old->from; + r.from = new->from; r.to = INT_MAX; printrange(fp[2], &r); @@ -891,6 +902,7 @@ increase(void) { struct diff *p; char *q; + int *s; size_t newsz, incr; /* are the memset(3) calls needed? */ @@ -917,6 +929,11 @@ increase(void) err(1, NULL); memset(q + szchanges, 0, incr * 1); overlap = q; + s = reallocarray(de_delta, newsz, sizeof(*s)); + if (s == NULL) + err(1, NULL); + memset(s + szchanges, 0, incr * sizeof(*s)); + de_delta = s; szchanges = newsz; } From nobody Sun Mar 22 08:05:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplQ12gTz6W97j for ; Sun, 22 Mar 2026 08: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplP63Mbz3Z28 for ; Sun, 22 Mar 2026 08: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=1774166753; 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=LZVucrf3rA1imnKFyojqArW4rwazMt0xz+h+H+/cLjk=; b=jz0SBMaeWbbzN2Ic2jtVzlTJH/YpeXxQR4jxNIna/30gWAhkRPScsWnndv0bKNYRNiYyaT pqa3ki3EghI4F8yDGpE/4OIcRWSkS2hVmXJAcc+2QXmRbEyUjnkQ9oCNXpEljG0j4euWiR WCjowofqltN9TPMCgI/U3o6ojHtTOwGdA6LvzPj9joUDJsdBk7QDskGsVbT+3ikY2/YBmH IZ0ho02JyOn+B3Z8OApTebgSOAlk1LgosYfOudwFOzCpJzCfP+4m3C0XRRNK6ewtGXITpM 6bJAwiBWurjNYMzlej2F1z19/aANDkX1zA1YJE4E62HkPGRP+Y28G/gTmXGerw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166753; a=rsa-sha256; cv=none; b=BrgrtuUvHFgaf3HacmEGfU9R4ipv9srWGDZ7Lad4hm8Rq4sn6luDZ5RLew7vU5mqWKilaf Dm+9qTJgG4sGCY6cYUUzuIjfxYSLWg6QauiFvNLdRleNLysHozECfxDImmRW0bNVvUoK8R Hqv/46aZZoY9WuJmQpNFyk0piECSohAqoXOEx2nxoYLS14AvuXGegd96OwNOsh3KOC6MwM hT7S3UQ/YhLRjU6K/orRah0iMw6Z2O6Hn9qYdYPZLEggpSqsRsaP3XSfQJeynBod1rVk1E CjW5ajZVPzG5fU6JH3UF2b5k2/yv870M0sRIQeOCxNeaTrPG+PGIOHuOFuYVSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166753; 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=LZVucrf3rA1imnKFyojqArW4rwazMt0xz+h+H+/cLjk=; b=psrVo8iBnP3MKs6tVE6MG8wScdiIP3UiKfIwBNRL9ACqyTtHoSsFEb7thLGRhV5Ylf/rKr 16tvJTdzzftg7ohnftv4M/drplDyRavAFKafyajqSILdc4FQdhq3kGCu3+xPS9UyGR4cLU +n40wzYhaWw5PpCEKceLLQAE6xL39xBEr6g5DLfl7TNwH/dUUp57aOay7ImR6QtQtsx8FX NrogFgEEGsr4OEh6u6+cxnhUaHDsK2LbH84fM5y43Q9zzV7sw8HPfFm+Dr7y2PjmBUAxTc 49blSSbRRw5KszwSOnDOsiDG24mbmueUNjGf7hu3l7ObhthsCwg6I4JaSFwcrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplP5FSQzqTY for ; Sun, 22 Mar 2026 08:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19152 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a6f17dd2430b - stable/15 - diff3: fix merge mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a6f17dd2430b92b88a98f10ed35936e7e80f636b Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:53 +0000 Message-Id: <69bfa2e1.19152.e70e0ab@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a6f17dd2430b92b88a98f10ed35936e7e80f636b commit a6f17dd2430b92b88a98f10ed35936e7e80f636b Author: Baptiste Daroussin AuthorDate: 2026-02-13 16:10:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:58 +0000 diff3: fix merge mode Make the merge mode compatible with GNU diff3 Add tests for all the changes, those tests are extracted from the etcupdate testsuite. This version passes the etcupdate testsuite and the diffutils diff3 test suite. MFC After: 1 week (cherry picked from commit 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b) --- usr.bin/diff3/diff3.c | 51 ++++++++++++++++++------------------ usr.bin/diff3/tests/Makefile | 16 ++++++++++- usr.bin/diff3/tests/conflict1.txt | 5 ++++ usr.bin/diff3/tests/conflict2.txt | 9 +++++++ usr.bin/diff3/tests/conflict3.txt | 5 ++++ usr.bin/diff3/tests/diff3_test.sh | 45 ++++++++++++++++++++++++++++--- usr.bin/diff3/tests/passwd-Em.out | 16 +++++++++++ usr.bin/diff3/tests/passwd-new.txt | 12 +++++++++ usr.bin/diff3/tests/passwd-old.txt | 11 ++++++++ usr.bin/diff3/tests/passwd-test.txt | 15 +++++++++++ usr.bin/diff3/tests/simple-Em.out | 3 +++ usr.bin/diff3/tests/simple-merge.out | 3 +++ usr.bin/diff3/tests/simple1.txt | 2 ++ usr.bin/diff3/tests/simple2.txt | 2 ++ usr.bin/diff3/tests/simple3.txt | 3 +++ 15 files changed, 168 insertions(+), 30 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 4f3239b10625..9a01951e60ab 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -150,7 +150,7 @@ static void repos(int); static void separate(const char *); static void edscript(int) __dead2; static void Ascript(int) __dead2; -static void mergescript(int) __dead2; +static void mergescript(int, int) __dead2; static void increase(void); static void usage(void); static void printrange(FILE *, struct range *); @@ -361,12 +361,13 @@ merge(int m1, int m2) { struct diff *d1, *d2, *d3; int j, t1, t2; + int f1f3delta; bool dup = false; d1 = d13; d2 = d23; j = 0; - int f1f3delta = 0; + f1f3delta = 0; for (;;) { t1 = (d1 < d13 + m1); @@ -382,6 +383,12 @@ merge(int m1, int m2) change(1, &d1->old, false); keep(2, &d1->new); change(3, &d1->new, false); + } else if (mflag) { + j++; + de[j].type = DIFF_TYPE1; + de[j].old = d1->old; + de[j].new = d1->new; + overlap[j] = 0; } else if (eflag == EFLAG_OVERLAP) { j = edit(d2, dup, j, DIFF_TYPE1); } @@ -437,6 +444,14 @@ merge(int m1, int m2) change(2, &d2->old, false); d3 = d1->old.to > d1->old.from ? d1 : d2; change(3, &d3->new, false); + } else if (mflag) { + j++; + de[j].type = DIFF_TYPE3; + de[j].old = d1->old; + de[j].new = d1->new; + overlap[j] = !dup; + if (!dup) + overlapcnt++; } else { j = edit(d1, dup, j, DIFF_TYPE3); } @@ -468,7 +483,7 @@ merge(int m1, int m2) } if (mflag) - mergescript(j); + mergescript(j, f1f3delta); else if (Aflag) Ascript(j); else if (eflag) @@ -701,7 +716,7 @@ edscript(int n) if (iflag) printf("w\nq\n"); - exit(eflag == EFLAG_NONE ? overlapcnt : 0); + exit(oflag ? overlapcnt > 0 : 0); } /* @@ -795,11 +810,10 @@ Ascript(int n) * inbetween lines. */ static void -mergescript(int i) +mergescript(int i, int f1f3delta) { struct range r, *new, *old; int n; - bool delete = false; r.from = 1; r.to = 1; @@ -812,13 +826,9 @@ mergescript(int i) * Print any lines leading up to here. If we are merging don't * print deleted ranges. */ - delete = (new->from == new->to); - if (de[n].type == DIFF_TYPE1 && delete) - r.to = new->from - 1; - else if (de[n].type == DIFF_TYPE3 && (old->from == old->to)) { - r.from = old->from - 1; - r.to = new->from; - } else if (de[n].type == DIFF_TYPE2) + if (de[n].type == DIFF_TYPE1) + r.to = old->to; + else if (de[n].type == DIFF_TYPE2) r.to = new->from + de_delta[n]; else r.to = old->from; @@ -826,9 +836,7 @@ mergescript(int i) printrange(fp[0], &r); switch (de[n].type) { case DIFF_TYPE1: - /* If this isn't a delete print it */ - if (!delete) - printrange(fp[2], new); + /* Content included in "between" printing from fp[0] */ break; case DIFF_TYPE2: printf("%s %s\n", oldmark, f2mark); @@ -870,8 +878,6 @@ mergescript(int i) if (de[n].type == DIFF_TYPE2) r.from = new->to + de_delta[n]; - else if (old->from == old->to) - r.from = new->to; else r.from = old->to; } @@ -879,18 +885,11 @@ mergescript(int i) /* * Print from the final range to the end of 'myfile'. Any deletions or * additions to this file should have been handled by now. - * - * If the ranges are the same we need to rewind a line. - * If the new range is 0 length (from == to), we need to use the new - * range. */ new = &de[n-1].new; old = &de[n-1].old; - if (old->from == new->from && old->to == new->to) - r.from--; - else if (new->from == new->to) - r.from = new->from; + r.from -= f1f3delta; r.to = INT_MAX; printrange(fp[2], &r); diff --git a/usr.bin/diff3/tests/Makefile b/usr.bin/diff3/tests/Makefile index 864f27beede8..e35ab095f2f7 100644 --- a/usr.bin/diff3/tests/Makefile +++ b/usr.bin/diff3/tests/Makefile @@ -23,6 +23,20 @@ ${PACKAGE}FILES+= \ long-A.out \ long-merge.out \ fbsdid1.txt \ - fbsdid2.txt + fbsdid2.txt \ + conflict1.txt \ + conflict2.txt \ + conflict3.txt \ + conflict-merge.out \ + simple1.txt \ + simple2.txt \ + simple3.txt \ + simple-merge.out \ + simple-Em.out \ + conflict-Em.out \ + passwd-test.txt \ + passwd-old.txt \ + passwd-new.txt \ + passwd-Em.out .include diff --git a/usr.bin/diff3/tests/conflict1.txt b/usr.bin/diff3/tests/conflict1.txt new file mode 100644 index 000000000000..d5bde7598f68 --- /dev/null +++ b/usr.bin/diff3/tests/conflict1.txt @@ -0,0 +1,5 @@ +# root: me@my.domain + +# Basic system aliases -- these MUST be present +MAILER-DAEMON: postmaster +postmaster: root diff --git a/usr.bin/diff3/tests/conflict2.txt b/usr.bin/diff3/tests/conflict2.txt new file mode 100644 index 000000000000..9afb26959e35 --- /dev/null +++ b/usr.bin/diff3/tests/conflict2.txt @@ -0,0 +1,9 @@ +#root:me@my.domain + +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root + +#Generalredirectionsforpseudoaccounts +_dhcp:root +_pflogd:root diff --git a/usr.bin/diff3/tests/conflict3.txt b/usr.bin/diff3/tests/conflict3.txt new file mode 100644 index 000000000000..14ac33b41853 --- /dev/null +++ b/usr.bin/diff3/tests/conflict3.txt @@ -0,0 +1,5 @@ +root:someone@example.com + +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh index 3cbd7dac1ed9..4510653bcd47 100755 --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -5,6 +5,11 @@ atf_test_case diff3_ed atf_test_case diff3_A atf_test_case diff3_merge atf_test_case diff3_E_merge +atf_test_case diff3_merge_conflict +atf_test_case diff3_merge_simple +atf_test_case diff3_Em_simple +atf_test_case diff3_Em_conflict +atf_test_case diff3_Em_insert diff3_body() { @@ -20,10 +25,10 @@ diff3_body() atf_check -o file:$(atf_get_srcdir)/2.out \ diff3 -e $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt - atf_check -o file:$(atf_get_srcdir)/3.out \ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/3.out \ diff3 -E -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt - atf_check -o file:$(atf_get_srcdir)/4.out \ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/4.out \ diff3 -X -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt atf_check -o file:$(atf_get_srcdir)/5.out \ @@ -75,7 +80,6 @@ expected="<<<<<<< 2 ======= # \$FreeBSD: head/local 12345 jhb \$ >>>>>>> 3 -# \$FreeBSD: head/local 12345 jhb \$ this is a file @@ -97,6 +101,36 @@ these are some local mods to the file } +diff3_merge_conflict_body() +{ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/conflict-merge.out \ + diff3 -m -L conflict3.txt -L conflict1.txt -L conflict2.txt $(atf_get_srcdir)/conflict3.txt $(atf_get_srcdir)/conflict1.txt $(atf_get_srcdir)/conflict2.txt +} + +diff3_merge_simple_body() +{ + atf_check -s exit:0 -o file:$(atf_get_srcdir)/simple-merge.out \ + diff3 -m $(atf_get_srcdir)/simple3.txt $(atf_get_srcdir)/simple1.txt $(atf_get_srcdir)/simple2.txt +} + +diff3_Em_simple_body() +{ + atf_check -s exit:0 -o file:$(atf_get_srcdir)/simple-Em.out \ + diff3 -E -m $(atf_get_srcdir)/simple3.txt $(atf_get_srcdir)/simple1.txt $(atf_get_srcdir)/simple2.txt +} + +diff3_Em_conflict_body() +{ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/conflict-Em.out \ + diff3 -E -m -L conflict3.txt -L conflict1.txt -L conflict2.txt $(atf_get_srcdir)/conflict3.txt $(atf_get_srcdir)/conflict1.txt $(atf_get_srcdir)/conflict2.txt +} + +diff3_Em_insert_body() +{ + atf_check -s exit:0 -o file:$(atf_get_srcdir)/passwd-Em.out \ + diff3 -E -m $(atf_get_srcdir)/passwd-test.txt $(atf_get_srcdir)/passwd-old.txt $(atf_get_srcdir)/passwd-new.txt +} + atf_init_test_cases() { atf_add_test_case diff3 @@ -105,4 +139,9 @@ atf_init_test_cases() atf_add_test_case diff3_A atf_add_test_case diff3_merge atf_add_test_case diff3_E_merge + atf_add_test_case diff3_merge_conflict + atf_add_test_case diff3_merge_simple + atf_add_test_case diff3_Em_simple + atf_add_test_case diff3_Em_conflict + atf_add_test_case diff3_Em_insert } diff --git a/usr.bin/diff3/tests/passwd-Em.out b/usr.bin/diff3/tests/passwd-Em.out new file mode 100644 index 000000000000..2b52a6440f6b --- /dev/null +++ b/usr.bin/diff3/tests/passwd-Em.out @@ -0,0 +1,16 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin +john::1001:1001::0:0:John Baldwin:/home/john:/bin/tcsh +messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin +polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin +haldaemon:*:560:560::0:0:HAL Daemon User:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/passwd-new.txt b/usr.bin/diff3/tests/passwd-new.txt new file mode 100644 index 000000000000..8bec617219a3 --- /dev/null +++ b/usr.bin/diff3/tests/passwd-new.txt @@ -0,0 +1,12 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/passwd-old.txt b/usr.bin/diff3/tests/passwd-old.txt new file mode 100644 index 000000000000..7a6f936e90c9 --- /dev/null +++ b/usr.bin/diff3/tests/passwd-old.txt @@ -0,0 +1,11 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/passwd-test.txt b/usr.bin/diff3/tests/passwd-test.txt new file mode 100644 index 000000000000..f2b277fb3b4c --- /dev/null +++ b/usr.bin/diff3/tests/passwd-test.txt @@ -0,0 +1,15 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin +john::1001:1001::0:0:John Baldwin:/home/john:/bin/tcsh +messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin +polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin +haldaemon:*:560:560::0:0:HAL Daemon User:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/simple-Em.out b/usr.bin/diff3/tests/simple-Em.out new file mode 100644 index 000000000000..c9ad1c1bed8f --- /dev/null +++ b/usr.bin/diff3/tests/simple-Em.out @@ -0,0 +1,3 @@ +this is an new line + +this is a local line diff --git a/usr.bin/diff3/tests/simple-merge.out b/usr.bin/diff3/tests/simple-merge.out new file mode 100644 index 000000000000..c9ad1c1bed8f --- /dev/null +++ b/usr.bin/diff3/tests/simple-merge.out @@ -0,0 +1,3 @@ +this is an new line + +this is a local line diff --git a/usr.bin/diff3/tests/simple1.txt b/usr.bin/diff3/tests/simple1.txt new file mode 100644 index 000000000000..4c4c2cd1a4e7 --- /dev/null +++ b/usr.bin/diff3/tests/simple1.txt @@ -0,0 +1,2 @@ +this is an old line + diff --git a/usr.bin/diff3/tests/simple2.txt b/usr.bin/diff3/tests/simple2.txt new file mode 100644 index 000000000000..e880a8af5c39 --- /dev/null +++ b/usr.bin/diff3/tests/simple2.txt @@ -0,0 +1,2 @@ +this is an new line + diff --git a/usr.bin/diff3/tests/simple3.txt b/usr.bin/diff3/tests/simple3.txt new file mode 100644 index 000000000000..4ab38534cba1 --- /dev/null +++ b/usr.bin/diff3/tests/simple3.txt @@ -0,0 +1,3 @@ +this is an old line + +this is a local line From nobody Sun Mar 22 08:05:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplR1rwKz6W9DL for ; Sun, 22 Mar 2026 08: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplQ6nHHz3Z4D for ; Sun, 22 Mar 2026 08: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=1774166755; 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=LR4/GzWYtTl/AXCbeB/LnIPbyx467nqRS+BxblxtWJE=; b=Nb6yuS37fVjXz+sprQtlbfdng3Fx9uE2q9nI7pC72Vk+vBZf4+UbOw8d1SGqb/pXvaNLjQ J3mYwllBkm6WLyV2QmBv8T6JvR0jQHu+iBKx5GpThhtg3ANmIEU2B+v00pa4RG6f5HRWDs PBLipkB+YK+TtT0wQGROR5W/xa8GHqfVs6hsUdHIRNCgzXwhLGKt4pXjsTFAfqwPkbIZg7 9fxcT2uip5mnfW04rtVOKTS0h7G9SQFrYVSzISzOMuoaPsrEE1n2xe2OCC/5WsbtXipg9l 77yGDz/K540F7nWx0loWMUUuuEVU8AHENc/1V0n739e+wrjvdozcES+ZOrzSfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166755; a=rsa-sha256; cv=none; b=tUsjPly3sWKcnr/JSjQDHOMQqnw2F2vsRRFpCQsfTPAG+lSeaERsLzCp8jnf5kJiDT4epf iOHPW514X+r6uE/7n/hKvZ4r0c2vxyziZNfm0p+EOWxEITy+zJm1boqJHku6JFNFJAHW1Z 7Ivw+V4AXWVmChCe0Inc0xbLC67JpQiEt/8iuNbXK6pMrOdPph4HFGAH1oCK7w2ql+2QlV SE42b4CQRWhlQTPR/Vj8ODa0XtLpAmuu9zUkMVHk4d7kqfaJkSkghqtl8cxQlCqtqyFJeb 4Wh+M8vNsUPDudM/WAk3Rl+xllqr19mU9qcDrtA6+sAFeNbapJWsEbdNlx9/Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166755; 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=LR4/GzWYtTl/AXCbeB/LnIPbyx467nqRS+BxblxtWJE=; b=X9wTKSJZSZen+pst5qeeoJeUUDnqrSGQg6A8cAke0nNGLjGh090HCT3OBZVqJp3qTrhot8 p9jV/9DPT3yoWY9XPYl18KNhkDLBTI/BTj1EJBOBTLmEZRK2zXqipdkDiTCD2QPRdhtY3N tVnhp49lL07Bsp5QNHLbrGlL23QhhMa88tJifnmRmrjbOwM8LtBIVr/uwqH+Dh6fE8Khy3 jEMc9EWuVPkFnfphmlVOj7UQBpGbyscuNlaLOnLPc1jT7GvXFkNiukyWlT9q6yMLPU8wCc OkHERmNMJN25Xs0pYcWaIDGV/0+m6Bwr0D9c0OYfzG4agn1T0J7aKRf72sjb3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplQ5j1Pzqvj for ; Sun, 22 Mar 2026 08:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1449573b44c7 - stable/15 - diff3: add 3 missing files from the testsuite List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1449573b44c721586261ead3f2e146736f092bcd Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:54 +0000 Message-Id: <69bfa2e2.1a4da.790825e5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1449573b44c721586261ead3f2e146736f092bcd commit 1449573b44c721586261ead3f2e146736f092bcd Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:45:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:58 +0000 diff3: add 3 missing files from the testsuite Fixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b (cherry picked from commit 284a0aa96eb63f12831a9e06514a50b2cd80957f) --- usr.bin/diff3/tests/conflict-Em.out | 19 +++++++++++++++++++ usr.bin/diff3/tests/conflict-merge.out | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/usr.bin/diff3/tests/conflict-Em.out b/usr.bin/diff3/tests/conflict-Em.out new file mode 100644 index 000000000000..dcc1ddaff6fb --- /dev/null +++ b/usr.bin/diff3/tests/conflict-Em.out @@ -0,0 +1,19 @@ +<<<<<<< conflict3.txt +root:someone@example.com +======= +#root:me@my.domain +>>>>>>> conflict2.txt + +<<<<<<< conflict3.txt +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root +======= +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root + +#Generalredirectionsforpseudoaccounts +_dhcp:root +_pflogd:root +>>>>>>> conflict2.txt diff --git a/usr.bin/diff3/tests/conflict-merge.out b/usr.bin/diff3/tests/conflict-merge.out new file mode 100644 index 000000000000..737cba7dc224 --- /dev/null +++ b/usr.bin/diff3/tests/conflict-merge.out @@ -0,0 +1,25 @@ +<<<<<<< conflict3.txt +root:someone@example.com +||||||| conflict1.txt +# root: me@my.domain +======= +#root:me@my.domain +>>>>>>> conflict2.txt + +<<<<<<< conflict3.txt +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root +||||||| conflict1.txt +# Basic system aliases -- these MUST be present +MAILER-DAEMON: postmaster +postmaster: root +======= +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root + +#Generalredirectionsforpseudoaccounts +_dhcp:root +_pflogd:root +>>>>>>> conflict2.txt From nobody Sun Mar 22 08:05:55 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplS23Rvz6W9cB for ; Sun, 22 Mar 2026 08:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplR6s5lz3YwP for ; Sun, 22 Mar 2026 08: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=1774166756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kwUD5WWqFRVRqO/bNC9oSsnXSxKTUysrZEka6WaZYIM=; b=W6pf0PAAD/XPEdA6taAf3pkxLfPt441s8lIUaaYqzRBi5Nky5IOM8hyFtaR39bgsR6HWsX Hf6tbNpmd6H7AwMCz3Wd4zO6lOWx8f+R3ngUsGZ4Xehp5U5gPiohAMUwrkYUPz4cooovzE HCIWEDj7Gbs9q7IIQFZwOnn48Lq1ofESwuUnyqOWt3NKEAefhY6OoGBNvJ4OVkJtjT0Gb0 PLB3NwCKJ/oDTzDj1qORMQtAbedEXH0awKzTyEU+B3kzTx/weRuNs/U/Fe5WZpoYkC/pKb hHFkxxKUcu8To8L2f+kd/bgnusSYnyyZnpZUnL8HPGfo8SnktjDTWFa3Ok2RGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166756; a=rsa-sha256; cv=none; b=oWvnJMQNN+/ao0M9n2VtQOEokmb/zpuJgVUOsZvjU5EUaDxo25GbqTLKk31l2Ybkitv1LJ ayHdHM0TT2EJJBnbK6vBe16wXNGc0+iaBeITHEghiokCapHsIiOJvQLf939lHunL3UARkE kIGDS7sP3bmJEr0FU05fC7Q9LJSRam0KW1Z7EXxcBabDvOMsvyJOkNWscoPQxGaXGOYRd5 3MhxiDJtFBvgH0zkO1zMIkqWtc6zuj8kByMTLptbIW/il3WaDC195FbAFcmtVdy98tHdJR UE0nmQcBp2w7WEItIrY6ExIzntRdL2WfIkqU2PeWGu+ST5gydbRiDz0W/tTv8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kwUD5WWqFRVRqO/bNC9oSsnXSxKTUysrZEka6WaZYIM=; b=RDF0DWgWuPbhqcNdQv7TCMuOQYUMf2FWFbFllQ4sgQdsnyCwr3rW5eVMEQnpmJFrBQQ7IT Sk72kQywqmQ7ocU4kWR1Q8KoFu5tJIZ0WTLsH26RWu3SFxuh5+jWsY2cREzHgJ0cG6r7+Z Sc64nHLe8B3Ng/9iDoqQkF4InUX9lgy9ruwCdwQbk6dzeD5xjftGP08wqWF21rTfLHTPVJ +gctmxhXYYvQTGTM33cxme8gwLkki6PH+YM6sK3w0y9CtFH4fkFPHPCHVNC1ZzvBxfp3Zs Jw0b3w1JjNDdPSWUh0ydDXSneDV+/qUIX+NEDzrx3zTMyYGdMhp8MiIwWZ6k6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplR6RQPzqTZ for ; Sun, 22 Mar 2026 08:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7cbcf3556c15 - stable/15 - diff3: Code cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7cbcf3556c154f6f8d4f92230a13c4a750795580 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:55 +0000 Message-Id: <69bfa2e3.1bd01.525db82c@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7cbcf3556c154f6f8d4f92230a13c4a750795580 commit 7cbcf3556c154f6f8d4f92230a13c4a750795580 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-28 18:15:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:59 +0000 diff3: Code cleanup * Order includes. * Turn the diff type into an enum. * Turn an unreachable error message into an assertion. * Remove unused debugging code. * Remove some dead assignments. * Consistently use 1 instead of EXIT_FAILURE. * Turn a return from main() into an exit(). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D55517 (cherry picked from commit c2dee7786bf32cb66cedec226e42e79e06457c51) --- usr.bin/diff3/diff3.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 9a01951e60ab..c33e3275d006 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -62,19 +62,20 @@ * SUCH DAMAGE. */ +#include #include #include -#include #include +#include #include #include #include #include +#include +#include #include #include -#include -#include #include #include @@ -87,14 +88,15 @@ struct range { int to; }; +enum difftype { + DIFF_NONE, + DIFF_TYPE1, + DIFF_TYPE2, + DIFF_TYPE3, +}; + struct diff { -#define DIFF_TYPE1 1 -#define DIFF_TYPE2 2 -#define DIFF_TYPE3 3 - int type; -#if DEBUG - char *line; -#endif /* DEBUG */ + enum difftype type; /* Ranges as lines */ struct range old; @@ -137,7 +139,7 @@ static const char *newmark = ">>>>>>>"; static const char *divider = "======="; static bool duplicate(struct range *, struct range *); -static int edit(struct diff *, bool, int, int); +static int edit(struct diff *, bool, int, enum difftype); static char *getchange(FILE *); static char *get_line(FILE *, size_t *); static int readin(int fd, struct diff **); @@ -256,9 +258,6 @@ readin(int fd, struct diff **dd) for (i = 0; (p = getchange(f)) != NULL; i++) { if ((size_t)i >= szchanges - 1) increase(); -#if DEBUG - (*dd)[i].line = strdup(p); -#endif /* DEBUG */ a = b = strtoi(p, &p); if (*p == ',') @@ -565,7 +564,7 @@ skip(int i, int from, const char *pr) for (n = 0; cline[i] < from - 1; n += j) { if ((line = get_line(fp[i], &j)) == NULL) - errx(EXIT_FAILURE, "logic error"); + errx(1, "logic error"); if (pr != NULL) printf("%s%s", Tflag == 1 ? "\t" : pr, line); cline[i]++; @@ -596,7 +595,7 @@ duplicate(struct range *r1, struct range *r2) if (c == -1 && d == -1) break; if (c == -1 || d == -1) - errx(EXIT_FAILURE, "logic error"); + errx(1, "logic error"); nchar++; if (c != d) { repos(nchar); @@ -621,7 +620,7 @@ repos(int nchar) * collect an editing script for later regurgitation */ static int -edit(struct diff *diff, bool dup, int j, int difftype) +edit(struct diff *diff, bool dup, int j, enum difftype difftype) { if (!(eflag == EFLAG_UNMERGED || (!dup && eflag == EFLAG_OVERLAP ) || @@ -634,10 +633,6 @@ edit(struct diff *diff, bool dup, int j, int difftype) overlapcnt++; de[j].type = difftype; -#if DEBUG - de[j].line = strdup(diff->line); -#endif /* DEBUG */ - de[j].old.from = diff->old.from; de[j].old.to = diff->old.to; de[j].new.from = diff->new.from; @@ -657,7 +652,7 @@ printrange(FILE *p, struct range *r) return; if (r->from > r->to) - errx(EXIT_FAILURE, "invalid print range"); + errx(1, "invalid print range"); /* * XXX-THJ: We read through all of the file for each range printed. @@ -872,8 +867,7 @@ mergescript(int i, int f1f3delta) } break; default: - printf("Error: Unhandled diff type - exiting\n"); - exit(EXIT_FAILURE); + __assert_unreachable(); } if (de[n].type == DIFF_TYPE2) @@ -886,11 +880,7 @@ mergescript(int i, int f1f3delta) * Print from the final range to the end of 'myfile'. Any deletions or * additions to this file should have been handled by now. */ - new = &de[n-1].new; - old = &de[n-1].old; - r.from -= f1f3delta; - r.to = INT_MAX; printrange(fp[2], &r); exit(overlapcnt > 0); @@ -1109,5 +1099,5 @@ main(int argc, char **argv) merge(m, n); - return (EXIT_SUCCESS); + exit(0); } From nobody Sun Mar 22 08:05:57 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplT4XGKz6W9ML for ; Sun, 22 Mar 2026 08: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplT1vcDz3Z0k for ; Sun, 22 Mar 2026 08: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=1774166757; 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=4t26RgHBjgRzkkdpOOT+m6aji7rO/5ts3zvulmTSMGQ=; b=BARuDnLcnHJFZ2Li9AEftgX7/vcVnlbJb/u5PS5p7gxCwxetO5V8d129DHQJ+VkQQE4eYN OIh9iH7RC/CTQejp0A0KxcakbFMzRNxRkWqbz4+8VR0c2b8BnjfNQhu3MYmT/oNulR1TX8 fT+mo90hXrsgEAamkzHxcs18o8/1Y/sBS6wW4plNLEBm/risNOc9obx9IwrrPNaYTvIYLK 3tr2cMoKTs03HA3dFqgx4budKK84fiXRau9na3BIkTinIdjT4p+NL133DyIGA/T/j80GR9 0hexlJH43a+aUrS+eNtki3qfUgE9oX+FFzpbzmrjjR0X9f74UZYhpcqkZC/jnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166757; a=rsa-sha256; cv=none; b=A1bprYgKQXqjuoEAQUXLdQEHz5nJPssEqwHOSda8oIv2qpEug61aeSJ9b8L3hKCb3u2Zvr mm5oYmxFQ5UZfFIo2KLYvkAA2eJPhGn+gy8WGfgMHEee+Xjy9YXUL6TUrLe1Q4XHXO++N9 kzQ6aTn5m/TVUgcCRcLksRCdtmWL2XNcYybpzxUSwXE2hI8/NFhDwFipyOsievFAjEFzUR E2REPBhj8weQKk1gL3T8tkqjJCi9HZVhfEdRGWB7GKKUMcMYe/nj+RW0AYFSSJzFPwayxm chvtk2ujaUjBVjQTInV+EheaOrnrh19SF3r1LTE6J0RZm/8w53pPaMoLlIypew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166757; 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=4t26RgHBjgRzkkdpOOT+m6aji7rO/5ts3zvulmTSMGQ=; b=xXkyrQf8bQuIDE1zTTiJM1jzYgZ4i/PcROsJMiQiVIq5rwg3Jza98VbBfWV8gDpaUE+tzr tpqtfL1/AZjWg9zEnH8ejBDIflBSnQ46rJjfqc/a/zWukvMtlWDtbD3ZbyBzwMOzwSzaL6 VSvO3EiXE08RcqzYju6yY/aMqtePLFbRDcC8frEpF5HkSfqEncTYpEQfmAmceEeCnPOMFe dqn6wTlX8FKmjlpoNTrPKMNRouPfAz0cYCn3e5XTKWaqA1kU7dLSX7g7fKp+m0SNu++of5 FXH9P8miT8ahEIxBtak+9FjPcSKmWmMRCOFUYlFNTdCzLwU/SDWhQfztfUKQuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplT08t1zrLQ for ; Sun, 22 Mar 2026 08:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: feef48d5fe91 - stable/15 - diff3: bump version to the date when the GNU diff3 compat was reached List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: feef48d5fe911deeaa5c2949a0465a3717682353 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:57 +0000 Message-Id: <69bfa2e5.1c3cc.1d730231@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=feef48d5fe911deeaa5c2949a0465a3717682353 commit feef48d5fe911deeaa5c2949a0465a3717682353 Author: Baptiste Daroussin AuthorDate: 2026-03-01 11:37:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:59 +0000 diff3: bump version to the date when the GNU diff3 compat was reached (cherry picked from commit 5ddfd1db271cc675997a942da599c342ccb53afa) --- usr.bin/diff3/diff3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index c33e3275d006..fce4d353af69 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -157,7 +157,7 @@ static void increase(void); static void usage(void); static void printrange(FILE *, struct range *); -static const char diff3_version[] = "FreeBSD diff3 20240925"; +static const char diff3_version[] = "FreeBSD diff3 20260213"; enum { DIFFPROG_OPT, From nobody Sun Mar 22 08:05:58 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplV3Ftqz6W9cF for ; Sun, 22 Mar 2026 08: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplV1R9fz3Ywg for ; Sun, 22 Mar 2026 08:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9WPISdfOHYJ31uo66nYbxf01ZxK7DRA5ebwK73jogoU=; b=kvZpOWPDQWfnijNFE08HQMKVYDsxT2jsfJX8Y3l0J+oVQx4Tv6zT/dLYSOOdYW44ijTnMj 1cU0mRV3XqjqGbJoGuAHrd35+0SKmb6XVwYP+Zui//VSkud9Ndr3z+PEy17Vcc/AOJ2YQh Qmy1iXrCMsr7BFBSoPyFH2zMjO82nraCulOc375rTzqAqsvd/R1dbSEvNXZmkl5bB49FlY 7Fb4mEbM2ubZNi0HWmgl555cLgKdFZvBnWRA1V76YoWxrMrhUd2pPqNx5zJvkjXp5Fpgun oFxhSrqhTZBCfs8VTgx1tiyY6qSSS1rtKwBQD3xunynZ1c98seESUq89VrU0pQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166758; a=rsa-sha256; cv=none; b=Em5Qu8s4H6fV30cV/XKwubOnFdvbyWdQUzZ/AsnxY/hp1Hmtf4UTbw0BqmIXCsDRdtJeAU HAVEzwXqjlHxMI92YgJ0ZU5NqFH1tHhr1PxVXtBR4ldcIQGZnuP3bik2igkWiC4dKT2bfQ Rv02t7CYnbRW/qxgOlrZdjV4Av/mK75mhaqoz6rTn6W4hYcMBven5mJiVC659tNv5CV/qz yHH3N+8VngjWDcqeK6g1G95Hg/qUnHnvbXkbMuyXYgjWUpwLcYPUwgFXEYKEou5XRWX31I gvNLZIawZaPPzlmLgaZPVPu3IRkPQ7bFv1u2i3Tt2pxJCw3DZRL/r4OXtbLlNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9WPISdfOHYJ31uo66nYbxf01ZxK7DRA5ebwK73jogoU=; b=h2N0RbEFZGESasiOM04nKU+oWlpFi6xaxf+VpkK6J9/4JW+zS/S8wEKipJwL3czXDIpCVv wSoth4GdoYRx5X5ol26RcZ7nLX4MVto91vWzqxkutS5b/YfdtegpvEN2OuvmJfbI4bCMRE oiNxJf1PqzXZqyRr92lvrSh5b09uAZIP4VuutdWiN8cCQM5dk6Gjr2mxrB+HOfg0J7AhJm NMwfY52Se3Xlmunr5wzjMRrUnetxQoEb+y9PN24cCQAS918rt6sLmeHvkq3CvAsWVXzHqo 05WYor0UbQFuXb4L9PfhuWe4E4KJpw0Zc3BnUYwEI4ejVYrhwViWN9HvOyW9EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplV11LFzrLR for ; Sun, 22 Mar 2026 08:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a413 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fa37a9e9135e - stable/15 - diff3: Produce correct exit status List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa37a9e9135e5e87d8dc6342545c2e4f14537121 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:58 +0000 Message-Id: <69bfa2e6.1a413.c55fc93@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fa37a9e9135e5e87d8dc6342545c2e4f14537121 commit fa37a9e9135e5e87d8dc6342545c2e4f14537121 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-02 08:52:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:59 +0000 diff3: Produce correct exit status Use exit status 2 for errors, 1 only to indicate that differences were found between the inputs (in some operating modes). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: ngie, bapt Differential Revision: https://reviews.freebsd.org/D55608 (cherry picked from commit fe5341287c6c9bacc18879b25ed72ceb42e1c811) --- usr.bin/diff3/diff3.1 | 17 ++++++++++++++++- usr.bin/diff3/diff3.c | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1 index 9286a79e6ec6..8ca2d9f853af 100644 --- a/usr.bin/diff3/diff3.1 +++ b/usr.bin/diff3/diff3.1 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 23, 2022 +.Dd March 1, 2026 .Dt DIFF3 1 .Os .Sh NAME @@ -196,6 +196,21 @@ The lines beneath this notation are ranges of lines which are exclusively different in file .Va n . .El +.Sh EXIT STATUS +The +.Nm +utility exits with a status of 0 on success +and >1 if an error occurred. +Additionally, if the +.Fl A , +.Fl E , +.Fl L , +.Fl m , +or +.Fl X +flags were specified, +it exits with a status of 1 if conflicts were found. +.El .Sh SEE ALSO .Xr diff 1 , .Xr ed 1 , diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index fce4d353af69..0f114163321f 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -202,7 +202,7 @@ strtoi(char *str, char **end) if ((end != NULL && *end == str) || num < 0 || num > INT_MAX || errno == EINVAL || errno == ERANGE) - err(1, "error in diff output"); + err(2, "error in diff output"); return (int)num; } @@ -267,7 +267,7 @@ readin(int fd, struct diff **dd) if (*p == ',') d = strtoi(p + 1, &p); if (*p != '\n') - errx(1, "error in diff output"); + errx(2, "error in diff output"); if (kind == 'a') a++; else if (kind == 'c') @@ -275,11 +275,11 @@ readin(int fd, struct diff **dd) else if (kind == 'd') c++; else - errx(1, "error in diff output"); + errx(2, "error in diff output"); b++; d++; if (b < a || d < c) - errx(1, "error in diff output"); + errx(2, "error in diff output"); (*dd)[i].old.from = a; (*dd)[i].old.to = b; (*dd)[i].new.from = c; @@ -287,7 +287,7 @@ readin(int fd, struct diff **dd) if (i > 0) { if ((*dd)[i].old.from < (*dd)[i - 1].old.to || (*dd)[i].new.from < (*dd)[i - 1].new.to) - errx(1, "diff output out of order"); + errx(2, "diff output out of order"); } } if (i > 0) { @@ -564,7 +564,7 @@ skip(int i, int from, const char *pr) for (n = 0; cline[i] < from - 1; n += j) { if ((line = get_line(fp[i], &j)) == NULL) - errx(1, "logic error"); + errx(2, "logic error"); if (pr != NULL) printf("%s%s", Tflag == 1 ? "\t" : pr, line); cline[i]++; @@ -595,7 +595,7 @@ duplicate(struct range *r1, struct range *r2) if (c == -1 && d == -1) break; if (c == -1 || d == -1) - errx(1, "logic error"); + errx(2, "logic error"); nchar++; if (c != d) { repos(nchar); @@ -652,7 +652,7 @@ printrange(FILE *p, struct range *r) return; if (r->from > r->to) - errx(1, "invalid print range"); + errx(2, "invalid print range"); /* * XXX-THJ: We read through all of the file for each range printed. @@ -900,27 +900,27 @@ increase(void) p = reallocarray(d13, newsz, sizeof(*p)); if (p == NULL) - err(1, NULL); + err(2, NULL); memset(p + szchanges, 0, incr * sizeof(*p)); d13 = p; p = reallocarray(d23, newsz, sizeof(*p)); if (p == NULL) - err(1, NULL); + err(2, NULL); memset(p + szchanges, 0, incr * sizeof(*p)); d23 = p; p = reallocarray(de, newsz, sizeof(*p)); if (p == NULL) - err(1, NULL); + err(2, NULL); memset(p + szchanges, 0, incr * sizeof(*p)); de = p; q = reallocarray(overlap, newsz, 1); if (q == NULL) - err(1, NULL); + err(2, NULL); memset(q + szchanges, 0, incr * 1); overlap = q; s = reallocarray(de_delta, newsz, sizeof(*s)); if (s == NULL) - err(1, NULL); + err(2, NULL); memset(s + szchanges, 0, incr * sizeof(*s)); de_delta = s; szchanges = newsz; From nobody Sun Mar 22 08:05:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplW5KwYz6W97q for ; Sun, 22 Mar 2026 08:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplW2QZGz3Z8y for ; Sun, 22 Mar 2026 08:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166759; 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=ePUZSCUts8z7Qju6+/BkwMbJCwEhzw+mlcxeTQuaKbY=; b=oveDW458RXddr8fQqPXsuqHL3e/quvk0qIthK1rOEnji45/fdizUQVSUZ0JtXfZT50qyUU AUiN6HWePdUf+vJUaSY+8URZlQpC1czilYWjesnjHbfTlhiB/RxjusRXleOLpsoXcZ9aKx ChpsNKhdQNqiHpmTlRjZi2DbnOUCuQaeTt+cykYxrDZJYfI9BTEYRc/f1tBMmUZi9yPtpp VLptXvVwVtv+k5P6e39h8Rdx9dD7YNJOo42t1TsQDguElritrGQhhI86yMk99SKk8uB4O9 dOfPsOfvpMOBi6CD3MCEkYzbybTqwAY/bsvB0JeDCm/sr1UACTfSUuxfAwH2BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166759; a=rsa-sha256; cv=none; b=XHvKgwIO0bwejFzPzAMv/0mKDWUWv7XBbAic0puIgq/tBv4LlFWRjeXrE/+9VxcKtudeob 3ATNzUtEJGUBC+5EatvJMdSMnzNdiz+jaqszPnfOsA7M89NIPBO8JKiKzFsHt6CKQTpL1e Eo4bokdJW3WpekIUxVHyBlIX8NSOBj/saD57SkNQczbA52KdkbxurJbaeGt6hW78Gd7Yzu QDC22SyFoPskhmmDR8GYVSDpJxPa+/ZjxFaq+eyfRQ/07vYhMjfnVAvbjyuaPpsaF62fHZ L49BzI4ic1E36QfkhKVZkvfjmiHxeZR/UB+ofLUVdys75SrvR9Gi9CU+gWhGhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166759; 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=ePUZSCUts8z7Qju6+/BkwMbJCwEhzw+mlcxeTQuaKbY=; b=eyVmXlyO/2E/ahqRrmb5GmCFCuefH4Frsx9srOEydIGgQ2nmlCjXlnQXyvHKP9qo8UaNT8 jCclZqNucCpQc2QyOCOXFqMS8bt0ceTSfiW88BE+lvRK1SeC7I3Gzl5RWahZ+5H2HmDmbM G75R0kyze4sDHylR6Uooeb2lgBpUm6fYHPG2vwsDYara7EmDAFlTLkz+TCX4fYSJVb6Fr2 GPILTRLKLG6bD6ZVqNcAGpJgP9lsM/4ADCPDuAGHATMaxaBQpIKWdg65TsFFwhHwt97HTZ msPrFK8h2Ihw7r3IBEDVYWPEk1TO/Knmb5vmKMyafG5cXOgyT7l1huI7mYLz4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplW1pd5zrHr for ; Sun, 22 Mar 2026 08:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f3e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 45b0c46d1c0b - stable/15 - diff3: Add SPDX-License-Identifier tag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:59 +0000 Message-Id: <69bfa2e7.3f3e4.5098d4c5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 commit 45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 Author: Tuukka Pasanen AuthorDate: 2026-02-12 09:27:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:59 +0000 diff3: Add SPDX-License-Identifier tag Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55462 (cherry picked from commit 5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9) --- usr.bin/diff3/diff3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 0f114163321f..d85a5da94b10 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -1,6 +1,8 @@ /* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ /* + * SPDX-License-Identifier: Caldera-no-preamble AND BSD-3-Clause + * * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. *