From nobody Mon Dec 22 00:10:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZJSl5hzTz6LgMf for ; Mon, 22 Dec 2025 00:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZJSl4XXvz471R for ; Mon, 22 Dec 2025 00:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766362247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpPzFy9lOcSLqpk25bAfJ9pQjVXN6sFI5m1RYHpk92g=; b=gxG6j3/gqqL5e09qcbz0IzzzTyBlHqya218f8c+tBMOZ3vE7a0Iqn01QYNO5B4JdKJeHMz os2i3nT0s5ATLGBVCMI4nSRAJlzhXB7dtCNCZ/OGXXahOiDILhxssOlMAF8UqRTf2b2BEW BGRiDYF9BGN55qkD0v6f9jt2TPi+jU2dXYq5suZ+SrHxN0nT3vPeht9EbVvMT8fnWCSvoU IhBPtfNq12JBMMTTS2ZmPhrSGbF243pwsX7UOmsmiS3Y7x6oQTwXzM3b7ZsRA/8vlmiYsC vYGVsTLn2l2JheZs3hSj1gr/YBfLxQHKjUO7XCGfVk8S3xPmyIiLMWj075MKjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766362247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpPzFy9lOcSLqpk25bAfJ9pQjVXN6sFI5m1RYHpk92g=; b=KYP66405GuQKGeSQdftlTAENkDF/vCzONzBQ4cbDvSWsZkuaD7VEz/DFfYnLJd0Hxp2fQS V/CI/PUfAzL3VOQhTi9h3G1GIUVjOZFqB9hWyIxAMwvPuSv3KM+QhHlqpZAGJN+28GvXQM k8xStr6+JtxhW/e8CpQQ2+nuStwQExu4lVGqyqjfhpYNhonEiE4Pl+NWsrXb8ZQaFkgTYY KAVtsNmGRuFycQIRUt7y+MwkVVgkKPQ3l3F2e6jZoYU3g63MYsO5WXBLtv98vfC3AgeP0x 9526K3XOQ7L/c0gpdngAuJ9ieoSFVP8hw9DYLYUBhD/sjuWR0r0ra59WjYoazw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766362247; a=rsa-sha256; cv=none; b=OUREI/DUBkibwJRBMii1RrbzBzmAiso93GAmyrEsOPUvb0FGPlcJONNXnKXZEFx2M07O5R gXt182ljIEiBhvUNIfgK4qIZEkBFjuctvugmUxwF8ywV2/MRrwusNalk7EHJh0bsZzgK5o CQ/u7GQUKdkCUQhGLTQFDqDnLca4YPPy552Z/fHz/d4IOqxO1T/2gPf9kE+F/kErHs/UiO MbxabeB1hgu2nmSDWzkjXDlho3ZBooZURXkC77LAx/iez28q3jlKM1s4pYklYNdCumDsMJ RfPlSVJ55ZaSuQP9wY+acBjKN6y+zWwDOt/WYjGhGInSS/3NF8cEQYhzeDN3Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZJSl45BMz12dd for ; Mon, 22 Dec 2025 00:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22243 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 00:10:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 8e3fd450cc53 - main - nfsd: Add some support for POSIX draft ACLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e3fd450cc53d37fcf4e7f460f559d03c22c0d84 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 00:10:47 +0000 Message-Id: <69488c87.22243.199c245a@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8e3fd450cc53d37fcf4e7f460f559d03c22c0d84 commit 8e3fd450cc53d37fcf4e7f460f559d03c22c0d84 Author: Rick Macklem AuthorDate: 2025-12-22 00:04:24 +0000 Commit: Rick Macklem CommitDate: 2025-12-22 00:08:05 +0000 nfsd: Add some support for POSIX draft ACLs An internet draft (expected to become an RFC someday) https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls describes an extension to NFSv4.2 to handle POSIX draft ACLs. This is the second of several patches that implement the above draft. The only semantics change would be if you have exported a UFS file system mounted with the "acl" option. In that case, you would see the acl attribute supported. This is bogus, but will be handled in the next commit. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfs/nfs_var.h | 15 +++---- sys/fs/nfsserver/nfs_nfsdport.c | 84 ++++++++++++++++++++++++++++++++++------ sys/fs/nfsserver/nfs_nfsdserv.c | 86 ++++++++++++++++++++++++++++++----------- sys/fs/nfsserver/nfs_nfsdsubs.c | 38 +++++++++++++----- 4 files changed, 172 insertions(+), 51 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 6b14c8486272..49a94323a572 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -409,7 +409,7 @@ void nfsv4_gidtostr(gid_t, u_char **, int *); int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *); int nfsrv_checkuidgid(struct nfsrv_descript *, struct nfsvattr *); void nfsrv_fixattr(struct nfsrv_descript *, vnode_t, - struct nfsvattr *, NFSACL_T *, NFSPROC_T *, nfsattrbit_t *, + struct nfsvattr *, NFSACL_T *, NFSACL_T *, NFSPROC_T *, nfsattrbit_t *, struct nfsexstuff *); int nfsrv_errmoved(int); int nfsrv_putreferralattr(struct nfsrv_descript *, nfsattrbit_t *, @@ -734,7 +734,7 @@ int nfsvno_statfs(vnode_t, struct statfs *); void nfsvno_getfs(struct nfsfsinfo *, int); void nfsvno_open(struct nfsrv_descript *, struct nameidata *, nfsquad_t, nfsv4stateid_t *, struct nfsstate *, int *, struct nfsvattr *, int32_t *, - int, NFSACL_T *, nfsattrbit_t *, struct ucred *, bool, + int, NFSACL_T *, NFSACL_T *, nfsattrbit_t *, struct ucred *, bool, struct nfsexstuff *, vnode_t *); int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct nfsrv_descript *, NFSPROC_T *); @@ -742,10 +742,10 @@ int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, bool, bool, bool, uint32_t, bool); -int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, - NFSACL_T *, NFSPROC_T *); -int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, - NFSACL_T *, NFSPROC_T *); +int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, + nfsattrbit_t *, NFSACL_T *, NFSACL_T *, NFSPROC_T *); +int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, + nfsattrbit_t *, NFSACL_T *, NFSACL_T *, NFSPROC_T *); int nfsvno_checkexp(mount_t, NFSSOCKADDR_T, struct nfsexstuff *, struct ucred **); int nfsvno_fhtovp(mount_t, fhandle_t *, NFSSOCKADDR_T, int, @@ -767,7 +767,8 @@ int nfsrv_dscreate(struct vnode *, struct vattr *, struct vattr *, struct ucred *, NFSPROC_T *, struct vnode **); int nfsrv_updatemdsattr(struct vnode *, struct nfsvattr *, NFSPROC_T *); void nfsrv_killrpcs(struct nfsmount *); -int nfsrv_setacl(struct vnode *, NFSACL_T *, struct ucred *, NFSPROC_T *); +int nfsrv_setacl(struct vnode *, + NFSACL_T *, acl_type_t, struct ucred *, NFSPROC_T *); int nfsvno_seek(struct nfsrv_descript *, struct vnode *, u_long, off_t *, int, bool *, struct ucred *, NFSPROC_T *); int nfsvno_allocate(struct vnode *, off_t, off_t, struct ucred *, NFSPROC_T *); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 841ec2315f1c..ec2c15485601 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1457,7 +1457,7 @@ nfsvno_getsymlink(struct nfsrv_descript *nd, struct nfsvattr *nvap, *pathcpp = NULL; *lenp = 0; if ((nd->nd_flag & ND_NFSV3) && - (error = nfsrv_sattr(nd, NULL, nvap, NULL, NULL, p))) + (error = nfsrv_sattr(nd, NULL, nvap, NULL, NULL, NULL, p))) goto nfsmout; NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); len = fxdr_unsigned(int, *tl); @@ -1969,8 +1969,8 @@ void nfsvno_open(struct nfsrv_descript *nd, struct nameidata *ndp, nfsquad_t clientid, nfsv4stateid_t *stateidp, struct nfsstate *stp, int *exclusive_flagp, struct nfsvattr *nvap, int32_t *cverf, int create, - NFSACL_T *aclp, nfsattrbit_t *attrbitp, struct ucred *cred, bool done_namei, - struct nfsexstuff *exp, struct vnode **vpp) + NFSACL_T *aclp, NFSACL_T *daclp, nfsattrbit_t *attrbitp, struct ucred *cred, + bool done_namei, struct nfsexstuff *exp, struct vnode **vpp) { struct vnode *vp = NULL; u_quad_t tempsize; @@ -2023,7 +2023,7 @@ nfsvno_open(struct nfsrv_descript *nd, struct nameidata *ndp, NFSATTRBIT_TIMEACCESS); } else { nfsrv_fixattr(nd, ndp->ni_vp, nvap, - aclp, p, attrbitp, exp); + aclp, daclp, p, attrbitp, exp); } } vp = ndp->ni_vp; @@ -2953,7 +2953,7 @@ ateof: clone_blksize = 0; if (nvp != NULL) { supports_nfsv4acls = - nfs_supportsnfsv4acls(nvp); + nfs_supportsacls(nvp); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_XATTRSUPPORT)) { ret = VOP_GETEXTATTR(nvp, @@ -3075,7 +3075,7 @@ nfsmout: */ int nfsrv_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, - nfsattrbit_t *attrbitp, NFSACL_T *aclp, struct thread *p) + nfsattrbit_t *attrbitp, NFSACL_T *aclp, NFSACL_T *daclp, struct thread *p) { u_int32_t *tl; struct nfsv2_sattr *sp; @@ -3156,7 +3156,7 @@ nfsrv_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, } break; case ND_NFSV4: - error = nfsv4_sattr(nd, vp, nvap, attrbitp, aclp, p); + error = nfsv4_sattr(nd, vp, nvap, attrbitp, aclp, daclp, p); } nfsmout: NFSEXITCODE2(error, nd); @@ -3169,7 +3169,7 @@ nfsmout: */ int nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, - nfsattrbit_t *attrbitp, NFSACL_T *aclp, struct thread *p) + nfsattrbit_t *attrbitp, NFSACL_T *aclp, NFSACL_T *daclp, struct thread *p) { u_int32_t *tl; int attrsum = 0; @@ -3203,6 +3203,10 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SYSTEM)) nvap->na_flags = 0; + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_ACL) && + (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_POSIXDEFAULTACL) || + NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_POSIXACCESSACL))) + nd->nd_repstat = NFSERR_INVAL; } moderet = 0; for (; bitpos < NFSATTRBIT_MAX; bitpos++) { @@ -3416,6 +3420,38 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, } attrsum += 2 * NFSX_UNSIGNED; break; + case NFSATTRBIT_POSIXACCESSACL: + error = nfsrv_dissectacl(nd, aclp, true, &aceerr, + &aclsize, p); + if (error != 0) + goto nfsmout; + if (!nd->nd_repstat) { + if ((nd->nd_flag & ND_NFSV42) == 0) + nd->nd_repstat = NFSERR_ATTRNOTSUPP; + else if (aclp != NULL && aclp->acl_cnt == 0) + nd->nd_repstat = NFSERR_INVAL; + else if (aceerr != 0) + nd->nd_repstat = aceerr; + } + attrsum += aclsize; + break; + case NFSATTRBIT_POSIXDEFAULTACL: + error = nfsrv_dissectacl(nd, daclp, true, &aceerr, + &aclsize, p); + if (error != 0) + goto nfsmout; + if (!nd->nd_repstat) { + if ((nd->nd_flag & ND_NFSV42) == 0) + nd->nd_repstat = NFSERR_ATTRNOTSUPP; + else if (aclp != NULL && aclp->acl_cnt == 0) + nd->nd_repstat = NFSERR_INVAL; + else if (aceerr != 0) + nd->nd_repstat = aceerr; + else if (vp != NULL && vp->v_type != VDIR) + nd->nd_repstat = NFSERR_INVAL; + } + attrsum += aclsize; + break; default: nd->nd_repstat = NFSERR_ATTRNOTSUPP; /* @@ -6824,14 +6860,17 @@ nfsrv_pnfsstatfs(struct statfs *sf, struct mount *mp) } /* - * Set an NFSv4 acl. + * Set an acl. */ int -nfsrv_setacl(struct vnode *vp, NFSACL_T *aclp, struct ucred *cred, NFSPROC_T *p) +nfsrv_setacl(struct vnode *vp, NFSACL_T *aclp, acl_type_t atype, + struct ucred *cred, NFSPROC_T *p) { int error; - if (nfsrv_useacl == 0 || nfs_supportsnfsv4acls(vp) == 0) { + if (nfsrv_useacl == 0 || (atype == ACL_TYPE_NFS4 && + nfs_supportsnfsv4acls(vp) == 0) || (atype != ACL_TYPE_NFS4 && + nfs_supportsposixacls(vp) == 0)) { error = NFSERR_ATTRNOTSUPP; goto out; } @@ -6845,7 +6884,14 @@ nfsrv_setacl(struct vnode *vp, NFSACL_T *aclp, struct ucred *cred, NFSPROC_T *p) error = NFSERR_ATTRNOTSUPP; goto out; } - error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p); + if (aclp->acl_cnt == 0) { + if (atype != ACL_TYPE_DEFAULT || vp->v_type != VDIR) { + error = NFSERR_INVAL; + goto out; + } + error = VOP_SETACL(vp, atype, NULL, cred, p); + } else + error = VOP_SETACL(vp, atype, aclp, cred, p); if (error == 0) { error = nfsrv_dssetacl(vp, aclp, cred, p); if (error == ENOENT) @@ -7379,6 +7425,20 @@ nfsrv_checknospc(void) free(devid, M_TEMP); } +/* + * Return the correct ACL support value for a vnode. + */ +int +nfs_supportsacls(struct vnode *vp) +{ + + if (nfs_supportsnfsv4acls(vp) != 0) + return (SUPPACL_NFSV4); + else if (nfs_supportsposixacls(vp) != 0) + return (SUPPACL_POSIX); + return (SUPPACL_NONE); +} + /* * Initialize everything that needs to be initialized for a vnet. */ diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 394b63c2ab07..a296082f31d3 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -122,7 +122,7 @@ static void nfsrvd_symlinksub(struct nfsrv_descript *nd, struct nameidata *ndp, static void nfsrvd_mkdirsub(struct nfsrv_descript *nd, struct nameidata *ndp, struct nfsvattr *nvap, fhandle_t *fhp, vnode_t *vpp, vnode_t dirp, struct nfsvattr *dirforp, struct nfsvattr *diraftp, - int *diraft_retp, nfsattrbit_t *attrbitp, NFSACL_T *aclp, + int *diraft_retp, nfsattrbit_t *attrbitp, NFSACL_T *aclp, NFSACL_T *daclp, NFSPROC_T *p, struct nfsexstuff *exp); /* @@ -310,7 +310,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, nd->nd_repstat = nfsrv_checkgetattr(nd, vp, &nva, &attrbits, p); if (nd->nd_repstat == 0) { - supports_nfsv4acls = nfs_supportsnfsv4acls(vp); + supports_nfsv4acls = nfs_supportsacls(vp); xattrsupp = false; if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_XATTRSUPPORT)) { @@ -409,7 +409,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, struct timespec guard = { 0, 0 }; nfsattrbit_t attrbits, retbits; nfsv4stateid_t stateid; - NFSACL_T *aclp = NULL; + NFSACL_T *aclp = NULL, *daclp = NULL; struct thread *p = curthread; NFSZERO_ATTRBIT(&retbits); @@ -420,6 +420,8 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, #ifdef NFS4_ACL_EXTATTR_NAME aclp = acl_alloc(M_WAITOK); aclp->acl_cnt = 0; + daclp = acl_alloc(M_WAITOK); + daclp->acl_cnt = 0; #endif gotproxystateid = 0; NFSVNO_ATTRINIT(&nva); @@ -435,7 +437,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, stateid.seqid == 0xffffffff) gotproxystateid = 1; } - error = nfsrv_sattr(nd, vp, &nva, &attrbits, aclp, p); + error = nfsrv_sattr(nd, vp, &nva, &attrbits, aclp, daclp, p); if (error) goto nfsmout; @@ -464,6 +466,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, vput(vp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif nfsrv_wcc(nd, preat_ret, &nva2, postat_ret, &nva); goto out; @@ -613,10 +616,28 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, #ifdef NFS4_ACL_EXTATTR_NAME if (!nd->nd_repstat && aclp->acl_cnt > 0 && NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ACL)) { - nd->nd_repstat = nfsrv_setacl(vp, aclp, nd->nd_cred, p); - if (!nd->nd_repstat) + nd->nd_repstat = nfsrv_setacl(vp, aclp, ACL_TYPE_NFS4, + nd->nd_cred, p); + if (!nd->nd_repstat) NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ACL); } + if (!nd->nd_repstat && aclp->acl_cnt > 0 && + NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_POSIXACCESSACL)) { + nd->nd_repstat = nfsrv_setacl(vp, aclp, ACL_TYPE_ACCESS, + nd->nd_cred, p); + if (!nd->nd_repstat) + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_POSIXACCESSACL); + } + if (!nd->nd_repstat && + NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_POSIXDEFAULTACL)) { + if (daclp == NULL) + nd->nd_repstat = NFSERR_INVAL; + if (nd->nd_repstat == 0) + nd->nd_repstat = nfsrv_setacl(vp, daclp, + ACL_TYPE_DEFAULT, nd->nd_cred, p); + if (nd->nd_repstat == 0) + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_POSIXDEFAULTACL); + } #endif } else if (!nd->nd_repstat) { nd->nd_repstat = nfsvno_setattr(vp, &nva, nd->nd_cred, p, @@ -630,6 +651,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, vput(vp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif if (nd->nd_flag & ND_NFSV3) nfsrv_wcc(nd, preat_ret, &nva2, postat_ret, &nva); @@ -645,6 +667,7 @@ nfsmout: vput(vp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif if (nd->nd_flag & ND_NFSV4) { /* @@ -1290,7 +1313,8 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram, switch (how) { case NFSCREATE_GUARDED: case NFSCREATE_UNCHECKED: - error = nfsrv_sattr(nd, NULL, &nva, NULL, NULL, p); + error = nfsrv_sattr(nd, NULL, &nva, NULL, NULL, + NULL, p); if (error) goto nfsmout; break; @@ -1415,7 +1439,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, nfsattrbit_t attrbits; char *bufp = NULL, *pathcp = NULL; u_long *hashp, cnflags; - NFSACL_T *aclp = NULL; + NFSACL_T *aclp = NULL, *daclp = NULL; struct thread *p = curthread; NFSVNO_ATTRINIT(&nva); @@ -1427,6 +1451,8 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, #ifdef NFS4_ACL_EXTATTR_NAME aclp = acl_alloc(M_WAITOK); aclp->acl_cnt = 0; + daclp = acl_alloc(M_WAITOK); + daclp->acl_cnt = 0; #endif /* @@ -1473,6 +1499,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, vrele(dp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif goto out; } @@ -1487,7 +1514,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); vtyp = nfsv34tov_type(*tl); } - error = nfsrv_sattr(nd, NULL, &nva, &attrbits, aclp, p); + error = nfsrv_sattr(nd, NULL, &nva, &attrbits, aclp, daclp, p); if (error) goto nfsmout; nva.na_type = vtyp; @@ -1511,6 +1538,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, vrele(dp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif nfsvno_relpathbuf(&named); if (pathcp) @@ -1544,6 +1572,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, } #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif if (nd->nd_flag & ND_NFSV3) nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, @@ -1556,10 +1585,11 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, if ((nd->nd_flag & ND_NFSV4) && (vtyp == VDIR || vtyp == VLNK)) { if (vtyp == VDIR) { nfsrvd_mkdirsub(nd, &named, &nva, fhp, vpp, dirp, - &dirfor, &diraft, &diraft_ret, &attrbits, aclp, p, - exp); + &dirfor, &diraft, &diraft_ret, &attrbits, aclp, + daclp, p, exp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif goto out; } else if (vtyp == VLNK) { @@ -1568,6 +1598,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, aclp, p, exp, pathcp, pathlen); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif free(pathcp, M_TEMP); goto out; @@ -1577,7 +1608,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_repstat = nfsvno_mknod(&named, &nva, nd->nd_cred, p); if (!nd->nd_repstat) { vp = named.ni_vp; - nfsrv_fixattr(nd, vp, &nva, aclp, p, &attrbits, exp); + nfsrv_fixattr(nd, vp, &nva, aclp, daclp, p, &attrbits, exp); nd->nd_repstat = nfsvno_getfh(vp, fhp, p); if ((nd->nd_flag & ND_NFSV3) && !nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd, p, 1, @@ -1608,6 +1639,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif out: @@ -1617,6 +1649,7 @@ nfsmout: vrele(dp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif if (bufp) nfsvno_relpathbuf(&named); @@ -2086,7 +2119,8 @@ nfsrvd_symlinksub(struct nfsrv_descript *nd, struct nameidata *ndp, nd->nd_repstat = nfsvno_symlink(ndp, nvap, pathcp, pathlen, !(nd->nd_flag & ND_NFSV2), nd->nd_saveduid, nd->nd_cred, p, exp); if (!nd->nd_repstat && !(nd->nd_flag & ND_NFSV2)) { - nfsrv_fixattr(nd, ndp->ni_vp, nvap, aclp, p, attrbitp, exp); + nfsrv_fixattr(nd, ndp->ni_vp, nvap, aclp, NULL, p, attrbitp, + exp); if (nd->nd_flag & ND_NFSV3) { nd->nd_repstat = nfsvno_getfh(ndp->ni_vp, fhp, p); if (!nd->nd_repstat) @@ -2143,7 +2177,8 @@ nfsrvd_mkdir(struct nfsrv_descript *nd, __unused int isdgram, if (!nd->nd_repstat) { NFSVNO_ATTRINIT(&nva); if (nd->nd_flag & ND_NFSV3) { - error = nfsrv_sattr(nd, NULL, &nva, NULL, NULL, p); + error = nfsrv_sattr(nd, NULL, &nva, NULL, NULL, NULL, + p); if (error) goto nfsmout; } else { @@ -2179,7 +2214,7 @@ nfsrvd_mkdir(struct nfsrv_descript *nd, __unused int isdgram, * Call nfsrvd_mkdirsub() for the code common to V4 as well. */ nfsrvd_mkdirsub(nd, &named, &nva, fhp, vpp, dirp, &dirfor, &diraft, - &diraft_ret, NULL, NULL, p, exp); + &diraft_ret, NULL, NULL, NULL, p, exp); if (nd->nd_flag & ND_NFSV3) { if (!nd->nd_repstat) { @@ -2209,7 +2244,7 @@ static void nfsrvd_mkdirsub(struct nfsrv_descript *nd, struct nameidata *ndp, struct nfsvattr *nvap, fhandle_t *fhp, vnode_t *vpp, vnode_t dirp, struct nfsvattr *dirforp, struct nfsvattr *diraftp, - int *diraft_retp, nfsattrbit_t *attrbitp, NFSACL_T *aclp, + int *diraft_retp, nfsattrbit_t *attrbitp, NFSACL_T *aclp, NFSACL_T *daclp, NFSPROC_T *p, struct nfsexstuff *exp) { vnode_t vp; @@ -2220,7 +2255,7 @@ nfsrvd_mkdirsub(struct nfsrv_descript *nd, struct nameidata *ndp, nd->nd_cred, p, exp); if (!nd->nd_repstat) { vp = ndp->ni_vp; - nfsrv_fixattr(nd, vp, nvap, aclp, p, attrbitp, exp); + nfsrv_fixattr(nd, vp, nvap, aclp, daclp, p, attrbitp, exp); nd->nd_repstat = nfsvno_getfh(vp, fhp, p); if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, nvap, nd, p, 1, @@ -2941,7 +2976,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, nfsquad_t clientid; char *bufp = NULL; u_long *hashp; - NFSACL_T *aclp = NULL; + NFSACL_T *aclp = NULL, *daclp = NULL; struct thread *p = curthread; bool done_namei; __enum_uint8_decl(wdelegace) { USENONE, USEMODE, USENFSV4ACL } @@ -2950,6 +2985,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, #ifdef NFS4_ACL_EXTATTR_NAME aclp = acl_alloc(M_WAITOK); aclp->acl_cnt = 0; + daclp = acl_alloc(M_WAITOK); + daclp->acl_cnt = 0; #endif NFSZERO_ATTRBIT(&attrbits); done_namei = false; @@ -3060,7 +3097,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, switch (how) { case NFSCREATE_UNCHECKED: case NFSCREATE_GUARDED: - error = nfsv4_sattr(nd, NULL, &nva, &attrbits, aclp, p); + error = nfsv4_sattr(nd, NULL, &nva, &attrbits, aclp, + daclp, p); if (error) goto nfsmout; /* @@ -3086,7 +3124,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF); cverf[0] = *tl++; cverf[1] = *tl; - error = nfsv4_sattr(nd, NULL, &nva, &attrbits, aclp, p); + error = nfsv4_sattr(nd, NULL, &nva, &attrbits, aclp, + daclp, p); if (error != 0) goto nfsmout; if ((vn_irflag_read(dp) & VIRF_NAMEDDIR) != 0 || @@ -3153,6 +3192,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, vrele(dp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif free(stp, M_NFSDSTATE); nfsvno_relpathbuf(&named); @@ -3209,8 +3249,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, } } nfsvno_open(nd, &named, clientid, &stateid, stp, - &exclusive_flag, &nva, cverf, create, aclp, &attrbits, - nd->nd_cred, done_namei, exp, &vp); + &exclusive_flag, &nva, cverf, create, aclp, daclp, + &attrbits, nd->nd_cred, done_namei, exp, &vp); } else if (claim == NFSV4OPEN_CLAIMPREVIOUS || claim == NFSV4OPEN_CLAIMFH || claim == NFSV4OPEN_CLAIMDELEGATECURFH || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { @@ -3465,6 +3505,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, vrele(dirp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif NFSEXITCODE2(0, nd); return (0); @@ -3472,6 +3513,7 @@ nfsmout: vrele(dp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); + acl_free(daclp); #endif if (stp) free(stp, M_NFSDSTATE); diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index b09ec1b3a062..ea8382e4282a 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -1644,8 +1644,8 @@ out: */ void nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp, - struct nfsvattr *nvap, NFSACL_T *aclp, NFSPROC_T *p, nfsattrbit_t *attrbitp, - struct nfsexstuff *exp) + struct nfsvattr *nvap, NFSACL_T *aclp, NFSACL_T *daclp, NFSPROC_T *p, + nfsattrbit_t *attrbitp, struct nfsexstuff *exp) { int change = 0; struct nfsvattr nva; @@ -1709,16 +1709,34 @@ nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp, } #ifdef NFS4_ACL_EXTATTR_NAME if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_ACL) && - nfsrv_useacl != 0 && aclp != NULL) { - if (aclp->acl_cnt > 0) { - error = nfsrv_setacl(vp, aclp, nd->nd_cred, p); - if (error) { - NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_ACL); - } - } + nfsrv_useacl != 0 && aclp != NULL && aclp->acl_cnt > 0) { + error = nfsrv_setacl(vp, aclp, ACL_TYPE_NFS4, + nd->nd_cred, p); + if (error != 0) + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_ACL); } else -#endif + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_ACL); + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_POSIXACCESSACL) && + nfsrv_useacl != 0 && aclp != NULL && aclp->acl_cnt > 0) { + error = nfsrv_setacl(vp, aclp, ACL_TYPE_ACCESS, + nd->nd_cred, p); + if (error != 0) + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_POSIXACCESSACL); + } else + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_POSIXACCESSACL); + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_POSIXDEFAULTACL) && + nfsrv_useacl != 0 && daclp != NULL && daclp->acl_cnt > 0) { + error = nfsrv_setacl(vp, daclp, ACL_TYPE_DEFAULT, + nd->nd_cred, p); + if (error != 0) + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_POSIXDEFAULTACL); + } else + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_POSIXDEFAULTACL); +#else NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_ACL); + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_POSIXACCESSACL); + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_POSIXDEFAULTACL); +#endif nd->nd_cred->cr_uid = tuid; out: From nobody Mon Dec 22 00:17:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZJc36wc2z6LhBl for ; Mon, 22 Dec 2025 00:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZJc32V29z48vY for ; Mon, 22 Dec 2025 00:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766362627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsSJL5n06OieN4YD5+iSz3xccm/5Yae9mrYbMI5HrkY=; b=Eb2tJ8iK0SJnjVvd7Rkr8DTJPX3p24/AZQ92jwRATNn0q7CTj5GHdigKqUMd774kXdNufA ppz9mdmmFor02ng7C7y5Tih1GqDGLzpfr99LJX7HdcHT2F2QuDUwCOR+SpSIUutqjvI9K0 9YJaXpXTJ9iFd5Og4h3pGfjIQDp0OTlJDkpHpUcabWoeIY0wzjApnN3/DgsFMUwjK+fN5U 8gIdaAgM0Wgzy/WV/IO0PKTKkUn80Zo7ICkprdIV3AF2+Uy81jrkg1WC2HE+ZyysQZeNph 1U9QIbGjoRf3lBrmDPx6SnrP2MFBATuPNdUZ/zFkZuK/O4G8XyQgj0GGTRHCuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766362627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsSJL5n06OieN4YD5+iSz3xccm/5Yae9mrYbMI5HrkY=; b=adZ/wzLUOD0g2t8cmkQ5n0ZNb5VnC1ESTxpypA/GnaPWUo8fnx9RTGlJwLP0IrFEKV7Yu5 CRzFMlVzCFXNa9ukNQcNiToirgEleZCZ58gjOKRcDCfkVsxxal7wK+NnEENj+6mlfpJq+H RLckaCx4/zfBVFtUHoYE6bJ6omAvCbhOezmTwpGGIV2MjobnjDvhZ4anHSMLRecEocev2C eIdFEMKhpG+g3r4TlpEE0dC49ZLEDGL1AXV0tXfiBxxVfySGZb6n2eojFZyvK2SEXBeFQv C4mkdp9o8itzgYSUMgPn8LL5ATwmYIHbJrdNdPlPrJLnQLXniXAOD9/NnM99KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766362627; a=rsa-sha256; cv=none; b=NRdfujKdJ7R7L68jC3JmMiSKIEQBF7gmbfFJHeZ8FfFJjpuYSS/CUyp0FsHOfW6n2LQyLX S+ctT6agW5g7Fr79BoTKYqrJ71BYnovs2j3xu7TxQiAns/D9uFlMn/fLoFjLaTf82AIPO0 E1nF/k1ZlKtyQj/GfHwfUyhufzc8E5jXXCz62eF2RNF63o/8DhWT7ZM/Jg+WOcX+1jYhGJ Uyf4SBJk5+l8JgXMW/LrxSwppJ77PDFeSn57oLoS8BrlaGy0AvYlpTCAoVEpscOWz+cW9Q afJiuV+L2pImL70Lplac1GXtGB+gurlMFbb5GaeYITDDPARhB0AimXX7Qs1Ibg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZJc31WB3z12tP for ; Mon, 22 Dec 2025 00:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 00:17:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: a8b4122afda8 - Create tag vendor/xz/5.8.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/xz/5.8.2 X-Git-Reftype: annotated tag X-Git-Commit: a8b4122afda81a878517c82059a1c2dc40f76525 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 00:17:07 +0000 Message-Id: <69488e03.20e5c.46abf9c7@gitrepo.freebsd.org> The annotated tag vendor/xz/5.8.2 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/xz/5.8.2 tag vendor/xz/5.8.2 Tagger: Xin LI TaggerDate: 2025-12-22 00:14:48 +0000 Tag xz 5.8.2. commit 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e Author: Xin LI AuthorDate: 2025-12-22 00:14:28 +0000 Commit: Xin LI CommitDate: 2025-12-22 00:14:28 +0000 Vendor import of xz 5.8.2 (trimmed) From nobody Mon Dec 22 00:17:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZJc92q3kz6Lh8q for ; Mon, 22 Dec 2025 00:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZJc84QLqz499j for ; Mon, 22 Dec 2025 00:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766362632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kMe089ixR04DDfxrH/d/TJ6nQXo9DZUBBdPjaYMvI0=; b=h+c5s1lOtF92AtpmJcOFWx/j5oo4Z6bPYhXk/yq+J7sQ4gAQ+vJoV+CLh/KAP5SbQ8jg7B 9Czx5ztTPh+u3Enh0WrTPbcpyHkCisPb3VqJ8F6Aaco+25PKZ9Nwtx8jwWZntv4dVw2NFX t3AfhNi4UXoq6KnJE4SeYiqUppgcSbK285kiowt8LqngdkV7bhlmaqRbeG/RDMxPaSB8BI /cV9AD/A6BbyfhEB39BMBn+oXD4D8kjwF2qBkanQg2vUvJfjE7g1Fuy9o7FN+aksMm01rj MCCSBf7m5nbyfRkKt2I2loVTrDU/XQhAHetgq2JfbVf/pV9bHJXVByGiHwqxuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766362632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kMe089ixR04DDfxrH/d/TJ6nQXo9DZUBBdPjaYMvI0=; b=oFSAOr8tbZEGi7/aUVziQt/ZEt9szWvwatHj5+4oIIxNYWYYxOIQNMFBwgRq+LTgUxY7yP hT8yHXG4kvVHyhReM4yYmfZMfaaYJfayMgednxQWM93zfwyVOoz0ZnYFp7lNe7ItNdiwFE 6l6+EcsRgLoJMRqOMVw6b+c+V081r3CpN32ElMoKNwKLnB7j9JhqjHgodbWlSbsLfYZd5p U/vf8Jv+1ESP2OsGPNMnzMIrHCKbLvUzK/fO2RG5JlNTMPeqEUDABMwj3/lEfDL49BrWMX bLqO3Q/ImdlwGgbLDJh/5RLbAZ3+MCUe2mzDhCnLkyFKAqbubPos26oORmCUYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766362632; a=rsa-sha256; cv=none; b=ayx0B4LTk0NPFPe9XDFn04bhLRzjiAa/KNtEm9/xrLtqCtD/Kh584yIsBi0GtFXElRyE1A /lY00TOvzJZat1IFKNZ6D5BLvAGRkSIP1RvAr7rAnUDIXj0AutWk4JTKKDWkc2eFGzlH5U 6hlNF+7ulxvaUY8sSH9pChJzNTyVtZdb9Ao+jYNjqMDXMW/FxffoVZRM/rJb+QlAAhWJAF sI4GRJr92btCyPR9xl8vuh7wh/I35zHYdaG1dsu0goLwBpEpSIxBGbRyRJb0EFNlMpgdEa MhWQaTdUgLojsvpsz5ummpdEstC2XQHrSprXIkluq3CWdvfSjrpvYSb2Abdcxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZJc80vjqz12qm for ; Mon, 22 Dec 2025 00:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22444 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 00:17:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 12eff5f0d8b7..762f11d98d5c - vendor/xz - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/xz X-Git-Reftype: branch X-Git-Commit: 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e X-Git-Oldrev: 12eff5f0d8b7f4cf5c87b697cc5729d6c223e4c0 X-Git-Newrev: 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 00:17:07 +0000 Message-Id: <69488e03.22444.501a0b14@gitrepo.freebsd.org> The branch vendor/xz has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=12eff5f0d8b7..762f11d98d5c 762f11d98d5c Vendor import of xz 5.8.2 (trimmed) From nobody Mon Dec 22 00:38:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZK531wCwz6LkDj for ; Mon, 22 Dec 2025 00:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZK52667gz3Cw6 for ; Mon, 22 Dec 2025 00:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766363926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FaH4vm50DUHLD6PPoo4tjfCqWVuG+iY7bDyhBTwIyPU=; b=t6q/Pv7/laqJ0Oqpj/tX+w5P+nITSBD6xKJjC5VhfzHRZzv7mslrqb7dUa4v1pSApom/8E cnIHMAT/5tLtnxyHXD98gabWWXPvZ533wQKRoRsWGe7xthbT3valbR6XKlOcwve63lD2Zt 09fK7ZHYhI+1xAKk+9cw+O67MdRY7KQTnmmA+iGkKJbjqoYBjPrfpg77MfGE7NRyC2zJVG EQM3pD6Kaxw4FzTJw5xm+uigyajv0xzmmAagzJ6Vt41+zvVFEX7jDZ/g424Lr/VTzyK6w/ AOIcTlJMISe/q6XlZUFq79JdzrdwVrOE2N9JhzkT5Mbbf6tDKrO5lwZi/SheLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766363926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FaH4vm50DUHLD6PPoo4tjfCqWVuG+iY7bDyhBTwIyPU=; b=gjkeO2NisEMchWd/C+WWF3pzlWDFg97XcXxsCrxrWuRlWpK3o9RnXdEqRgi/vV+gMA5OqV FQYjUZoNe/l9by7fspYmzV2ePCmMas0OBOhp3ja6RB3u+Or9DbvsyhOrJGAGQVJdK4wTsb DF37VhuE9MIGRu/CEXHh3PmaH79PH2x+tM4tU3vSKz0vqZqUWfjD0mGNtF2xAoT2R6d6ZB ZXgyj3MpYST9XyzzsFkl/vNdwOQmemPHDNMC5jdYE/X2y11xJ8oiPJANMzW/yiH8j1EZ3j UOyZ2A8FR0XJVwgZQLEYjs2kwAJi7xoT80SOl+3pAPxbdPW25QNhyP0ClUZ9Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766363926; a=rsa-sha256; cv=none; b=r5DAROmHTgPBHcUxZ+pKTZvaNRvUxTgAY5sVRA6qB6iOP6GYmQTWPYTBc+FduvXJujOKNx OzGfRVgCVomUh5/4zgLQf2iSovBP+mKgj42jVsg6q/Ct7q/EhM85bniZJLNO7t13BPXbRw 8qB6DlOx/KM6O7T7Usi3bdHhR/1HKDTWNwoRi0jukNY5PRXftfKwS3h49kLAnoeMe40Mq5 TYo02WGHuqmws9mrVpU9vCFzHE9zBg9CX6qNTtWQGEb9nmMv5AqSWC0jRO6wLrqDAohqxy 9qws0xrXYk0oGQ3KXGVaYqXlzvIR2i15He5GjvusEiyw8hz/k4p9WACgG9IF/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZK524sMYz13hx for ; Mon, 22 Dec 2025 00:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 252e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 00:38:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 112c453ba910 - stable/15 - geom(9): struct bio KBI fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 112c453ba91012f19ed140c56a3ac8fc929ddabb Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 00:38:46 +0000 Message-Id: <69489316.252e6.179063dd@gitrepo.freebsd.org> The branch stable/15 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=112c453ba91012f19ed140c56a3ac8fc929ddabb commit 112c453ba91012f19ed140c56a3ac8fc929ddabb Author: Ka Ho Ng AuthorDate: 2025-12-21 22:45:03 +0000 Commit: Ka Ho Ng CommitDate: 2025-12-22 00:37:40 +0000 geom(9): struct bio KBI fix The struct bio was changed after cb85c2e2e995 on the branch. To fix this, move BIO_ERROR flag to another value, and now BIO_ERROR_COMPAT occupies 0x1 instead. Also, introduce b_error_compat field at the place where the old bio_error was. This allows non-CAM(9) disk drivers and software volume manager modules compiled against 15.0-RELEASE kernel to work on 15-STABLE kernel again. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54327 Approved by: re (cperciva) --- sys/geom/geom_io.c | 1 + sys/kern/vfs_bio.c | 21 ++++++++++++++++++++- sys/sys/bio.h | 4 +++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 247a623bf1bf..3a58b3ec9d00 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -545,6 +545,7 @@ g_io_request(struct bio *bp, struct g_consumer *cp) bp->bio_from = cp; bp->bio_to = pp; bp->bio_error = 0; + bp->bio_error_compat = 0; bp->bio_completed = 0; KASSERT(!(bp->bio_flags & BIO_ONQUEUE), diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 880cc6b99951..c02aa30fb03a 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4474,6 +4474,14 @@ biodone(struct bio *bp) biotrack(bp, __func__); + if ((bp->bio_flags & BIO_ERROR_COMPAT) != 0) { + /* The caller of this KPI is using the old bio(9) KBI */ + bp->bio_error = bp->bio_error_compat; + bp->bio_flags |= BIO_ERROR; + bp->bio_error_compat = 0; + bp->bio_flags &= BIO_ERROR_COMPAT; + } + /* * Avoid completing I/O when dumping after a panic since that may * result in a deadlock in the filesystem or pager code. Note that @@ -4505,8 +4513,19 @@ biodone(struct bio *bp) bp->bio_flags |= BIO_DONE; wakeup(bp); mtx_unlock(mtxp); - } else + } else { + if ((bp->bio_flags & BIO_ERROR) != 0) { + /* + * Provide compatibility with the consumers of the old + * bio(9) KBI filled in bio_done callback handler. + */ + bp->bio_error_compat = bp->bio_error; + bp->bio_flags |= BIO_ERROR_COMPAT; + } done(bp); + bp->bio_error_compat = 0; + bp->bio_flags &= BIO_ERROR_COMPAT; + } } /* diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 5c12c858f3e5..ae59c659e661 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -54,7 +54,7 @@ #define BIO_SPEEDUP 0x0a /* Upper layers face shortage */ /* bio_flags */ -#define BIO_ERROR 0x01 /* An error occurred processing this bio. */ +#define BIO_ERROR_COMPAT 0x01 /* KBI compat on stable/15. */ #define BIO_DONE 0x02 /* This bio is finished. */ #define BIO_ONQUEUE 0x04 /* This bio is in a queue & not yet taken. */ /* @@ -66,6 +66,7 @@ #define BIO_TRANSIENT_MAPPING 0x20 #define BIO_VLIST 0x40 #define BIO_SWAP 0x200 /* Swap-related I/O */ +#define BIO_ERROR 0x1000 /* An error occurred processing this bio. */ #define BIO_EXTERR 0x2000 #define BIO_SPEEDUP_WRITE 0x4000 /* Resource shortage at upper layers */ #define BIO_SPEEDUP_TRIM 0x8000 /* Resource shortage at upper layers */ @@ -97,6 +98,7 @@ struct bio { struct vm_page **bio_ma; /* Or unmapped. */ int bio_ma_offset; /* Offset in the first page of bio_ma. */ int bio_ma_n; /* Number of pages in bio_ma. */ + int bio_error_compat; /* Error for KBI compat on stable/15 */ long bio_resid; /* Remaining I/O in bytes. */ void (*bio_done)(struct bio *); void *bio_driver1; /* Private use by the provider. */ From nobody Mon Dec 22 01:08:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZKln015Wz6LnHX for ; Mon, 22 Dec 2025 01:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZKlm44PKz3HGl for ; Mon, 22 Dec 2025 01:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QafS1sryQR/W3D4qHD6AH2mmaQNQNtlfMzfhMX6RorM=; b=VkuuzZVVgmX1hSFx6GmBreJuGU8HxEUO71TISlz5Y87Mt8SB7Hp1d1tIyNkunLmTftDiKf OcA2PN6tmPPKl9cF3WRCMR6KalPkm8uGML4UFsIsYnDht909E9WmyAwQUBkkTKTvbh74mN V9KABPAQmC4Qb/XImDTdqur4Q0Iadsu/HuyIORtjFsoZHEPr4OZGZx4IzSzZQALuMQh7AY FgRY0wLXj17Fqs9nzhs0Icp0+mtFgDUOyhArf80Dp3lhYdJtBohfCFgTIG4bpiv6f8EnrK EPIioCIvOWbLEuykLQO9rvTrpWE3kYWsNhHrKugwuNBp/3V0KaRbBLeLzwljcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QafS1sryQR/W3D4qHD6AH2mmaQNQNtlfMzfhMX6RorM=; b=mr7Hni3XUfhZn3sKLbOcDUHKwn8dHRmLPr/41gUfcw7Xsbya6e5DEKw7bLCKvWi+0lLVB2 2BMS3LwLzL0kKCY6zS6+u1SrdfCaelJ8PSN3q87sTjIww8+ctWQP4Gi6wU5pZZrrar25Iv fxZtRecFn9Qif+smYU2TwEvyBAPT0bcFeJpWbav1u3eqeMMA9DzBSEKEP29olFKrcfTihC TTV/G3OHWavgrZVsAFY7adrXl5TVJN5NBQrx7KftDvWiXAT/2CHLbt4AtWYZ+YCpVnS6Mt JRt9jfDs0/MyJbcRFb/LjlgPvt9vB2PtXnF+5t9BRYrWAgKujmh8hiVgTKzxjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766365732; a=rsa-sha256; cv=none; b=QYgGG7sKNYxa+b6KgEkVdx4vQRvPKlnBTq/bCWbfNeXliaAm+p9I+gWfV60IGS2t2DVUZd MIaqQQhHfiCM+LXNaLC/mvH+1sGZcaafJ3fEHhXbNpgkrT/fTEt8QPRV6gZQVt9Shi2oTa 2I+a6wPLZMzgHGlSE4flyrYaDvY4n8JCHJAbZnhwKuewTou2nYUydChFFU5hfeRTm5SKVd Ingh1hxxnN4KvfA+fpotvCT4UkhOZLXDv0KMoh942J1H253m5CEyKWUSTrOo38n4Qjs/Gg hoDRACegNOHfqLuCFYa/lzTxF6Uh//Wm9B/i6nL9db/UPu6XzAj/RujVVxq22w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZKlm3V4rz14TD for ; Mon, 22 Dec 2025 01:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 01:08:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 949cff4dceff - main - nfscommon: Add some support for POSIX draft ACLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 949cff4dceffdbee70fa7741c1d61cf6c5255aeb Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 01:08:47 +0000 Message-Id: <69489a1f.27d2d.62a82838@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=949cff4dceffdbee70fa7741c1d61cf6c5255aeb commit 949cff4dceffdbee70fa7741c1d61cf6c5255aeb Author: Rick Macklem AuthorDate: 2025-12-22 01:07:10 +0000 Commit: Rick Macklem CommitDate: 2025-12-22 01:07:10 +0000 nfscommon: Add some support for POSIX draft ACLs An internet draft (expected to become an RFC someday) https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls describes an extension to NFSv4.2 to handle POSIX draft ACLs. This is the third of several patches that implement the above draft. There should be no semantics change for the series at this point. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfs/nfs_commonacl.c | 195 ++++++++++++++++++++++++++++++- sys/fs/nfs/nfs_commonsubs.c | 272 ++++++++++++++++++++++++++++++++++++++++---- sys/fs/nfs/nfs_var.h | 3 + 3 files changed, 445 insertions(+), 25 deletions(-) diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c index bba1d8821a9b..2120b095823b 100644 --- a/sys/fs/nfs/nfs_commonacl.c +++ b/sys/fs/nfs/nfs_commonacl.c @@ -36,7 +36,7 @@ static int nfsrv_acemasktoperm(u_int32_t acetype, u_int32_t mask, int owner, __enum_uint8(vtype) type, acl_perm_t *permp); /* - * Handle xdr for an ace. + * Handle xdr for an NFSv4 ace. */ int nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep, @@ -181,6 +181,84 @@ nfsmout: return (error); } +static acl_tag_t nfsv4_to_posixacltag[NFSV4_POSIXACL_TAG_OTHER + 1] = + { ACL_UNDEFINED_TAG, ACL_USER_OBJ, ACL_USER, ACL_GROUP_OBJ, + ACL_GROUP, ACL_MASK, ACL_OTHER }; + +/* + * Handle xdr for a POSIX draft ace. + */ +int +nfsrv_dissectposixace(struct nfsrv_descript *nd, struct acl_entry *acep, + bool server, int *aceerrp, int *acesizep) +{ + uint32_t *tl, tag; + int len, error = 0, aceerr = 0; + u_char *name, namestr[NFSV4_SMALLSTR + 1]; + gid_t gid; + uid_t uid; + + *aceerrp = 0; + NFSM_DISSECT(tl, uint32_t *, 3 * NFSX_UNSIGNED); + tag = fxdr_unsigned(uint32_t, *tl++); + acep->ae_perm = fxdr_unsigned(acl_perm_t, *tl++); + len = fxdr_unsigned(int, *tl); + /* + * The RFCs do not specify a limit to the length of the "who", but + * NFSV4_OPAQUELIMIT (1024) should be sufficient. + */ + if (len < 0 || len > NFSV4_OPAQUELIMIT) { + error = NFSERR_BADXDR; + goto nfsmout; + } + if (tag < NFSV4_POSIXACL_TAG_USER_OBJ || + tag > NFSV4_POSIXACL_TAG_OTHER) { + error = NFSERR_ATTRNOTSUPP; + goto nfsmout; + } + acep->ae_tag = nfsv4_to_posixacltag[tag]; + if (len > NFSV4_SMALLSTR) + name = malloc(len + 1, M_NFSSTRING, M_WAITOK); + else + name = namestr; + if (len > 0) + error = nfsrv_mtostr(nd, name, len); + if (error != 0) { + if (len > NFSV4_SMALLSTR) + free(name, M_NFSSTRING); + goto nfsmout; + } + switch (acep->ae_tag) { + case ACL_USER: + aceerr = nfsv4_strtouid(nd, name, len, &uid); + if (aceerr == 0) + acep->ae_id = uid; + break; + case ACL_GROUP: + aceerr = nfsv4_strtogid(nd, name, len, &gid); + if (aceerr == 0) + acep->ae_id = (uid_t)gid; + break; + case ACL_USER_OBJ: + case ACL_GROUP_OBJ: + case ACL_MASK: + case ACL_OTHER: + break; + default: + aceerr = NFSERR_ATTRNOTSUPP; + } + if (len > NFSV4_SMALLSTR) + free(name, M_NFSSTRING); + + *aceerrp = aceerr; + if (acesizep != NULL) + *acesizep = NFSM_RNDUP(len) + (3 * NFSX_UNSIGNED); + error = 0; +nfsmout: + NFSEXITCODE(error); + return (error); +} + /* * Turn an NFSv4 ace mask into R/W/X flag bits. */ @@ -277,9 +355,11 @@ out: /* local functions */ static int nfsrv_buildace(struct nfsrv_descript *, u_char *, int, __enum_uint8(vtype), int, int, struct acl_entry *); +static int nfsrv_buildposixace(struct nfsrv_descript *, u_char *, int, + struct acl_entry *); /* - * This function builds an NFS ace. + * This function builds an NFSv4 ace. */ static int nfsrv_buildace(struct nfsrv_descript *nd, u_char *name, int namelen, @@ -399,6 +479,59 @@ nfs_aceperm(acl_perm_t ae_perm) return (acemask); } +/* + * This function builds a POSIX draft ace. + */ +static int +nfsrv_buildposixace(struct nfsrv_descript *nd, u_char *name, int namelen, + struct acl_entry *ace) +{ + uint32_t *tl; + int full_len; + + full_len = NFSM_RNDUP(namelen); + NFSM_BUILD(tl, uint32_t *, 3 * NFSX_UNSIGNED + full_len); + + /* + * Fill in the ace tag. + */ + switch (ace->ae_tag) { + case ACL_USER_OBJ: + *tl++ = txdr_unsigned(NFSV4_POSIXACL_TAG_USER_OBJ); + break; + case ACL_USER: + *tl++ = txdr_unsigned(NFSV4_POSIXACL_TAG_USER); + break; + case ACL_GROUP_OBJ: + *tl++ = txdr_unsigned(NFSV4_POSIXACL_TAG_GROUP_OBJ); + break; + case ACL_GROUP: + *tl++ = txdr_unsigned(NFSV4_POSIXACL_TAG_GROUP); + break; + case ACL_MASK: + *tl++ = txdr_unsigned(NFSV4_POSIXACL_TAG_MASK); + break; + case ACL_OTHER: + *tl++ = txdr_unsigned(NFSV4_POSIXACL_TAG_OTHER); + break; + default: + printf("nfsrv_buildposixace: bad ae_tag 0x%x\n", ace->ae_tag); + *tl++ = txdr_unsigned(0); + } + + /* + * Fill in the permission bits. + */ + *tl++ = txdr_unsigned(ace->ae_perm); + *tl++ = txdr_unsigned(namelen); + if (namelen > 0) { + if (full_len - namelen) + *(tl + (namelen / NFSX_UNSIGNED)) = 0x0; + memcpy(tl, name, namelen); + } + return (full_len + 3 * NFSX_UNSIGNED); +} + /* * Build an NFSv4 ACL. */ @@ -461,6 +594,64 @@ nfsrv_buildacl(struct nfsrv_descript *nd, NFSACL_T *aclp, __enum_uint8(vtype) ty return (retlen); } +/* + * Build a POSIX draft ACL. + */ +int +nfsrv_buildposixacl(struct nfsrv_descript *nd, NFSACL_T *aclp, + acl_type_t acltype) +{ + int i, entrycnt = 0, retlen; + uint32_t *entrycntp; + unsigned int cnt; + int namelen; + u_char *name, namestr[NFSV4_SMALLSTR]; + bool malloced; + + NFSM_BUILD(entrycntp, uint32_t *, NFSX_UNSIGNED); + retlen = NFSX_UNSIGNED; + cnt = 0; + if (aclp != NULL) + cnt = aclp->acl_cnt; + /* + * Loop through the acl entries, building each one. + */ + for (i = 0; i < cnt; i++) { + malloced = false; + switch (aclp->acl_entry[i].ae_tag) { + case ACL_USER_OBJ: + case ACL_GROUP_OBJ: + case ACL_OTHER: + case ACL_MASK: + namelen = 0; + break; + case ACL_USER: + name = namestr; + nfsv4_uidtostr(aclp->acl_entry[i].ae_id, &name, + &namelen); + if (name != namestr) + malloced = true; + break; + case ACL_GROUP: + name = namestr; + nfsv4_gidtostr((gid_t)aclp->acl_entry[i].ae_id, &name, + &namelen); + if (name != namestr) + malloced = true; + break; + default: + continue; + } + retlen += nfsrv_buildposixace(nd, name, namelen, + &aclp->acl_entry[i]); + entrycnt++; + if (malloced) + free(name, M_NFSSTRING); + } + *entrycntp = txdr_unsigned(entrycnt); + return (retlen); +} + /* * Compare two NFSv4 acls. * Return 0 if they are the same, 1 if not the same. diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 707ad5749ab2..2b0ce45d05dd 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -228,7 +228,7 @@ static bool nfs_bigreply[NFSV42_NPROCS] = { }; /* local functions */ -static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep); +static int nfsrv_skipace(struct nfsrv_descript *nd, acl_type_t, int *acesizep); static void nfsv4_wanted(struct nfsv4lock *lp); static uint32_t nfsv4_filesavail(struct statfs *, struct mount *); static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name); @@ -240,6 +240,7 @@ static uint32_t vtonfsv4_type(struct vattr *); static __enum_uint8(vtype) nfsv4tov_type(uint32_t, uint16_t *); static void nfsv4_setsequence(struct nfsmount *, struct nfsrv_descript *, struct nfsclsession *, bool, struct ucred *); +static uint32_t nfs_trueform(struct vnode *); static struct { int op; @@ -1149,18 +1150,19 @@ int nfsrv_dissectacl(struct nfsrv_descript *nd, NFSACL_T *aclp, bool server, int *aclerrp, int *aclsizep, __unused NFSPROC_T *p) { - u_int32_t *tl; + uint32_t *tl; int i, aclsize; int acecnt, error = 0, aceerr = 0, acesize; + bool posixacl = false; *aclerrp = 0; - if (aclp) + if (aclp != NULL) aclp->acl_cnt = 0; /* * Parse out the ace entries and expect them to conform to * what can be supported by R/W/X bits. */ - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); aclsize = NFSX_UNSIGNED; acecnt = fxdr_unsigned(int, *tl); /* @@ -1176,20 +1178,28 @@ nfsrv_dissectacl(struct nfsrv_descript *nd, NFSACL_T *aclp, bool server, if (nfsrv_useacl == 0) aceerr = NFSERR_ATTRNOTSUPP; for (i = 0; i < acecnt; i++) { - if (aclp && !aceerr) - error = nfsrv_dissectace(nd, &aclp->acl_entry[i], - server, &aceerr, &acesize, p); + if (aclp != NULL && aceerr == 0) { + if (posixacl) + error = nfsrv_dissectposixace(nd, + &aclp->acl_entry[i], server, &aceerr, + &acesize); + else + error = nfsrv_dissectace(nd, + &aclp->acl_entry[i], server, &aceerr, + &acesize, p); + } else if (posixacl) + error = nfsrv_skipace(nd, ACL_TYPE_ACCESS, &acesize); else - error = nfsrv_skipace(nd, &acesize); - if (error) + error = nfsrv_skipace(nd, ACL_TYPE_NFS4, &acesize); + if (error != 0) goto nfsmout; aclsize += acesize; } - if (aclp && !aceerr) + if (aclp != NULL && aceerr == 0) aclp->acl_cnt = acecnt; - if (aceerr) + if (aceerr != 0) *aclerrp = aceerr; - if (aclsizep) + if (aclsizep != NULL) *aclsizep = aclsize; nfsmout: NFSEXITCODE2(error, nd); @@ -1200,16 +1210,22 @@ nfsmout: * Skip over an NFSv4 ace entry. Just dissect the xdr and discard it. */ static int -nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep) +nfsrv_skipace(struct nfsrv_descript *nd, acl_type_t acltype, int *acesizep) { - u_int32_t *tl; + uint32_t *tl; int error, len = 0; - NFSM_DISSECT(tl, u_int32_t *, 4 * NFSX_UNSIGNED); - len = fxdr_unsigned(int, *(tl + 3)); + if (acltype == ACL_TYPE_NFS4) { + NFSM_DISSECT(tl, uint32_t *, 4 * NFSX_UNSIGNED); + len = fxdr_unsigned(int, *(tl + 3)); + *acesizep = NFSM_RNDUP(len) + (4 * NFSX_UNSIGNED); + } else { + NFSM_DISSECT(tl, uint32_t *, 3 * NFSX_UNSIGNED); + len = fxdr_unsigned(int, *(tl + 2)); + *acesizep = NFSM_RNDUP(len) + (3 * NFSX_UNSIGNED); + } error = nfsm_advance(nd, NFSM_RNDUP(len), -1); nfsmout: - *acesizep = NFSM_RNDUP(len) + (4 * NFSX_UNSIGNED); NFSEXITCODE2(error, nd); return (error); } @@ -1437,6 +1453,11 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, NFSCLRBIT_ATTRBIT(&checkattrbits, NFSATTRBIT_ACL); NFSCLRBIT_ATTRBIT(&checkattrbits, NFSATTRBIT_ACLSUPPORT); } + /* Some filesystem do not support POSIX ACL */ + if (nfsrv_useacl == 0 || nfs_supportsposixacls(vp) == 0) { + NFSCLRBIT_ATTRBIT(&checkattrbits, NFSATTRBIT_POSIXACCESSACL); + NFSCLRBIT_ATTRBIT(&checkattrbits, NFSATTRBIT_POSIXDEFAULTACL); + } /* Some filesystems do not support uf_hidden */ if (vp == NULL || VOP_PATHCONF(vp, _PC_HAS_HIDDENSYSTEM, &has_pathconf) != 0) @@ -1655,7 +1676,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, if (error) goto nfsmout; } - + attrsum += cnt; break; case NFSATTRBIT_ACLSUPPORT: @@ -2440,6 +2461,111 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, } attrsum += NFSX_UNSIGNED; break; + case NFSATTRBIT_ACLTRUEFORM: + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (compare) { + if (!(*retcmpp)) { + tuint = nfs_trueform(vp); + if (tuint != fxdr_unsigned(uint32_t, + *tl)) + *retcmpp = NFSERR_NOTSAME; + } +#ifdef notyet + } else if (trueformp != NULL) { + *trueformp = fxdr_unsigned(uint32_t, *tl); + } +#else + } +#endif + attrsum += NFSX_UNSIGNED; + break; + case NFSATTRBIT_ACLTRUEFORMSCOPE: + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (compare) { + if (!(*retcmpp)) { + if (fxdr_unsigned(uint32_t, *tl) != + NFSV4_ACL_SCOPE_FILE_SYSTEM) + *retcmpp = NFSERR_NOTSAME; + } + } + attrsum += NFSX_UNSIGNED; + break; + case NFSATTRBIT_POSIXACCESSACL: + if (compare) { + if (!(*retcmpp)) { + if (nfsrv_useacl && nfs_supportsposixacls(vp)) { + NFSACL_T *naclp; + + naclp = acl_alloc(M_WAITOK); + error = nfsrv_dissectacl(nd, naclp, true, + &aceerr, &cnt, p); + if (error) { + acl_free(naclp); + goto nfsmout; + } + if (aceerr || aclp == NULL || + nfsrv_compareacl(aclp, naclp)) + *retcmpp = NFSERR_NOTSAME; + acl_free(naclp); + } else { + error = nfsrv_dissectacl(nd, NULL, true, + &aceerr, &cnt, p); + if (error) + goto nfsmout; + *retcmpp = NFSERR_ATTRNOTSUPP; + } + } + } else { + if (vp != NULL && aclp != NULL) + error = nfsrv_dissectacl(nd, aclp, false, + &aceerr, &cnt, p); + else + error = nfsrv_dissectacl(nd, NULL, false, + &aceerr, &cnt, p); + if (error) + goto nfsmout; + } + + attrsum += cnt; + break; + case NFSATTRBIT_POSIXDEFAULTACL: + if (compare) { + if (!(*retcmpp)) { + if (nfsrv_useacl && nfs_supportsposixacls(vp)) { + NFSACL_T *naclp; + + naclp = acl_alloc(M_WAITOK); + error = nfsrv_dissectacl(nd, naclp, true, + &aceerr, &cnt, p); + if (error) { + acl_free(naclp); + goto nfsmout; + } + if (aceerr || aclp == NULL || + nfsrv_compareacl(aclp, naclp)) + *retcmpp = NFSERR_NOTSAME; + acl_free(naclp); + } else { + error = nfsrv_dissectacl(nd, NULL, true, + &aceerr, &cnt, p); + if (error) + goto nfsmout; + *retcmpp = NFSERR_ATTRNOTSUPP; + } + } + } else { + if (vp != NULL && aclp != NULL) + error = nfsrv_dissectacl(nd, aclp, false, + &aceerr, &cnt, p); + else + error = nfsrv_dissectacl(nd, NULL, false, + &aceerr, &cnt, p); + if (error) + goto nfsmout; + } + + attrsum += cnt; + break; default: printf("EEK! nfsv4_loadattr unknown attr=%d\n", bitpos); @@ -2711,7 +2837,8 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, struct statfs *fs; struct nfsfsinfo fsinf; struct timespec temptime; - NFSACL_T *aclp, *naclp = NULL; + NFSACL_T *aclp, *naclp = NULL, *paclp, *npaclp = NULL, *daclp; + NFSACL_T *ndaclp = NULL; short irflag; #ifdef QUOTA struct dqblk dqb; @@ -2730,11 +2857,21 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, */ if (p == NULL && cred == NULL) { NFSCLRNOTSETABLE_ATTRBIT(retbitp, nd); - aclp = saclp; + /* Only one of the ACL types can be set for a call. */ + if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_ACL)) + aclp = saclp; + else if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_POSIXACCESSACL)) + paclp = saclp; + else if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_POSIXDEFAULTACL)) + daclp = saclp; } else { NFSCLRNOTFILLABLE_ATTRBIT(retbitp, nd); naclp = acl_alloc(M_WAITOK); aclp = naclp; + npaclp = acl_alloc(M_WAITOK); + paclp = npaclp; + ndaclp = acl_alloc(M_WAITOK); + daclp = ndaclp; } nfsvno_getfs(&fsinf, isdgram); /* @@ -2769,12 +2906,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, */ if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_ACLSUPPORT) && (nfsrv_useacl == 0 || ((cred != NULL || p != NULL) && - supports_nfsv4acls == 0))) { + supports_nfsv4acls != SUPPACL_NFSV4))) { NFSCLRBIT_ATTRBIT(retbitp, NFSATTRBIT_ACLSUPPORT); } if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_ACL)) { if (nfsrv_useacl == 0 || ((cred != NULL || p != NULL) && - supports_nfsv4acls == 0)) { + supports_nfsv4acls != SUPPACL_NFSV4)) { NFSCLRBIT_ATTRBIT(retbitp, NFSATTRBIT_ACL); } else if (naclp != NULL) { if (NFSVOPLOCK(vp, LK_SHARED) == 0) { @@ -2796,6 +2933,49 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, } } + /* and the POSIX draft ACL. */ + if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_POSIXACCESSACL)) { + if (nfsrv_useacl == 0 || ((cred != NULL || p != NULL) && + supports_nfsv4acls != SUPPACL_POSIX)) { + NFSCLRBIT_ATTRBIT(retbitp, NFSATTRBIT_POSIXACCESSACL); + } else if (npaclp != NULL) { + if (NFSVOPLOCK(vp, LK_SHARED) == 0) { + error = VOP_ACCESSX(vp, VREAD_ACL, cred, p); + if (error == 0) + error = VOP_GETACL(vp, ACL_TYPE_ACCESS, + npaclp, cred, p); + NFSVOPUNLOCK(vp); + } else + error = NFSERR_PERM; + if (error != 0) { + if (reterr) { + nd->nd_repstat = NFSERR_INVAL; + free(fs, M_STATFS); + return (0); + } + NFSCLRBIT_ATTRBIT(retbitp, + NFSATTRBIT_POSIXACCESSACL); + } + } + } + if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_POSIXDEFAULTACL)) { + if (nfsrv_useacl == 0 || ((cred != NULL || p != NULL) && + supports_nfsv4acls != SUPPACL_POSIX)) { + NFSCLRBIT_ATTRBIT(retbitp, NFSATTRBIT_POSIXDEFAULTACL); + } else if (ndaclp != NULL) { + if (NFSVOPLOCK(vp, LK_SHARED) == 0) { + error = VOP_ACCESSX(vp, VREAD_ACL, cred, p); + if (error == 0) + error = VOP_GETACL(vp, ACL_TYPE_DEFAULT, + ndaclp, cred, p); + NFSVOPUNLOCK(vp); + } else + error = NFSERR_PERM; + if (error != 0) + ndaclp->acl_cnt = 0; + } + } + /* * Put out the attribute bitmap for the ones being filled in * and get the field for the number of attributes returned. @@ -2813,10 +2993,17 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, case NFSATTRBIT_SUPPORTEDATTRS: NFSSETSUPP_ATTRBIT(&attrbits, nd); if (nfsrv_useacl == 0 || ((cred != NULL || p != NULL) - && supports_nfsv4acls == 0)) { + && supports_nfsv4acls != SUPPACL_NFSV4)) { NFSCLRBIT_ATTRBIT(&attrbits,NFSATTRBIT_ACLSUPPORT); NFSCLRBIT_ATTRBIT(&attrbits,NFSATTRBIT_ACL); } + if (nfsrv_useacl == 0 || ((cred != NULL || p != NULL) + && supports_nfsv4acls != SUPPACL_POSIX)) { + NFSCLRBIT_ATTRBIT(&attrbits, + NFSATTRBIT_POSIXACCESSACL); + NFSCLRBIT_ATTRBIT(&attrbits, + NFSATTRBIT_POSIXDEFAULTACL); + } if (!has_hiddensystem) { NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); @@ -3321,6 +3508,24 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, *tl = txdr_unsigned(clone_blksize); retnum += NFSX_UNSIGNED; break; + case NFSATTRBIT_ACLTRUEFORM: + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + *tl = txdr_unsigned(nfs_trueform(vp)); + retnum += NFSX_UNSIGNED; + break; + case NFSATTRBIT_ACLTRUEFORMSCOPE: + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + *tl = txdr_unsigned(NFSV4_ACL_SCOPE_FILE_SYSTEM); + retnum += NFSX_UNSIGNED; + break; + case NFSATTRBIT_POSIXACCESSACL: + retnum += nfsrv_buildposixacl(nd, paclp, + ACL_TYPE_ACCESS); + break; + case NFSATTRBIT_POSIXDEFAULTACL: + retnum += nfsrv_buildposixacl(nd, daclp, + ACL_TYPE_DEFAULT); + break; default: printf("EEK! Bad V4 attribute bitpos=%d\n", bitpos); } @@ -3328,6 +3533,10 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, } if (naclp != NULL) acl_free(naclp); + if (npaclp != NULL) + acl_free(npaclp); + if (ndaclp != NULL) + acl_free(ndaclp); free(fs, M_STATFS); *retnump = txdr_unsigned(retnum); return (retnum + prefixnum); @@ -5346,6 +5555,23 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, return (error); } +/* + * Determine the true form (the type of ACL stored on the file) for the + * vnode argument. + */ +static uint32_t +nfs_trueform(struct vnode *vp) +{ + uint32_t trueform; + + trueform = NFSV4_ACL_MODEL_NONE; + if ((vp->v_mount->mnt_flag & MNT_NFS4ACLS) != 0) + trueform = NFSV4_ACL_MODEL_NFS4; + else if ((vp->v_mount->mnt_flag & MNT_ACLS) != 0) + trueform = NFSV4_ACL_MODEL_POSIX_DRAFT; + return (trueform); +} + /* * Translate a vnode type into an NFSv4 type, including the named * attribute types. diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 49a94323a572..c04c3951d42d 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -443,8 +443,11 @@ int nfs_supportsposixacls(struct vnode *); int nfsrv_dissectace(struct nfsrv_descript *, struct acl_entry *, bool, int *, int *, NFSPROC_T *); uint32_t nfs_aceperm(acl_perm_t); +int nfsrv_dissectposixace(struct nfsrv_descript *, struct acl_entry *, + bool, int *, int *); int nfsrv_buildacl(struct nfsrv_descript *, NFSACL_T *, __enum_uint8(vtype), NFSPROC_T *); +int nfsrv_buildposixacl(struct nfsrv_descript *, NFSACL_T *, acl_type_t); int nfsrv_compareacl(NFSACL_T *, NFSACL_T *); /* nfs_clrpcops.c */ From nobody Mon Dec 22 01:09:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZKmD1gTKz6LnTd for ; Mon, 22 Dec 2025 01:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZKmC6ZqKz3Hhw for ; Mon, 22 Dec 2025 01:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQdeyGWrWPSVbuwtsD7ZfKb8GQB1r0djz9WSAfzUcgc=; b=RwC8UgO+N4TQAt9MOF3XbjXJYjicbfBBhD8nmQlCfaCof4xxTdQ1B/+asJjIrGHUaZ8ejN te+3YzyTjYgpyG0aUgFc3RbSHE0Tgd5zbBfT3o9msc4FfWjD97K0SBf4k9rmD+QoXmABpJ sactKthRv7g+redMOuzacEP7WgyPtrtxE03j3sjMJWHAapsojV7KvrtMemofEQls3Q0unM PxF3eo6aC4++QPbBsA9B9J0TZVYmneDoGFqojtm0CbqFWBZD+YTD43g8g4T5adNwFbnKMM V7Ts2QPp74vidpHFEhlklCVqs8Wyt39GbExbFa1kS+Y3zuQaMG6e9p7TjN7T4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQdeyGWrWPSVbuwtsD7ZfKb8GQB1r0djz9WSAfzUcgc=; b=mCm8FDndOHOqGOq6AK3qtHO/4qoh7q7ykVNHFNP13OSy13Y+tiI3o2UcalmUdd/wKgeuwx dZ95piLPha1DY/ybNhuyyga+Fy3Hay5LkSLYVORXTFAWpyS2WF+HsP8M161tf3c+IX7EHR C63nGaNTTbKswQYg9M3njTqmLKrRvovDvu59k3eyD6dP4q+EfXJmysd/UqW1OQTBAnBpby 1biCnSLB/W2fo6iB6R4JrOZ1HCiPonTvRpShmojM61gnrqPtoHjTQi9yWsC4iMt4FhkBjv g/8hjVGNNHIRz8Spm3FCT9kUXgsqvTLekoyVWWrA9JprVse3PvyH8FpLsqqrkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766365755; a=rsa-sha256; cv=none; b=AIqld/1zOb92cj/OtPzLoxeKVaBs22GlMzLtf9G7gtbKLM2OBdxhswWQ0XpHkTRoR+XWkj YzmkQQzdv7u7VhfMNPnoLRyLI7QFMY4bnxHWDJ6cai5KzbT/C+s7LDROjhh2WUhkyz5CL7 oUyFBNUqt9q1omkUoI1cf/GyBH4RIYm+8AaJV+qLy5YXZHAKbz0tqIJ1dafXQDGP/P+DPu P0qOfRSeF1WXLShRqr/ig4ibTIGKBdGlh9j7rc9htn2UUpAN41j0RPzEcXkrcADTDKCC7q mbNS6p3UzhwE+czhII6eFBHl/szKS7o9kUogzOL+i8X4YcAaYIqG8ENweYQDAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZKmC5tzBz14Gb for ; Mon, 22 Dec 2025 01:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 01:09:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 3ab741a76a23 - stable/15 - Fix zgrep(1) wrapper regression, add test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3ab741a76a23bb9fb7f710759ce85de99acf65b4 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 01:09:15 +0000 Message-Id: <69489a3b.27d31.3b3304b3@gitrepo.freebsd.org> The branch stable/15 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=3ab741a76a23bb9fb7f710759ce85de99acf65b4 commit 3ab741a76a23bb9fb7f710759ce85de99acf65b4 Author: Craig Leres AuthorDate: 2025-12-13 23:43:02 +0000 Commit: Craig Leres CommitDate: 2025-12-22 01:09:04 +0000 Fix zgrep(1) wrapper regression, add test @bdrewery reported D48873 broke "bzgrep -q '1 2' /var/log/messages.0.bz2" The mistake was in using $* instead of "$@" (I suspect $* is never right). Reported by: bdrewery Reviewed by: markj Approved by: markj Fixes: 1070477cc8b7 ("Fix remaining zgrep(1) wrapper script regressions") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54217 (cherry picked from commit 80726c2257e9d6d79341aac65ba22987f53619bc) --- usr.bin/grep/tests/grep_freebsd_test.sh | 10 ++++++++++ usr.bin/grep/zgrep.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index 906b70645151..eaf3694c2b1e 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -117,6 +117,15 @@ color_dupe_body() atf_check -o match:"^ +1 color.out" wc -l color.out } +atf_test_case qflag +qflag_body() +{ + # Test whitespace in argument + printf "1 2 3 4\n5 6 7 8\n" > in + + atf_check zgrep -q '1 2' in +} + atf_init_test_cases() { atf_add_test_case grep_r_implied @@ -124,4 +133,5 @@ atf_init_test_cases() atf_add_test_case gnuext atf_add_test_case zflag atf_add_test_case color_dupe + atf_add_test_case qflag } diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh index 8bd630726647..474f3868db9d 100755 --- a/usr.bin/grep/zgrep.sh +++ b/usr.bin/grep/zgrep.sh @@ -109,7 +109,7 @@ do grep_args="${grep_args} ${pre}" shift # Put back partial arg - set -- "-${post}" $* + set -- "-${post}" "$@" ;; -[ABCDdefm]) if [ $# -lt 2 ] From nobody Mon Dec 22 02:06:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZM2N2W21z6LtsD for ; Mon, 22 Dec 2025 02:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZM2N20d3z3Nmr for ; Mon, 22 Dec 2025 02:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766369196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fXGQutNEtdtcFyVIxwkFkSePSCxmPxe3lDLHHeunJco=; b=CPplCB5jouuPXxqodavCpjICNVWVrRSFeiLitTZsFU9HneQghqm6lXZ4fC8T9XxJwNfwK6 jOfJeENSfODIW0ggYl1YTqn25jIHtq4wYR/jF9nYJAu7oKdPu2o5xif4cvW7yN3yKch16A 3rxoLeeqqFyx6UtnEhtQunmZ3Sis/K8Kkz7MDhpMTxlz15EwcwlhXCC/eem1b8Pv6t3aa+ +aMWtoEebp1iBnKpBKBNI0yn2GgjkNGgA1YwAIvTZKGdJC8hzicD4HU4podB75Q/tET7ZK SuVNDyjvDnZ1+vocOPKaieiaUf5Rl16OAkGcsqdTZNf1ohiSmtgZEl/vedTJyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766369196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fXGQutNEtdtcFyVIxwkFkSePSCxmPxe3lDLHHeunJco=; b=mVmIxM80cmKHLSUv3zPRoBxLpOGpXjUg9bNQuWZf9Z/AnR3ct/a8htLsvbHgxJlPu3W4r/ CtMBmVjJOM4/eL3iOFkw2Qfo644U04GHw/NVpD6sXsZwtUAxgpCLvtIVu2eubzDRnRSRYt 9J0Gaz9W0liXx50utDh6etHpNVOWV8lAzxkIHWjX0ohbQ4IlyulLkfewjdsXj2LJ+G2Oeh HHC9IfnmbDo0ucYNhphBwTLIqu+0RIZIBDhjZY3rXDPdbxdHTdH4MFqDajDN7VUa3VC2xV qvzALfQvXIiFgFm1bTLhLmsdEFwk9eXz70PZ4mltQv6XwpaK5StsCkZwTnOGJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766369196; a=rsa-sha256; cv=none; b=rEFIX7Jh5GK5foHqiTW2zVyhwoyuI/90Pk7Ycm4ps7iUkt30FzSSCljqYZStK7l8UFtXN1 +idqpKLS9LSRtsn4CAxc6x5DexAcgZyI17rqq49Fd0Aa1Uaytub7bMxNvfbwzTusjNxtLZ EaD3XSOURzIPhppS2U3zUV8WvuhfPeDYxF9ZR/pSlJN9JviUPgD+8pf4DLigyIb8TPIkb+ bkH4+7OhLSgJ/ewWHLSc6ediq9YsGgil8V8Xm+xfWUbsiOdCnsKslzM2OyNdy/IyhFiCRS 4EvQGvowaSAr75tjFhj1Kfbw1uL0XKHluEIB9cr4SYfs4ii2vqXxC55YA357OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZM2N1ZjJz15wg for ; Mon, 22 Dec 2025 02:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3651a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:06:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 0e724de9ed6f - main - nfscl: Add some support for POSIX draft ACLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e724de9ed6f2d2914cb79686a4ceee7f6dd31a1 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:06:36 +0000 Message-Id: <6948a7ac.3651a.198c4314@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0e724de9ed6f2d2914cb79686a4ceee7f6dd31a1 commit 0e724de9ed6f2d2914cb79686a4ceee7f6dd31a1 Author: Rick Macklem AuthorDate: 2025-12-22 02:05:04 +0000 Commit: Rick Macklem CommitDate: 2025-12-22 02:05:04 +0000 nfscl: Add some support for POSIX draft ACLs An internet draft (expected to become an RFC someday) https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls describes an extension to NFSv4.2 to handle POSIX draft ACLs. This is the fourth of several patches that implement the above draft. There should be no semantics change for the series at this point. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfs/nfs_var.h | 12 ++++--- sys/fs/nfsclient/nfs_clrpcops.c | 69 +++++++++++++++++++++++++++++++---------- sys/fs/nfsclient/nfs_clvnops.c | 60 ++++++++++++++++++++++++++--------- 3 files changed, 105 insertions(+), 36 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index c04c3951d42d..fe2462d94fd5 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -472,8 +472,8 @@ int nfsrpc_setclient(struct nfsmount *, struct nfsclclient *, int, int nfsrpc_getattr(vnode_t, struct ucred *, NFSPROC_T *, struct nfsvattr *); int nfsrpc_getattrnovp(struct nfsmount *, u_int8_t *, int, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, u_int64_t *, uint32_t *); -int nfsrpc_setattr(vnode_t, struct vattr *, NFSACL_T *, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *); +int nfsrpc_setattr(vnode_t, struct vattr *, NFSACL_T *, acl_type_t, + struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_lookup(vnode_t, char *, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, struct nfsfh **, int *, int *, uint32_t); @@ -526,7 +526,7 @@ int nfsrpc_statfs(vnode_t, struct nfsstatfs *, struct nfsfsinfo *, uint32_t *, int nfsrpc_fsinfo(vnode_t, struct nfsfsinfo *, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_pathconf(vnode_t, struct nfsv3_pathconf *, bool *, uint32_t *, - struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); + struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, uint32_t *); int nfsrpc_renew(struct nfsclclient *, struct nfsclds *, struct ucred *, NFSPROC_T *); int nfsrpc_rellockown(struct nfsmount *, struct nfscllockowner *, uint8_t *, @@ -535,8 +535,10 @@ int nfsrpc_getdirpath(struct nfsmount *, u_char *, struct ucred *, NFSPROC_T *); int nfsrpc_delegreturn(struct nfscldeleg *, struct ucred *, struct nfsmount *, NFSPROC_T *, int); -int nfsrpc_getacl(vnode_t, struct ucred *, NFSPROC_T *, NFSACL_T *); -int nfsrpc_setacl(vnode_t, struct ucred *, NFSPROC_T *, NFSACL_T *); +int nfsrpc_getacl(struct vnode *, acl_type_t, struct ucred *, NFSPROC_T *, + NFSACL_T *); +int nfsrpc_setacl(struct vnode *, acl_type_t, struct ucred *, NFSPROC_T *, + NFSACL_T *); int nfsrpc_exchangeid(struct nfsmount *, struct nfsclclient *, struct nfssockreq *, int, uint32_t, struct nfsclds **, struct ucred *, NFSPROC_T *); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index f5deef183efb..47f880d2a96a 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -147,7 +147,7 @@ static int nfsrpc_locku(struct nfsrv_descript *, struct nfsmount *, struct nfscllockowner *, u_int64_t, u_int64_t, u_int32_t, struct ucred *, NFSPROC_T *, int); static int nfsrpc_setaclrpc(vnode_t, struct ucred *, NFSPROC_T *, - struct acl *, nfsv4stateid_t *); + struct acl *, acl_type_t, nfsv4stateid_t *); static int nfsrpc_layouterror(struct nfsmount *, uint8_t *, int, uint64_t, uint64_t, nfsv4stateid_t *, struct ucred *, NFSPROC_T *, uint32_t, uint32_t, char *); @@ -1371,7 +1371,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred, * Do an nfs setattr operation. */ int -nfsrpc_setattr(vnode_t vp, struct vattr *vap, NFSACL_T *aclp, +nfsrpc_setattr(vnode_t vp, struct vattr *vap, NFSACL_T *aclp, acl_type_t aclt, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *rnap, int *attrflagp) { int error, expireret = 0, openerr, retrycnt; @@ -1418,7 +1418,8 @@ nfsrpc_setattr(vnode_t vp, struct vattr *vap, NFSACL_T *aclp, error = nfsrpc_setattrrpc(vp, vap, &stateid, cred, p, rnap, attrflagp); else - error = nfsrpc_setaclrpc(vp, cred, p, aclp, &stateid); + error = nfsrpc_setaclrpc(vp, cred, p, aclp, aclt, + &stateid); if (error == NFSERR_OPENMODE && mode == NFSV4OPEN_ACCESSREAD) { NFSLOCKMNT(nmp); nmp->nm_state |= NFSSTA_OPENMODE; @@ -5072,7 +5073,7 @@ nfsmout: int nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc, bool *has_namedattrp, uint32_t *clone_blksizep, struct ucred *cred, NFSPROC_T *p, - struct nfsvattr *nap, int *attrflagp) + struct nfsvattr *nap, int *attrflagp, uint32_t *trueformp) { struct nfsrv_descript nfsd, *nd = &nfsd; struct nfsmount *nmp; @@ -5102,6 +5103,8 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc, bool *has_namedattrp, */ NFSCL_REQSTART(nd, NFSPROC_GETATTR, vp, cred); NFSPATHCONF_GETATTRBIT(&attrbits); + if (nmp->nm_minorvers >= NFSV42_MINORVERSION) + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACLTRUEFORM); (void) nfsrv_putattrbit(nd, &attrbits); nd->nd_flag |= ND_USEGSSNAME; error = nfscl_request(nd, vp, p, cred); @@ -5391,26 +5394,43 @@ nfsrpc_delegreturn(struct nfscldeleg *dp, struct ucred *cred, * nfs getacl call. */ int -nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, struct acl *aclp) +nfsrpc_getacl(struct vnode *vp, acl_type_t acltype, struct ucred *cred, + NFSPROC_T *p, struct acl *aclp) { struct nfsrv_descript nfsd, *nd = &nfsd; int error; nfsattrbit_t attrbits; struct nfsmount *nmp = VFSTONFS(vp->v_mount); + struct nfsnode *np; if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp)) return (EOPNOTSUPP); + np = VTONFS(vp); + if (!NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ACL) && + acltype == ACL_TYPE_NFS4) + return (EOPNOTSUPP); + if ((!NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_POSIXACCESSACL) || + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_POSIXDEFAULTACL)) && + (acltype == ACL_TYPE_ACCESS || acltype == ACL_TYPE_DEFAULT)) + return (EOPNOTSUPP); NFSCL_REQSTART(nd, NFSPROC_GETACL, vp, cred); NFSZERO_ATTRBIT(&attrbits); - NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); + if (acltype == ACL_TYPE_NFS4) + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); + else if (acltype == ACL_TYPE_ACCESS) + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_POSIXACCESSACL); + else + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_POSIXDEFAULTACL); (void) nfsrv_putattrbit(nd, &attrbits); error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (!nd->nd_repstat) error = nfsv4_loadattr(nd, vp, NULL, NULL, NULL, 0, NULL, - NULL, NULL, NULL, aclp, 0, NULL, NULL, NULL, NULL, NULL, p, - cred); + NULL, NULL, NULL, aclp, 0, NULL, NULL, NULL, NULL, NULL, + p, cred); else error = nd->nd_repstat; m_freem(nd->nd_mrep); @@ -5421,14 +5441,26 @@ nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, struct acl *aclp) * nfs setacl call. */ int -nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, struct acl *aclp) +nfsrpc_setacl(struct vnode *vp, acl_type_t acltype, struct ucred *cred, + NFSPROC_T *p, struct acl *aclp) { int error; struct nfsmount *nmp = VFSTONFS(vp->v_mount); + struct nfsnode *np; if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp)) return (EOPNOTSUPP); - error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL); + np = VTONFS(vp); + if (!NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ACL) && + acltype == ACL_TYPE_NFS4) + return (EOPNOTSUPP); + if ((!NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_POSIXACCESSACL) || + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_POSIXDEFAULTACL)) && + (acltype == ACL_TYPE_ACCESS || acltype == ACL_TYPE_DEFAULT)) + return (EOPNOTSUPP); + error = nfsrpc_setattr(vp, NULL, aclp, acltype, cred, p, NULL, NULL); return (error); } @@ -5436,8 +5468,8 @@ nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, struct acl *aclp) * nfs setacl call. */ static int -nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, - struct acl *aclp, nfsv4stateid_t *stateidp) +nfsrpc_setaclrpc(struct vnode *vp, struct ucred *cred, NFSPROC_T *p, + struct acl *aclp, acl_type_t aclt, nfsv4stateid_t *stateidp) { struct nfsrv_descript nfsd, *nd = &nfsd; int error; @@ -5449,10 +5481,15 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSCL_REQSTART(nd, NFSPROC_SETACL, vp, cred); nfsm_stateidtom(nd, stateidp, NFSSTATEID_PUTSTATEID); NFSZERO_ATTRBIT(&attrbits); - NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); - (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, - &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false, false, - false, 0, NULL, false); + if (aclt == ACL_TYPE_NFS4) + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); + else if (aclt == ACL_TYPE_ACCESS) + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_POSIXACCESSACL); + else + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_POSIXDEFAULTACL); + (void)nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, + &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false, + false, false, 0, NULL, false); error = nfscl_request(nd, vp, p, cred); if (error) return (error); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 193d8b6cd5eb..7484a5a7e082 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1215,7 +1215,7 @@ nfs_setattrrpc(struct vnode *vp, struct vattr *vap, struct ucred *cred, NFSUNLOCKNODE(np); KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp); } - error = nfsrpc_setattr(vp, vap, NULL, cred, td, &nfsva, &attrflag); + error = nfsrpc_setattr(vp, vap, NULL, 0, cred, td, &nfsva, &attrflag); if (attrflag) { ret = nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (ret && !error) @@ -1967,14 +1967,14 @@ again: } } else if (NFS_ISV34(dvp) && (fmode & O_EXCL)) { if (nfscl_checksattr(vap, &nfsva)) { - error = nfsrpc_setattr(newvp, vap, NULL, cnp->cn_cred, - curthread, &nfsva, &attrflag); + error = nfsrpc_setattr(newvp, vap, NULL, 0, + cnp->cn_cred, curthread, &nfsva, &attrflag); if (error && (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL)) { /* try again without setting uid/gid */ vap->va_uid = (uid_t)VNOVAL; vap->va_gid = (uid_t)VNOVAL; - error = nfsrpc_setattr(newvp, vap, NULL, + error = nfsrpc_setattr(newvp, vap, NULL, 0, cnp->cn_cred, curthread, &nfsva, &attrflag); } if (attrflag) @@ -3772,9 +3772,15 @@ nfs_getacl(struct vop_getacl_args *ap) { int error; - if (ap->a_type != ACL_TYPE_NFS4) + if (ap->a_type != ACL_TYPE_NFS4 && ap->a_type != ACL_TYPE_ACCESS && + ap->a_type != ACL_TYPE_DEFAULT) + return (EOPNOTSUPP); + if (ap->a_type == ACL_TYPE_DEFAULT && ap->a_vp->v_type != VDIR) + return (EINVAL); + error = nfsrpc_getacl(ap->a_vp, ap->a_type, ap->a_cred, ap->a_td, + ap->a_aclp); + if (error == 0 && ap->a_aclp->acl_cnt == 0) return (EOPNOTSUPP); - error = nfsrpc_getacl(ap->a_vp, ap->a_cred, ap->a_td, ap->a_aclp); if (error > NFSERR_STALE) { (void) nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0); error = EPERM; @@ -3787,9 +3793,17 @@ nfs_setacl(struct vop_setacl_args *ap) { int error; - if (ap->a_type != ACL_TYPE_NFS4) + if (ap->a_type != ACL_TYPE_NFS4 && ap->a_type != ACL_TYPE_ACCESS && + ap->a_type != ACL_TYPE_DEFAULT) return (EOPNOTSUPP); - error = nfsrpc_setacl(ap->a_vp, ap->a_cred, ap->a_td, ap->a_aclp); + if (ap->a_aclp == NULL) { + if (ap->a_type != ACL_TYPE_DEFAULT) + return (EINVAL); + if (ap->a_vp->v_type != VDIR) + return (ENOTDIR); + } + error = nfsrpc_setacl(ap->a_vp, ap->a_type, ap->a_cred, ap->a_td, + ap->a_aclp); if (error > NFSERR_STALE) { (void) nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0); error = EPERM; @@ -4192,8 +4206,8 @@ relock: va.va_vaflags = VA_UTIMES_NULL; inattrflag = 0; error = nfsrpc_setattr(invp, &va, NULL, - ap->a_incred, curthread, &innfsva, - &inattrflag); + 0, ap->a_incred, curthread, + &innfsva, &inattrflag); if (inattrflag != 0) ret = nfscl_loadattrcache(&invp, &innfsva, NULL, 0, 1); @@ -4673,6 +4687,7 @@ nfs_pathconf(struct vop_pathconf_args *ap) bool eof, has_namedattr, named_enabled; int attrflag, error; struct nfsnode *np; + uint32_t trueform; nmp = VFSTONFS(vp->v_mount); np = VTONFS(vp); @@ -4685,16 +4700,18 @@ nfs_pathconf(struct vop_pathconf_args *ap) ap->a_name == _PC_CASE_INSENSITIVE)) || (NFS_ISV4(vp) && (ap->a_name == _PC_ACL_NFS4 || ap->a_name == _PC_HAS_NAMEDATTR || - ap->a_name == _PC_CLONE_BLKSIZE))) { + ap->a_name == _PC_CLONE_BLKSIZE || + ap->a_name == _PC_ACL_EXTENDED))) { /* * Since only the above 5 a_names are returned by the NFSv3 * Pathconf RPC, there is no point in doing it for others. * For NFSv4, the Pathconf RPC (actually a Getattr Op.) can - * be used for _PC_ACL_NFS4, _PC_HAS_NAMEDATTR and - * _PC_CLONE_BLKSIZE as well. + * be used for _PC_ACL_NFS4, _PC_HAS_NAMEDATTR, + * and _PC_ACL_EXTENDED as well. */ + trueform = UINT32_MAX; error = nfsrpc_pathconf(vp, &pc, &has_namedattr, &clone_blksize, - td->td_ucred, td, &nfsva, &attrflag); + td->td_ucred, td, &nfsva, &attrflag, &trueform); if (attrflag != 0) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (error != 0) @@ -4754,7 +4771,20 @@ nfs_pathconf(struct vop_pathconf_args *ap) break; case _PC_ACL_NFS4: if (NFS_ISV4(vp) && nfsrv_useacl != 0 && attrflag != 0 && - NFSISSET_ATTRBIT(&nfsva.na_suppattr, NFSATTRBIT_ACL)) + NFSISSET_ATTRBIT(&nfsva.na_suppattr, NFSATTRBIT_ACL) && + (trueform == NFSV4_ACL_MODEL_NFS4 || + trueform == UINT32_MAX)) + *ap->a_retval = 1; + else + *ap->a_retval = 0; + break; + case _PC_ACL_EXTENDED: + if (NFS_ISV4(vp) && nfsrv_useacl != 0 && attrflag != 0 && + NFSISSET_ATTRBIT(&nfsva.na_suppattr, + NFSATTRBIT_POSIXACCESSACL) && + NFSISSET_ATTRBIT(&nfsva.na_suppattr, + NFSATTRBIT_POSIXDEFAULTACL) && + trueform == NFSV4_ACL_MODEL_POSIX_DRAFT) *ap->a_retval = 1; else *ap->a_retval = 0; From nobody Mon Dec 22 02:07:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZM3v64xJz6Lv3j for ; Mon, 22 Dec 2025 02:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZM3v5DZbz3PP5 for ; Mon, 22 Dec 2025 02:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766369275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aevJRwe2/NNjpLJlNd7YGY6iILB1LpyeYzwqlcIcpwI=; b=a3PI7eSntOGDO/dCaKlReGEKHahcSBpRHKa+Jt5zsXWGPwit1FS3jWozNlbhVbMqahOQjd SxtfRCKyFWJy0imxlyJlXfEj2vYK2PFAZMw2zaLylk82d/XwpDw0giLXz2lf7NBMHNGVrc r9SIsJ+NqBiq4okax9CJ6ZkdxbvnbRrb1k0pBajlN1uZ41O5EDUXocD4XsYqJzwvwhlP/h iCidCZKhuGu6GPJrCyFu2PAXLMkZtBSz+PVqgMbEgBs9K5ZbUqSdhT78QG3vURnGgKyikV LmkpsY+XA0b2s5uxGty5ETMWs8izs911Ti4jSD0vvcz9zyQwvDTlvRgg2WqRQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766369275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aevJRwe2/NNjpLJlNd7YGY6iILB1LpyeYzwqlcIcpwI=; b=jng5pJJc+NkWUWTBOLIUMmhIUjBVIsAB4/gf+whQzOdL9EieNHIZrk7gk3ZIOT26t5meX5 gk04CYssP9ICEpYxcRIqz4yVjhAjts9U8omfmIIM+hRUqCaImPp/TJFqaoKSb7kbSslROH ckj3cjW00X54zh/XR0Up8KroOGsdmi2BbcqAG3VA471wosyKQ/E5KSYjAzmuAgjpXsdA49 3ZFDCjHzkwq48PfGq11mq1m4Zp0xBkopNnhmz5aSMQEXVKt25J2BmGZvW6Del8dPhiZUvF g4qItutF8mtqNuVVrIpSusgvTMXcWC2TEhFjwnhLWQXI8bSa/ILmXMt+ZgMduA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766369275; a=rsa-sha256; cv=none; b=VHAQrjllZHzChHiSWO85SLJNN7AMwF+g5gcEStm7+KsHUfYjR/fyAZa7bbiae8ADxcG7b1 ikEMO4FqWcyeE/cqbxR64vlCHGw2NpBQu945a6xsgg1enBrcc+hdiqSjhXmVtwhaZl/ApY s9sjPaOHFb+pN5HLDJ3ipYZK3VK4s43WOe4kbACpC6AycbXXr8ajK7tFBObE1ISb6iGVb1 QwKC8JQc05GFxyqzqNR9uuDUdCWCovoOnUT767CQNDapAeNvCkik786ntheMdUjnejAG0S MYZoFP/hFlimzQE5D8HjC7P0zSs9NyVm8igLnzEs0dYHVXGcjDjTG/XRCdMCNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZM3v4fx8z15rJ for ; Mon, 22 Dec 2025 02:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36708 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:07:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 725f4b108d54 - stable/15 - geom(9): unset the BIO_ERROR_COMPAT flag correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 725f4b108d54dcf84ee8bb30dfb223cbcce989cc Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:07:55 +0000 Message-Id: <6948a7fb.36708.657d0ac0@gitrepo.freebsd.org> The branch stable/15 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=725f4b108d54dcf84ee8bb30dfb223cbcce989cc commit 725f4b108d54dcf84ee8bb30dfb223cbcce989cc Author: Ka Ho Ng AuthorDate: 2025-12-22 00:52:56 +0000 Commit: Ka Ho Ng CommitDate: 2025-12-22 02:07:03 +0000 geom(9): unset the BIO_ERROR_COMPAT flag correctly Fixes: 112c453ba910 Approved by: re (cperciva) --- sys/kern/vfs_bio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index c02aa30fb03a..dc90bd3add22 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4479,7 +4479,7 @@ biodone(struct bio *bp) bp->bio_error = bp->bio_error_compat; bp->bio_flags |= BIO_ERROR; bp->bio_error_compat = 0; - bp->bio_flags &= BIO_ERROR_COMPAT; + bp->bio_flags &= ~BIO_ERROR_COMPAT; } /* @@ -4524,7 +4524,7 @@ biodone(struct bio *bp) } done(bp); bp->bio_error_compat = 0; - bp->bio_flags &= BIO_ERROR_COMPAT; + bp->bio_flags &= ~BIO_ERROR_COMPAT; } } From nobody Mon Dec 22 02:23:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQB4DGJz6Ly6Y for ; Mon, 22 Dec 2025 02:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQB35pKz3Qrc for ; Mon, 22 Dec 2025 02:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zVyTEF7O4dunPQprGKQZSf8fXDh1UKg5QlRLc52EoEY=; b=grAhGduKeimpcTmQNonAaJCkHlUVugrvfs2HgRNVTjCuMDl8hPNB+eBunowTphxL96TJ/s COkBbwfQ/2MFYhAg57u8TTRKD64aDTx2XmWSMwMaOuWWJhsUTKZKDY3KOD0BijblSURLI2 1n9MgS5eWJx64UrJf1jFv/UJ1TR7bHkG1o1ALSNZK6iHaQ/w7YAp0qTkP+8U2cbQ9oXyQc LXg2O79r3qEIUN5l+pbDUFZbBhwd80A+QhXPq9Y/UlG1NnpQxowE0pOdyYdFox0zdC57gS /Yw4WofzYgbbktAP10eDC/jXnsVskeboQqjnDKRdlhQaFmwthzaRNRp61bkdSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zVyTEF7O4dunPQprGKQZSf8fXDh1UKg5QlRLc52EoEY=; b=n+mD4AY/EVBcxa3VzwSVqA9JeKHYAV8w2sG0jVpaf0M7K8vzGc2lOrXrjCshFVnxWcWtWK cHujl22gt+WOVuOys5yWV79WqJ4FhvjYC/pVAh0CH9GznvG//AJvEC8Sdksy2/dAkgnT1I xCsVHBkt0zX3SJqhDRiQxXAFCvjIsJLUaYe4pzA1q0Cama/ZcNoiOKkVWQfhYJz4EF8VnH 5kTWFLxkaF4GWXh6RIL/G0Vdik88kzOSKGwGcDRDdDHP6Y5cFIN2U1hb8eeKKjZqu5/fku zUvRlm5NJTf97awjtA5buysEPffLYNmFW78rKA/2KENkJnMoQ6dZ44Scycg+Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370226; a=rsa-sha256; cv=none; b=tcKjf306j94l8TVeBYkDms8NMlrGtoS33MHtLYDiJsEqaoBpJG2Sj7dP31t1OmkT/D8ZKu IiIgnEV0kpOfFb4NIqhNkQFjYpHtpUMXKN70AiUCjSrsK84PM3LZMYQBjGYkb48B9Am3+b 9sZ20K2jn8a3UDLprfbDd5Ft+/DvCQp63q4+3KmycP216XECH6P38+fpMtlLfddPuHNyPd a8wh9AuGD+8FJgprGVIn0masmP13qhH2Y+jaJHIVxpgzVLOjzyX8uAvJSTa0exDY/KBlfK FIpXXwG7ZQHchHqg0ZiE93M/pQthw6J+E7eoS9OYDn+NBjseW0vwOg62sPJOUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQB2fdNz15sB for ; Mon, 22 Dec 2025 02:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35ff3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 77939d64f23d - main - net: on interface detach purge multicast addresses after protocols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77939d64f23da4b0b599fad6edd967ffd1d17217 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:46 +0000 Message-Id: <6948abb2.35ff3.5204ce5@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=77939d64f23da4b0b599fad6edd967ffd1d17217 commit 77939d64f23da4b0b599fad6edd967ffd1d17217 Author: Gleb Smirnoff AuthorDate: 2025-12-21 18:56:00 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 net: on interface detach purge multicast addresses after protocols We first want to give a chance to all owners of multicast addresses to free them and only then run through the list of remaining ones. It might be that no addresses remain there normally, but this needs to be analyzed deeper. For now restore the sequence that was before 0d469d23715d to fix a possible use after free. Fixes: 0d469d23715d690b863787ebfa51529e1f6a9092 --- sys/net/if.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 3c16246e8b62..3394aa90127f 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1117,9 +1117,8 @@ if_detach_internal(struct ifnet *ifp, bool vmove) #endif if_purgeaddrs(ifp); - if_purgemaddrs(ifp); - EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); + if_purgemaddrs(ifp); if (IS_DEFAULT_VNET(curvnet)) devctl_notify("IFNET", ifp->if_xname, "DETACH", NULL); From nobody Mon Dec 22 02:23:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQC6LJ4z6Ly02 for ; Mon, 22 Dec 2025 02:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQC3vVTz3R7N for ; Mon, 22 Dec 2025 02:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8grjhrEHawwPoRMqRbKDGs8jiPDkoc8DNrIeSuzAPo=; b=oa1bYG88RLhGhwpx6+SDqmMxzJ+mX8QpCnw6Rqwm3rsNNhH24kZIf6lvJisfP9M7Mmkts+ OfP/7K++pJjpJZkhmrjMOp5y7GLyzG7ZEuDlL5UItlz345SXoQvlAuQ9AzYe8FwzygWFB+ IIvVtFtR2knmlQgp63Sww+73qKmdHvE+sXD+CFsoX6XfbdVL4JQNpDTedLJfy9nW7Y2YsO arJ7dirBF4PsoTEmOKwvwuzJF2UhU5heCctvlw2qtGVwYA4oPAp8JHU5fg25mE8qjBINln DcjozEX5E1W1rNBNpjnImDI6JJ9gbOQhQX8n3/CV3thb0OdwuUUcYT/L8cbtWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8grjhrEHawwPoRMqRbKDGs8jiPDkoc8DNrIeSuzAPo=; b=sSdsuTsZROrAqTwQbWtCiwPiZ53SQGChqjUMquc8VS7TrZWrn8uefszsN5qVPNWXAsd/3s tWbOFLbK5AYHb3fIaObD4NPfCu0HDTMwNR/Smi7HWaoQUQ6CyD033EYt3+/Y625/CkvOHH oV8LJim1kaEHwNbGdc9DOZrmp6Q47uDPBsgbUZaX8APQGpbLzM1O2A5PDujsZisUETUziv GSpJtGwTLKm+uaTPuHpWZjkJlfOwkp6MrGldDAUWy5DvBk5ApqV73pB5ALnX9eTlxYjeBi SRqIpPh7BrD8K+v2u1hqxhDofyYJBU9/kWkoB7khelY/xAeuJQtA0BgJM+/KoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370227; a=rsa-sha256; cv=none; b=khjlFincA24YUcvPO/P5HzLgPZjXenJKuHh5A6sWQEr7UCRqnQhBeOVYkcI84Ffv79pzn2 I4fuWlCXpAanlLp5fJsDPJ43qcy4iyNLkKrZ2XulbFm26uKXrjl3UtoLAot2WM2E3TZcuw BhgLrjzxvNyK5tELUS5EXhzJqCX+BXFk3CTldaVyzzTSWFn3FplGYUkrkSXkub4AO0F3bO sMzRqdXJfOHZWmiZeOH5u201L9jkLSxR0XPYR346F9je72w/xyAYfGmocc7I/g6ErIw2Cd e5Bu9SRfjIF5xQ5MoSzhDD1iGrzgcFs049Ynszq/KKYNeKwf0QC8UbOLR8wxGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQC3Mr0z16Dv for ; Mon, 22 Dec 2025 02:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37b9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e3d6cf8c3f6c - main - pf: make eventhandler_tag's static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3d6cf8c3f6c9203fbb60a16fde18cc751a80de1 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:47 +0000 Message-Id: <6948abb3.37b9f.1a86b49e@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e3d6cf8c3f6c9203fbb60a16fde18cc751a80de1 commit e3d6cf8c3f6c9203fbb60a16fde18cc751a80de1 Author: Gleb Smirnoff AuthorDate: 2025-12-21 19:49:59 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 pf: make eventhandler_tag's static No functional change. --- sys/netpfil/pf/pf_if.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index 6f41d453a7d1..2d85a553fb5a 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -74,12 +74,12 @@ VNET_DEFINE(size_t, pf_allkifcount); VNET_DEFINE(struct pfi_kkif *, pf_kifmarker); #endif -eventhandler_tag pfi_attach_cookie; -eventhandler_tag pfi_detach_cookie; -eventhandler_tag pfi_attach_group_cookie; -eventhandler_tag pfi_change_group_cookie; -eventhandler_tag pfi_detach_group_cookie; -eventhandler_tag pfi_ifaddr_event_cookie; +static eventhandler_tag pfi_attach_cookie; +static eventhandler_tag pfi_detach_cookie; +static eventhandler_tag pfi_attach_group_cookie; +static eventhandler_tag pfi_change_group_cookie; +static eventhandler_tag pfi_detach_group_cookie; +static eventhandler_tag pfi_ifaddr_event_cookie; static void pfi_attach_ifnet(struct ifnet *, struct pfi_kkif *); static void pfi_attach_ifgroup(struct ifg_group *, struct pfi_kkif *); From nobody Mon Dec 22 02:23:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQD67KFz6LyFV for ; Mon, 22 Dec 2025 02:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQD4YDGz3QpD for ; Mon, 22 Dec 2025 02:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0ZSeU9c9qQL6gGuT/nqzNxHY11FuV4Ui8GWcQJrflw=; b=Jf3By2iCcesSgEAl4RfKJQLpuKjyoeyYFStZZ9wQtqs8tH2ekx65FIY/KbwZYwHVgHDcOA OSKgCAZZdpRIqIYF4LnbWG0Y/AjEaLwnzCcoNxFX/d1/NnPrEnpJktWsPv/Q7JgZJ/F2j9 p6nQiP2N9yofvh6sttQoV03IWY8I8Yfr4P6V+RPExKVoILVRtEdIXRWDxQlkTLAMGCvqx+ cQ0HNxOno8z5QHf2SnjYuD3prUYc0VwgpeRmzubzqc+7jjgdDpdx1X+mgakkxAVXqHsqLy AuedgE5ZWLTkq0ra8UNF0FZDkrL9YAiee+LCaOJ2ovBZn2dnDLx+c7VihNM6fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0ZSeU9c9qQL6gGuT/nqzNxHY11FuV4Ui8GWcQJrflw=; b=PD4RGsbkEsKZqwv/tT+8eiQiYdMGRn7SqbfOkg4Q166ZD/8VHFCf4c6mpD6viXKe/y08aN d7+wB9bcdaqYjdu/6mtsiDsrSukJIgJ0d/nV9Xaefx0L9qWepgqids0p4Ji91xZg/so6+Q oPKrgKfCQZdIgf84mnpBgV1+0nwer4P8lG+Z4+N/EkeJmq0ijxBSDG/8s/bdLMYoUGaR5J yZsb/MYdqQ66hmXnjdy0C/Et9oQwArttNA9EHj849Oi6rHQWGgyojUHkgyRMgqS0NP+cw4 40KBrXHVtvZaYJcwoshwL06umHO/h9EKEm4iRBbEZCppN3br5O6CkTCdxNLIcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370228; a=rsa-sha256; cv=none; b=ubbZ/Qz1Zdeh0/PB8l/NrNfTyKLYCZkZFpRfHA8IMAu7ChEzbHZop0Tged3hOXtUTEn+IG yAuAHGhRk2TMS8LNvulPc9f7vh0uT3ZFhu0oqS145oVJaAeS8PUY2JdgbeW+nQS6saUQds +x1n+2eAY5RmzASbTydOp7t/3FJvWsKJZJ8oKWX6sZtwDhC4lr7v7TZ+eVQ7K1B8SS3uh9 cHH8u8D7ROKDDzW5zLY+smMRSxeygxyDp5ofP8lvlVOuCc6acW6TPGxHpwZfQYQViAXBbV pZJjdEAvxCrtolthlAcTtUL2QPr8lPYh7yhYovT4pJcU4Yrl3QbZrdRqqi29Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQD3zp4z16BN for ; Mon, 22 Dec 2025 02:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37a66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 349fcf079ca3 - main - net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 349fcf079ca32d5c93e45366d2b27638747affeb Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:48 +0000 Message-Id: <6948abb4.37a66.71609f61@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=349fcf079ca32d5c93e45366d2b27638747affeb commit 349fcf079ca32d5c93e45366d2b27638747affeb Author: Gleb Smirnoff AuthorDate: 2025-12-21 21:31:43 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming and don't trigger ifnet_arrival_event and ifnet_departure_event for a rename, as the interface isn't being detached from any protocol. The consumers of the arrival/departure events are divided into a few categories: - which indeed need to do the same actions as if interface was fully detached and attached: routing socket and netlink notifications to userland and the Linux sysfs. All addressed by this commit. - which build their logic based on an interface name, but should actually update their database on rename: packet filters. This commit leaves them with the old behavior - emulate full detach & attach, but this should be improved. - which shouldn't do anything on rename, not touched by the commit. - ng_ether and if_tuntap, that are special and will be addressed by separate commits. --- sys/compat/linsysfs/linsysfs_net.c | 15 +++++++- sys/net/if.c | 4 +-- sys/net/if_var.h | 11 ++++-- sys/net/rtsock.c | 28 ++++++++++----- sys/netlink/route/iface.c | 36 ++++++++++++++------ sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 8 +++++ sys/netpfil/ipfw/ip_fw_iface.c | 49 +++++++++++++++++---------- sys/netpfil/pf/pf_if.c | 12 +++++++ 8 files changed, 118 insertions(+), 45 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs_net.c b/sys/compat/linsysfs/linsysfs_net.c index 7439b0b4fdc0..dcc498e4e1ae 100644 --- a/sys/compat/linsysfs/linsysfs_net.c +++ b/sys/compat/linsysfs/linsysfs_net.c @@ -45,7 +45,7 @@ #include struct pfs_node *net; -static eventhandler_tag if_arrival_tag, if_departure_tag; +static eventhandler_tag if_arrival_tag, if_departure_tag, if_rename_tag; static uint32_t net_latch_count = 0; static struct mtx net_latch_mtx; @@ -312,6 +312,16 @@ linsysfs_if_departure(void *arg __unused, if_t ifp) linsysfs_net_latch_rele(); } +static void +linsysfs_if_rename(void *arg __unused, if_t ifp) +{ + + linsysfs_net_latch_hold(); + linsysfs_net_delif(ifp); + (void)linsysfs_net_addif(ifp, net); + linsysfs_net_latch_rele(); +} + void linsysfs_net_init(void) { @@ -324,6 +334,8 @@ linsysfs_net_init(void) linsysfs_if_arrival, NULL, EVENTHANDLER_PRI_ANY); if_departure_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, linsysfs_if_departure, NULL, EVENTHANDLER_PRI_ANY); + if_rename_tag = EVENTHANDLER_REGISTER(ifnet_rename_event, + linsysfs_if_rename, NULL, EVENTHANDLER_PRI_ANY); linsysfs_net_latch_hold(); VNET_LIST_RLOCK(); @@ -343,6 +355,7 @@ linsysfs_net_uninit(void) EVENTHANDLER_DEREGISTER(ifnet_arrival_event, if_arrival_tag); EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_departure_tag); + EVENTHANDLER_DEREGISTER(ifnet_rename_event, if_rename_tag); linsysfs_net_latch_hold(); TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { diff --git a/sys/net/if.c b/sys/net/if.c index 3394aa90127f..1dea00da3cf2 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -3035,8 +3035,6 @@ if_rename(struct ifnet *ifp, char *new_name) */ ifp->if_flags |= IFF_RENAMING; - EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); - if_printf(ifp, "changing name to '%s'\n", new_name); IF_ADDR_WLOCK(ifp); @@ -3063,7 +3061,7 @@ if_rename(struct ifnet *ifp, char *new_name) sdl->sdl_data[--namelen] = 0xff; IF_ADDR_WUNLOCK(ifp); - EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp); + EVENTHANDLER_INVOKE(ifnet_rename_event, ifp, old_name); ifp->if_flags &= ~IFF_RENAMING; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 4fb51aca0cd7..3c65b2b4d2d8 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -361,19 +361,24 @@ EVENTHANDLER_DECLARE(ifaddr_event_ext, ifaddr_event_ext_handler_t); /* * Interface arrival & departure events. - * The ifnet_arrival_event is executed before the is yet globally visible. - * Protocols shall use this event to attach themselves. Protocols shall not - * expect other protocols to be fully attached. + * The ifnet_arrival_event is executed before the interface is yet globally + * visible. Protocols shall use this event to attach themselves. Protocols + * shall not expect other protocols to be fully attached. * The ifnet_attached_event is executed after the interface is attached to all * protocols, is globally visible and fully functional. * The ifnet_departure_event is complementary to ifnet_arrival_event. The * interface is no longer globally visible, protocols may detach. * XXXGL: immediate memory reclamation may not be safe in ifnet_departure_event. + * The ifnet_rename_event is executed after an interface is renamed. The + * handlers would see the new name of the interface, and are also passed with + * old name in the argument. */ typedef void (*ifnet_event_handler_t)(void *, if_t); EVENTHANDLER_DECLARE(ifnet_arrival_event, ifnet_event_handler_t); EVENTHANDLER_DECLARE(ifnet_attached_event, ifnet_event_handler_t); EVENTHANDLER_DECLARE(ifnet_departure_event, ifnet_event_handler_t); +typedef void (*ifnet_rename_event_handler_t)(void *, if_t, const char *); +EVENTHANDLER_DECLARE(ifnet_rename_event, ifnet_rename_event_handler_t); /* Interface link state change event */ typedef void (*ifnet_link_event_handler_t)(void *, if_t, int); diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 82af92545b79..774537366910 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -208,7 +208,7 @@ static int sysctl_ifmalist(int af, struct walkarg *w); static void rt_getmetrics(const struct rtentry *rt, const struct nhop_object *nh, struct rt_metrics *out); static void rt_dispatch(struct mbuf *, sa_family_t); -static void rt_ifannouncemsg(struct ifnet *ifp, int what); +static void rt_ifannouncemsg(struct ifnet *, int, const char *); static int handle_rtm_get(struct rt_addrinfo *info, u_int fibnum, struct rt_msghdr *rtm, struct rib_cmd_info *rc); static int update_rtm_from_rc(struct rt_addrinfo *info, @@ -319,17 +319,26 @@ SYSINIT(rtsock_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rtsock_init, NULL); static void rts_ifnet_attached(void *arg __unused, struct ifnet *ifp) { - rt_ifannouncemsg(ifp, IFAN_ARRIVAL); + rt_ifannouncemsg(ifp, IFAN_ARRIVAL, NULL); } EVENTHANDLER_DEFINE(ifnet_attached_event, rts_ifnet_attached, NULL, 0); static void rts_handle_ifnet_departure(void *arg __unused, struct ifnet *ifp) { - rt_ifannouncemsg(ifp, IFAN_DEPARTURE); + rt_ifannouncemsg(ifp, IFAN_DEPARTURE, NULL); } EVENTHANDLER_DEFINE(ifnet_departure_event, rts_handle_ifnet_departure, NULL, 0); +static void +rts_handle_ifnet_rename(void *arg __unused, struct ifnet *ifp, + const char *old_name) +{ + rt_ifannouncemsg(ifp, IFAN_DEPARTURE, old_name); + rt_ifannouncemsg(ifp, IFAN_ARRIVAL, NULL); +} +EVENTHANDLER_DEFINE(ifnet_rename_event, rts_handle_ifnet_rename, NULL, 0); + static void rts_append_data(struct socket *so, struct mbuf *m) { @@ -2143,7 +2152,7 @@ rt_newmaddrmsg(int cmd, struct ifmultiaddr *ifma) static struct mbuf * rt_makeifannouncemsg(struct ifnet *ifp, int type, int what, - struct rt_addrinfo *info) + struct rt_addrinfo *info, const char *ifname) { struct if_announcemsghdr *ifan; struct mbuf *m; @@ -2155,8 +2164,9 @@ rt_makeifannouncemsg(struct ifnet *ifp, int type, int what, if (m != NULL) { ifan = mtod(m, struct if_announcemsghdr *); ifan->ifan_index = ifp->if_index; - strlcpy(ifan->ifan_name, ifp->if_xname, - sizeof(ifan->ifan_name)); + strlcpy(ifan->ifan_name, + ifname != NULL ? ifname : ifp->if_xname, + sizeof(ifan->ifan_name)); ifan->ifan_what = what; } return m; @@ -2173,7 +2183,7 @@ rt_ieee80211msg(struct ifnet *ifp, int what, void *data, size_t data_len) struct mbuf *m; struct rt_addrinfo info; - m = rt_makeifannouncemsg(ifp, RTM_IEEE80211, what, &info); + m = rt_makeifannouncemsg(ifp, RTM_IEEE80211, what, &info, NULL); if (m != NULL) { /* * Append the ieee80211 data. Try to stick it in the @@ -2207,12 +2217,12 @@ rt_ieee80211msg(struct ifnet *ifp, int what, void *data, size_t data_len) * network interface arrival and departure. */ static void -rt_ifannouncemsg(struct ifnet *ifp, int what) +rt_ifannouncemsg(struct ifnet *ifp, int what, const char *ifname) { struct mbuf *m; struct rt_addrinfo info; - m = rt_makeifannouncemsg(ifp, RTM_IFANNOUNCE, what, &info); + m = rt_makeifannouncemsg(ifp, RTM_IFANNOUNCE, what, &info, ifname); if (m != NULL) rt_dispatch(m, AF_UNSPEC); } diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 29a9a89fd20c..e9c053015fad 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -70,7 +70,8 @@ struct netlink_walkargs { int dumped; }; -static eventhandler_tag ifdetach_event, ifattach_event, iflink_event, ifaddr_event; +static eventhandler_tag ifdetach_event, ifattach_event, ifrename_event, + iflink_event, ifaddr_event; static SLIST_HEAD(, nl_cloner) nl_cloners = SLIST_HEAD_INITIALIZER(nl_cloners); @@ -288,7 +289,7 @@ dump_iface_caps(struct nl_writer *nw, struct ifnet *ifp) */ static bool dump_iface(struct nl_writer *nw, if_t ifp, const struct nlmsghdr *hdr, - int if_flags_mask) + int if_flags_mask, const char *ifname) { struct epoch_tracker et; struct ifinfomsg *ifinfo; @@ -312,7 +313,8 @@ dump_iface(struct nl_writer *nw, if_t ifp, const struct nlmsghdr *hdr, if (ifs.ifla_operstate == IF_OPER_UP) ifinfo->ifi_flags |= IFF_LOWER_UP; - nlattr_add_string(nw, IFLA_IFNAME, if_name(ifp)); + nlattr_add_string(nw, IFLA_IFNAME, + ifname != NULL ? ifname : if_name(ifp)); nlattr_add_u8(nw, IFLA_OPERSTATE, ifs.ifla_operstate); nlattr_add_u8(nw, IFLA_CARRIER, ifs.ifla_carrier); @@ -438,7 +440,7 @@ static int dump_cb(if_t ifp, void *_arg) { struct netlink_walkargs *wa = (struct netlink_walkargs *)_arg; - if (!dump_iface(wa->nw, ifp, &wa->hdr, 0)) + if (!dump_iface(wa->nw, ifp, &wa->hdr, 0, NULL)) return (ENOMEM); return (0); } @@ -488,7 +490,7 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n if (ifp != NULL) { if (match_iface(ifp, &attrs)) { - if (!dump_iface(wa.nw, ifp, &wa.hdr, 0)) + if (!dump_iface(wa.nw, ifp, &wa.hdr, 0, NULL)) error = ENOMEM; } else error = ENODEV; @@ -1399,7 +1401,8 @@ rtnl_handle_ifaddr(void *arg __unused, struct ifaddr *ifa, int cmd) } static void -rtnl_handle_ifevent(if_t ifp, int nlmsg_type, int if_flags_mask) +rtnl_handle_ifevent(if_t ifp, int nlmsg_type, int if_flags_mask, + const char *ifname) { struct nlmsghdr hdr = { .nlmsg_type = nlmsg_type }; struct nl_writer nw; @@ -1409,7 +1412,7 @@ rtnl_handle_ifevent(if_t ifp, int nlmsg_type, int if_flags_mask) NL_LOG(LOG_DEBUG, "error allocating group writer"); return; } - dump_iface(&nw, ifp, &hdr, if_flags_mask); + dump_iface(&nw, ifp, &hdr, if_flags_mask, ifname); nlmsg_flush(&nw); } @@ -1417,28 +1420,35 @@ static void rtnl_handle_ifattach(void *arg, if_t ifp) { NL_LOG(LOG_DEBUG2, "ifnet %s", if_name(ifp)); - rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, 0); + rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, 0, NULL); } static void rtnl_handle_ifdetach(void *arg, if_t ifp) { NL_LOG(LOG_DEBUG2, "ifnet %s", if_name(ifp)); - rtnl_handle_ifevent(ifp, NL_RTM_DELLINK, 0); + rtnl_handle_ifevent(ifp, NL_RTM_DELLINK, 0, NULL); +} + +static void +rtnl_handle_ifrename(void *arg, if_t ifp, const char *old_name) +{ + rtnl_handle_ifevent(ifp, NL_RTM_DELLINK, 0, old_name); + rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, 0, NULL); } static void rtnl_handle_iflink(void *arg, if_t ifp, int link_state __unused) { NL_LOG(LOG_DEBUG2, "ifnet %s", if_name(ifp)); - rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, 0); + rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, 0, NULL); } void rtnl_handle_ifnet_event(if_t ifp, int if_flags_mask) { NL_LOG(LOG_DEBUG2, "ifnet %s", if_name(ifp)); - rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, if_flags_mask); + rtnl_handle_ifevent(ifp, NL_RTM_NEWLINK, if_flags_mask, NULL); } static const struct rtnl_cmd_handler cmd_handlers[] = { @@ -1513,6 +1523,9 @@ rtnl_ifaces_init(void) ifdetach_event = EVENTHANDLER_REGISTER( ifnet_departure_event, rtnl_handle_ifdetach, NULL, EVENTHANDLER_PRI_ANY); + ifrename_event = EVENTHANDLER_REGISTER( + ifnet_rename_event, rtnl_handle_ifrename, NULL, + EVENTHANDLER_PRI_ANY); ifaddr_event = EVENTHANDLER_REGISTER( rt_addrmsg, rtnl_handle_ifaddr, NULL, EVENTHANDLER_PRI_ANY); @@ -1528,6 +1541,7 @@ rtnl_ifaces_destroy(void) { EVENTHANDLER_DEREGISTER(ifnet_arrival_event, ifattach_event); EVENTHANDLER_DEREGISTER(ifnet_departure_event, ifdetach_event); + EVENTHANDLER_DEREGISTER(ifnet_rename_event, ifrename_event); EVENTHANDLER_DEREGISTER(rt_addrmsg, ifaddr_event); EVENTHANDLER_DEREGISTER(ifnet_link_event, iflink_event); } diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 207d1895dc3e..331fc454ca51 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -95,8 +95,10 @@ VNET_DEFINE(ipf_main_softc_t, ipfmain) = { VNET_DEFINE_STATIC(eventhandler_tag, ipf_arrivetag); VNET_DEFINE_STATIC(eventhandler_tag, ipf_departtag); +VNET_DEFINE_STATIC(eventhandler_tag, ipf_renametag); #define V_ipf_arrivetag VNET(ipf_arrivetag) #define V_ipf_departtag VNET(ipf_departtag) +#define V_ipf_renametag VNET(ipf_renametag) static void ipf_ifevent(void *arg, struct ifnet *ifp); @@ -1349,6 +1351,9 @@ ipf_event_reg(void) V_ipf_departtag = EVENTHANDLER_REGISTER(ifnet_departure_event, \ ipf_ifevent, NULL, \ EVENTHANDLER_PRI_ANY); + V_ipf_renametag = EVENTHANDLER_REGISTER(ifnet_rename_event, \ + ipf_ifevent, NULL, \ + EVENTHANDLER_PRI_ANY); } void @@ -1360,6 +1365,9 @@ ipf_event_dereg(void) if (V_ipf_departtag != NULL) { EVENTHANDLER_DEREGISTER(ifnet_departure_event, V_ipf_departtag); } + if (V_ipf_renametag != NULL) { + EVENTHANDLER_DEREGISTER(ifnet_rename_event, V_ipf_renametag); + } } diff --git a/sys/netpfil/ipfw/ip_fw_iface.c b/sys/netpfil/ipfw/ip_fw_iface.c index 3c648feecba4..71a25e84ec2b 100644 --- a/sys/netpfil/ipfw/ip_fw_iface.c +++ b/sys/netpfil/ipfw/ip_fw_iface.c @@ -77,12 +77,13 @@ static struct ipfw_sopt_handler scodes[] = { /* * FreeBSD Kernel interface. */ -static void ipfw_kifhandler(void *arg, struct ifnet *ifp); +static void ipfw_kifhandler(void *, struct ifnet *, const char *); static int ipfw_kiflookup(char *name); static void iface_khandler_register(void); static void iface_khandler_deregister(void); -static eventhandler_tag ipfw_ifdetach_event, ipfw_ifattach_event; +static eventhandler_tag ipfw_ifdetach_event, ipfw_ifattach_event, + ipfw_rename_event; static int num_vnets = 0; static struct mtx vnet_mtx; @@ -90,19 +91,21 @@ static struct mtx vnet_mtx; * Checks if kernel interface is contained in our tracked * interface list and calls attach/detach handler. */ +enum ifevent { ARRIVAL, DEPARTURE, RENAME }; static void -ipfw_kifhandler(void *arg, struct ifnet *ifp) +ipfw_kifhandler(void *arg, struct ifnet *ifp, const char *old_name) { + enum ifevent *what = arg; struct ip_fw_chain *ch; struct ipfw_iface *iif; struct namedobj_instance *ii; - uintptr_t htype; + + MPASS(*what != RENAME || old_name != NULL); if (V_ipfw_vnet_ready == 0) return; ch = &V_layer3_chain; - htype = (uintptr_t)arg; IPFW_UH_WLOCK(ch); ii = CHAIN_TO_II(ch); @@ -111,12 +114,23 @@ ipfw_kifhandler(void *arg, struct ifnet *ifp) return; } iif = (struct ipfw_iface*)ipfw_objhash_lookup_name(ii, 0, - if_name(ifp)); + *what == RENAME ? old_name : if_name(ifp)); if (iif != NULL) { - if (htype == 1) + switch (*what) { + case ARRIVAL: handle_ifattach(ch, iif, ifp->if_index); - else + break; + case DEPARTURE: + handle_ifdetach(ch, iif, ifp->if_index); + break; + case RENAME: + /* + * XXXGL: should be handled better. + */ handle_ifdetach(ch, iif, ifp->if_index); + handle_ifattach(ch, iif, ifp->if_index); + break; + } } IPFW_UH_WUNLOCK(ch); } @@ -143,12 +157,12 @@ iface_khandler_register(void) printf("IPFW: starting up interface tracker\n"); - ipfw_ifdetach_event = EVENTHANDLER_REGISTER( - ifnet_departure_event, ipfw_kifhandler, NULL, - EVENTHANDLER_PRI_ANY); - ipfw_ifattach_event = EVENTHANDLER_REGISTER( - ifnet_arrival_event, ipfw_kifhandler, (void*)((uintptr_t)1), - EVENTHANDLER_PRI_ANY); + ipfw_ifdetach_event = EVENTHANDLER_REGISTER(ifnet_departure_event, + ipfw_kifhandler, (void*)(uintptr_t)DEPARTURE, EVENTHANDLER_PRI_ANY); + ipfw_ifattach_event = EVENTHANDLER_REGISTER(ifnet_arrival_event, + ipfw_kifhandler, (void*)(uintptr_t)ARRIVAL, EVENTHANDLER_PRI_ANY); + ipfw_rename_event = EVENTHANDLER_REGISTER(ifnet_rename_event, + ipfw_kifhandler, (void*)(uintptr_t)RENAME, EVENTHANDLER_PRI_ANY); } /* @@ -171,10 +185,9 @@ iface_khandler_deregister(void) if (destroy == 0) return; - EVENTHANDLER_DEREGISTER(ifnet_arrival_event, - ipfw_ifattach_event); - EVENTHANDLER_DEREGISTER(ifnet_departure_event, - ipfw_ifdetach_event); + EVENTHANDLER_DEREGISTER(ifnet_arrival_event, ipfw_ifattach_event); + EVENTHANDLER_DEREGISTER(ifnet_departure_event, ipfw_ifdetach_event); + EVENTHANDLER_DEREGISTER(ifnet_rename_event, ipfw_rename_event); } /* diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index 2d85a553fb5a..5288de3d78a0 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -76,6 +76,7 @@ VNET_DEFINE(struct pfi_kkif *, pf_kifmarker); static eventhandler_tag pfi_attach_cookie; static eventhandler_tag pfi_detach_cookie; +static eventhandler_tag pfi_rename_cookie; static eventhandler_tag pfi_attach_group_cookie; static eventhandler_tag pfi_change_group_cookie; static eventhandler_tag pfi_detach_group_cookie; @@ -95,6 +96,7 @@ static int pfi_skip_if(const char *, struct pfi_kkif *); static int pfi_unmask(void *); static void pfi_attach_ifnet_event(void * __unused, struct ifnet *); static void pfi_detach_ifnet_event(void * __unused, struct ifnet *); +static void pfi_rename_ifnet_event(void * __unused, struct ifnet *); static void pfi_attach_group_event(void * __unused, struct ifg_group *); static void pfi_change_group_event(void * __unused, char *); static void pfi_detach_group_event(void * __unused, struct ifg_group *); @@ -172,6 +174,8 @@ pfi_initialize(void) pfi_attach_ifnet_event, NULL, EVENTHANDLER_PRI_ANY); pfi_detach_cookie = EVENTHANDLER_REGISTER(ifnet_departure_event, pfi_detach_ifnet_event, NULL, EVENTHANDLER_PRI_ANY); + pfi_rename_cookie = EVENTHANDLER_REGISTER(ifnet_rename_event, + pfi_rename_ifnet_event, NULL, EVENTHANDLER_PRI_ANY); pfi_attach_group_cookie = EVENTHANDLER_REGISTER(group_attach_event, pfi_attach_group_event, NULL, EVENTHANDLER_PRI_ANY); pfi_change_group_cookie = EVENTHANDLER_REGISTER(group_change_event, @@ -1069,6 +1073,14 @@ pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp) NET_EPOCH_EXIT(et); } +static void +pfi_rename_ifnet_event(void *arg, struct ifnet *ifp) +{ + /* XXXGL: should be handled better */ + pfi_detach_ifnet_event(arg, ifp); + pfi_attach_ifnet_event(arg, ifp); +} + static void pfi_detach_ifnet_event(void *arg __unused, struct ifnet *ifp) { From nobody Mon Dec 22 02:23:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQH2zB2z6Lxt4 for ; Mon, 22 Dec 2025 02:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQG6FBwz3R7n for ; Mon, 22 Dec 2025 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+bAatYCrdGnccPz3vCMs27zIS3S47kNN35sE+B801s=; b=BPXiv8caQgcHJ0MD22SE/U3zqHsgutRnnSCnWbMxAvWP4axYHYdpVRZcQTt2D9eNyp/rbl 6qlWzv3ts4GzYP+U4oT5aBJuOLRL3bYMSmE1itwOGkeG8hmp4rFc/9Zq1lH6deG1ffCRd1 Jsirnf150P4Z2MmniZyjWCkY/WXWrqG+Z4P4FnkhyiUjZ2oTYtxUIrgqy2gaqIMmjXGt0e fSL8uF5bMx/mueO5G3ImpfTczdu1Yh91PUILFicpznkSqH28XfUCkckChGF5THkFKKp9jA 3u02piFtjasRBbJijjtdowC25g0MV0RVHuYfInb5veHBh8f7tgiV3cPtcCqesQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+bAatYCrdGnccPz3vCMs27zIS3S47kNN35sE+B801s=; b=fAi/47BCU+UXR2Do9jMkPi1+J1xxxmYRKseWGM/ddXb6DHJtwGBBuIwp6FaM3e8irzrY8L Si6+7+kxHfkL68Krxb+4BYyasKh1gByEr/qN2qeuYh7WH1CwQEA78PuFKnbUBiOwRqg8xP +yd02QDo0tJVYq5B9WGuIKiQ+E+kxbg/ifQ41kDP/EI90KmADAkocL94GED5Hqy0CJcmDk 4M7o3eOD/3iWL84bACVHlwoTkwQGR4RF3PCWLe2REtTLO1VP58W0ElRHI6XHebR8OeKjEq mytYEcmGCx/iTgxE7gR1rWhszvFN6jMbDmRExDvXrd9u0YGA6zLF6j2vl67eGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370230; a=rsa-sha256; cv=none; b=Wklu3o54wZL3yRS1LKicmSP3nyoFSFqVTLQ50E4i8n0l+cFvG3WMf5ranZh9ZVFguw/hiu nI8UCmsBCA2wlEcmfy9XFsjOXAj/zMXVxV3WH/ioCizqi6+SH9VTlPUI98X2BvsgeLBdl3 /WoZchMiDdh8pLL2AzzaBltxr2JwdI/Rouapd+G5j6IsqfWd2M9rUqre45Mvpay1fTe7bQ g2yd/Km755yv7+F8EX3kmqOOl9vBzMNbAeVDMQEqsrReUeGK0kV6AIaqP2yuPlQ7aEi/hC DcAePDIhwdRiuJu/MxfDiGshtJ08w5zbL7b5ZSfX+PVd9acHqmNIBE1DIg0tBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQG5J7kz16KN for ; Mon, 22 Dec 2025 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ba3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b275907fa338 - main - if_tuntap: use ifnet_rename_event instead of ifnet_arrival_event List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b275907fa338b1ed6e9b5b5dd1b5069c36605285 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:50 +0000 Message-Id: <6948abb6.37ba3.54a112e0@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b275907fa338b1ed6e9b5b5dd1b5069c36605285 commit b275907fa338b1ed6e9b5b5dd1b5069c36605285 Author: Gleb Smirnoff AuthorDate: 2025-12-21 23:57:12 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 if_tuntap: use ifnet_rename_event instead of ifnet_arrival_event --- sys/net/if_tuntap.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 0dc3a58f6ae6..3f8a96311725 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -179,7 +179,7 @@ struct tuntap_softc { * which are static after setup. */ static struct mtx tunmtx; -static eventhandler_tag arrival_tag; +static eventhandler_tag rename_tag; static eventhandler_tag clone_tag; static int tuntap_osd_jail_slot; static const char tunname[] = "tun"; @@ -741,7 +741,7 @@ tun_uninit(const void *unused __unused) struct tuntap_softc *tp; int i; - EVENTHANDLER_DEREGISTER(ifnet_arrival_event, arrival_tag); + EVENTHANDLER_DEREGISTER(ifnet_rename_event, rename_tag); EVENTHANDLER_DEREGISTER(dev_clone, clone_tag); CURVNET_SET(vnet0); @@ -833,13 +833,10 @@ tuntapmodevent(module_t mod, int type, void *data) [PR_METHOD_REMOVE] = tuntap_prison_remove, }; tuntap_osd_jail_slot = osd_jail_register(NULL, methods); - arrival_tag = EVENTHANDLER_REGISTER(ifnet_arrival_event, - tunrename, 0, 1000); - if (arrival_tag == NULL) - return (ENOMEM); - clone_tag = EVENTHANDLER_REGISTER(dev_clone, tunclone, 0, 1000); - if (clone_tag == NULL) - return (ENOMEM); + rename_tag = EVENTHANDLER_REGISTER(ifnet_rename_event, + tunrename, NULL, EVENTHANDLER_PRI_ANY); + clone_tag = EVENTHANDLER_REGISTER(dev_clone, tunclone, NULL, + EVENTHANDLER_PRI_ANY); break; case MOD_UNLOAD: /* See tun_uninit(). */ @@ -1080,9 +1077,6 @@ tunrename(void *arg __unused, struct ifnet *ifp) struct tuntap_softc *tp; int error; - if ((ifp->if_flags & IFF_RENAMING) == 0) - return; - if (tuntap_driver_from_ifnet(ifp) == NULL) return; From nobody Mon Dec 22 02:23:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQG1dJdz6Lxt3 for ; Mon, 22 Dec 2025 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQF5JrLz3QpM for ; Mon, 22 Dec 2025 02:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo+aZksw480SjY5L55H7novanY3CXP9nGeVVtmousxY=; b=OVWyVLbn3l0YGZsjL/oDs1v7Y9U7EFkRxM/FVKBriIyfXCIz0rOsqw7JVbH05ZyG4ta0Ug hczVq5E4xPUl8Qwk4fzJw8N50ySweTIMk+uLhs3qOlUr7wE5MZRMirW8FqQdYyTCVj3DFd 1iJCVAAvNu6D6CjlMGKA7hcr80FvLB91jPNbZuc61KiaUXn1jfuDzv3FPaE48bOXjU8D1v KfEay8WPh8OV/oEf9JlxK2jGB3PujVhHxzikqemC6lyrJAY40mlnJ/wsEDMAq7WmBpmjBN iD67PVy+S+GITlw4rhsJJqNk8Azwr+CKubtWXvYhBo6u1gxGOoxHBESz9rPfSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo+aZksw480SjY5L55H7novanY3CXP9nGeVVtmousxY=; b=W7k+yMwrMae8MGv5l+3JkJS8gwZQ/gEdsXmWTsH9DxtJBdbbEOhEw4Uq5MdcUdKa8oSP2J fIyi4Ne6unAWNAQD01krASkeK1h/2HSVkpC9OgMKCMeTBbhEITBx+vNZPwMS6Q7VsAcErr 2+IyVjEpQu/z+1eekyK1y0Gj/YH7lpdcASNhvwrsH2NPexgVHpzQfxjl3UoWExdUJ6pBUY 4SFBm+jOnKMpMp1XyuMB0e4CRax9Hc+wToRMBPEfZDjxpagZUqM/QY68rm6fJe+FcWUkFC 8JlnkkRfI0Kuyfrl0UlfCnp21RvtMKJGbun+DRmqHg6abqnfvEsJb655O4v/4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370229; a=rsa-sha256; cv=none; b=HSPI1NomrYqWUpVp+kfD6DXwQAWNYY84O7mOlQYDRzw/0n1IT3fYRtp7p2U/9B2TgVH57b WxymFNX5jciteYUli9jLhKbvw9ErzAHkCYfJ9EWly8ZYweQWIhwrPCGTtnrnKjT59yatPK /mgMWzRemZt9cs5da4lOIyBTauwBkCfuf+0F8gne25vDXBmiS3OQuJjZK5HSjOxOVMuDGH g6SzgBi+cXiFlCbMkgdOtFZMjy2vWBbxPDyu3Vnh0fG3gDBOfFmr63FOSH8yY3tWtrY/RF 6DsVxEaUuYzJX8CtzcsmToHO+cmSS8SAgLwIm6yZQP9+o6qksMfsOF6HGljlNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQF4nw6z16BQ for ; Mon, 22 Dec 2025 02:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35562 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0bd0c3295ac0 - main - ng_ether: refactor to use interface EVENTHANDLER(9)s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bd0c3295ac09f759f2816b73cbd2d950e3bef7e Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:49 +0000 Message-Id: <6948abb5.35562.67056d01@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd0c3295ac09f759f2816b73cbd2d950e3bef7e commit 0bd0c3295ac09f759f2816b73cbd2d950e3bef7e Author: Gleb Smirnoff AuthorDate: 2025-12-21 22:13:58 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 ng_ether: refactor to use interface EVENTHANDLER(9)s --- sys/net/ethernet.h | 4 -- sys/net/if.c | 5 -- sys/net/if_bridge.c | 2 - sys/net/if_ethersubr.c | 32 ----------- sys/netgraph/ng_ether.c | 141 ++++++++++++++++++++++-------------------------- 5 files changed, 64 insertions(+), 120 deletions(-) diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 01485cf26e06..85e0ddb74144 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -460,10 +460,6 @@ extern uint32_t ether_crc32_be(const uint8_t *, size_t); extern void ether_demux(struct ifnet *, struct mbuf *); extern void ether_ifattach(struct ifnet *, const u_int8_t *); extern void ether_ifdetach(struct ifnet *); -#ifdef VIMAGE -struct vnet; -extern void ether_reassign(struct ifnet *, struct vnet *, char *); -#endif extern int ether_ioctl(struct ifnet *, u_long, caddr_t); extern int ether_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); diff --git a/sys/net/if.c b/sys/net/if.c index 1dea00da3cf2..4ddf8a69b3f0 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -239,7 +239,6 @@ static MALLOC_DEFINE(M_IFDESCR, "ifdescr", "ifnet descriptions"); static struct sx ifdescr_sx; SX_SYSINIT(ifdescr_sx, &ifdescr_sx, "ifnet descr"); -void (*ng_ether_link_state_p)(struct ifnet *ifp, int state); void (*lagg_linkstate_p)(struct ifnet *ifp, int state); /* These are external hooks for CARP. */ void (*carp_linkstate_p)(struct ifnet *ifp); @@ -2031,10 +2030,6 @@ do_link_state_change(void *arg, int pending) rt_ifmsg(ifp, 0); if (ifp->if_vlantrunk != NULL) (*vlan_link_state_p)(ifp); - - if ((ifp->if_type == IFT_ETHER || ifp->if_type == IFT_L2VLAN) && - ifp->if_l2com != NULL) - (*ng_ether_link_state_p)(ifp, link_state); if (ifp->if_carp) (*carp_linkstate_p)(ifp); if (ifp->if_bridge) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index d7911a348d87..9a468a8eb462 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -801,8 +801,6 @@ bridge_reassign(struct ifnet *ifp, struct vnet *newvnet, char *arg) } BRIDGE_UNLOCK(sc); - - ether_reassign(ifp, newvnet, arg); } #endif diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 9c157bf3d3c2..da9264aa4a23 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -98,8 +98,6 @@ VNET_DEFINE(pfil_head_t, link_pfil_head); /* Packet filter hooks */ void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp); void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m); int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp); -void (*ng_ether_attach_p)(struct ifnet *ifp); -void (*ng_ether_detach_p)(struct ifnet *ifp); /* if_bridge(4) support */ void (*bridge_dn_p)(struct mbuf *, struct ifnet *); @@ -988,9 +986,6 @@ ether_ifattach(struct ifnet *ifp, const u_int8_t *lla) ifp->if_input = ether_input; ifp->if_resolvemulti = ether_resolvemulti; ifp->if_requestencap = ether_requestencap; -#ifdef VIMAGE - ifp->if_reassign = ether_reassign; -#endif if (ifp->if_baudrate == 0) ifp->if_baudrate = IF_Mbps(10); /* just a default */ ifp->if_broadcastaddr = etherbroadcastaddr; @@ -1006,8 +1001,6 @@ ether_ifattach(struct ifnet *ifp, const u_int8_t *lla) bcopy(lla, ifp->if_hw_addr, ifp->if_addrlen); bpfattach(ifp, DLT_EN10MB, ETHER_HDR_LEN); - if (ng_ether_attach_p != NULL) - (*ng_ether_attach_p)(ifp); /* Announce Ethernet MAC address if non-zero. */ for (i = 0; i < ifp->if_addrlen; i++) @@ -1035,35 +1028,10 @@ ether_ifdetach(struct ifnet *ifp) sdl = (struct sockaddr_dl *)(ifp->if_addr->ifa_addr); uuid_ether_del(LLADDR(sdl)); - if (ifp->if_l2com != NULL) { - KASSERT(ng_ether_detach_p != NULL, - ("ng_ether_detach_p is NULL")); - (*ng_ether_detach_p)(ifp); - } - bpfdetach(ifp); if_detach(ifp); } -#ifdef VIMAGE -void -ether_reassign(struct ifnet *ifp, struct vnet *new_vnet, char *unused __unused) -{ - - if (ifp->if_l2com != NULL) { - KASSERT(ng_ether_detach_p != NULL, - ("ng_ether_detach_p is NULL")); - (*ng_ether_detach_p)(ifp); - } - - if (ng_ether_attach_p != NULL) { - CURVNET_SET_QUIET(new_vnet); - (*ng_ether_attach_p)(ifp); - CURVNET_RESTORE(); - } -} -#endif - SYSCTL_DECL(_net_link); SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Ethernet"); diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c index 80a0d3411ee8..fc388c6cdd70 100644 --- a/sys/netgraph/ng_ether.c +++ b/sys/netgraph/ng_ether.c @@ -92,17 +92,11 @@ typedef struct private *priv_p; extern void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp); extern void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m); extern int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp); -extern void (*ng_ether_attach_p)(struct ifnet *ifp); -extern void (*ng_ether_detach_p)(struct ifnet *ifp); -extern void (*ng_ether_link_state_p)(struct ifnet *ifp, int state); /* Functional hooks called from if_ethersubr.c */ static void ng_ether_input(struct ifnet *ifp, struct mbuf **mp); static void ng_ether_input_orphan(struct ifnet *ifp, struct mbuf *m); static int ng_ether_output(struct ifnet *ifp, struct mbuf **mp); -static void ng_ether_attach(struct ifnet *ifp); -static void ng_ether_detach(struct ifnet *ifp); -static void ng_ether_link_state(struct ifnet *ifp, int state); /* Other functions */ static int ng_ether_rcv_lower(hook_p node, item_p item); @@ -117,7 +111,8 @@ static ng_rcvdata_t ng_ether_rcvdata; static ng_disconnect_t ng_ether_disconnect; static int ng_ether_mod_event(module_t mod, int event, void *data); -static eventhandler_tag ng_ether_ifnet_arrival_cookie; +static eventhandler_tag ifnet_arrival_tag, ifnet_departure_tag, + ifnet_rename_tag, ifnet_linkstate_tag; /* List of commands and how to convert arguments to/from ASCII */ static const struct ng_cmdlist ng_ether_cmdlist[] = { @@ -299,13 +294,19 @@ ng_ether_output(struct ifnet *ifp, struct mbuf **mp) * A new Ethernet interface has been attached. * Create a new node for it, etc. */ -static void -ng_ether_attach(struct ifnet *ifp) +static int +ng_ether_attach(struct ifnet *ifp, void *arg __unused) { char name[IFNAMSIZ]; priv_p priv; node_p node; + if ((ifp)->if_type != IFT_ETHER && + (ifp)->if_type != IFT_L2VLAN && + (ifp)->if_type != IFT_BRIDGE) + return (0); + MPASS(IFP2NG(ifp) == NULL); + /* * Do not create / attach an ether node to this ifnet if * a netgraph node with the same name already exists. @@ -316,25 +317,17 @@ ng_ether_attach(struct ifnet *ifp) ng_ether_sanitize_ifname(ifp->if_xname, name); if ((node = ng_name2noderef(NULL, name)) != NULL) { NG_NODE_UNREF(node); - return; + return (0); } - /* Create node */ - KASSERT(!IFP2NG(ifp), ("%s: node already exists?", __func__)); if (ng_make_node_common(&ng_ether_typestruct, &node) != 0) { log(LOG_ERR, "%s: can't %s for %s\n", __func__, "create node", ifp->if_xname); - return; + return (0); } /* Allocate private data */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) { - log(LOG_ERR, "%s: can't %s for %s\n", - __func__, "allocate memory", ifp->if_xname); - NG_NODE_UNREF(node); - return; - } + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); priv->ifp = ifp; IFP2NG(ifp) = node; @@ -343,17 +336,38 @@ ng_ether_attach(struct ifnet *ifp) /* Try to give the node the same name as the interface */ if (ng_name_node(node, name) != 0) log(LOG_WARNING, "%s: can't name node %s\n", __func__, name); + + return (0); } +static void +ng_ether_arrival(void *arg __unused, struct ifnet *ifp) +{ + (void)ng_ether_attach(ifp, NULL); +} + +#define RETURN_IF_NOT_ETHERNET_OR_DETACHED(ifp) do { \ + if ((ifp)->if_type != IFT_ETHER && \ + (ifp)->if_type != IFT_L2VLAN && \ + (ifp)->if_type != IFT_BRIDGE) \ + return; \ + if (IFP2NG(ifp) == NULL) \ + return; \ +} while (0) + /* * An Ethernet interface is being detached. * REALLY Destroy its node. */ static void -ng_ether_detach(struct ifnet *ifp) +ng_ether_detach(void *arg __unused, struct ifnet *ifp) { const node_p node = IFP2NG(ifp); - const priv_p priv = NG_NODE_PRIVATE(node); + priv_p priv; + + RETURN_IF_NOT_ETHERNET_OR_DETACHED(ifp); + + priv = NG_NODE_PRIVATE(node); taskqueue_drain(taskqueue_swi, &ifp->if_linktask); NG_NODE_REALLY_DIE(node); /* Force real removal of node */ @@ -372,13 +386,17 @@ ng_ether_detach(struct ifnet *ifp) * if_link_state_change() has already checked that the state has changed. */ static void -ng_ether_link_state(struct ifnet *ifp, int state) +ng_ether_link_state(void *arg __unused, struct ifnet *ifp, int state) { const node_p node = IFP2NG(ifp); - const priv_p priv = NG_NODE_PRIVATE(node); + priv_p priv; struct ng_mesg *msg; int cmd, dummy_error = 0; + RETURN_IF_NOT_ETHERNET_OR_DETACHED(ifp); + + priv = NG_NODE_PRIVATE(node); + if (state == LINK_STATE_UP) cmd = NGM_LINK_IS_UP; else if (state == LINK_STATE_DOWN) @@ -399,31 +417,17 @@ ng_ether_link_state(struct ifnet *ifp, int state) } /* - * Interface arrival notification handler. - * The notification is produced in two cases: - * o a new interface arrives - * o an existing interface got renamed - * Currently the first case is handled by ng_ether_attach via special - * hook ng_ether_attach_p. + * Interface has been renamed. */ static void -ng_ether_ifnet_arrival_event(void *arg __unused, struct ifnet *ifp) +ng_ether_rename(void *arg __unused, struct ifnet *ifp) { char name[IFNAMSIZ]; node_p node; - /* Only ethernet interfaces are of interest. */ - if (ifp->if_type != IFT_ETHER && - ifp->if_type != IFT_L2VLAN && - ifp->if_type != IFT_BRIDGE) - return; + RETURN_IF_NOT_ETHERNET_OR_DETACHED(ifp); - /* - * Just return if it's a new interface without an ng_ether companion. - */ node = IFP2NG(ifp); - if (node == NULL) - return; /* Try to give the node the same name as the new interface name */ ng_ether_sanitize_ifname(ifp->if_xname, name); @@ -629,7 +633,7 @@ ng_ether_rcvmsg(node_p node, item_p item, hook_p lasthook) break; } case NGM_ETHER_DETACH: - ng_ether_detach(priv->ifp); + ng_ether_detach(NULL, priv->ifp); break; default: error = EINVAL; @@ -810,22 +814,19 @@ ng_ether_mod_event(module_t mod, int event, void *data) switch (event) { case MOD_LOAD: - - /* Register function hooks */ - if (ng_ether_attach_p != NULL) { - error = EEXIST; - break; - } - ng_ether_attach_p = ng_ether_attach; - ng_ether_detach_p = ng_ether_detach; ng_ether_output_p = ng_ether_output; ng_ether_input_p = ng_ether_input; ng_ether_input_orphan_p = ng_ether_input_orphan; - ng_ether_link_state_p = ng_ether_link_state; - ng_ether_ifnet_arrival_cookie = - EVENTHANDLER_REGISTER(ifnet_arrival_event, - ng_ether_ifnet_arrival_event, NULL, EVENTHANDLER_PRI_ANY); + ifnet_arrival_tag = EVENTHANDLER_REGISTER(ifnet_arrival_event, + ng_ether_arrival, NULL, EVENTHANDLER_PRI_ANY); + ifnet_departure_tag = + EVENTHANDLER_REGISTER(ifnet_departure_event, + ng_ether_detach, NULL, EVENTHANDLER_PRI_ANY); + ifnet_rename_tag = EVENTHANDLER_REGISTER(ifnet_rename_event, + ng_ether_rename, NULL, EVENTHANDLER_PRI_ANY); + ifnet_linkstate_tag = EVENTHANDLER_REGISTER(ifnet_link_event, + ng_ether_link_state, NULL, EVENTHANDLER_PRI_ANY); break; case MOD_UNLOAD: @@ -838,16 +839,16 @@ ng_ether_mod_event(module_t mod, int event, void *data) * is MOD_UNLOAD, so there's no need to detach any nodes. */ - EVENTHANDLER_DEREGISTER(ifnet_arrival_event, - ng_ether_ifnet_arrival_cookie); + EVENTHANDLER_DEREGISTER(ifnet_arrival_event, ifnet_arrival_tag); + EVENTHANDLER_DEREGISTER(ifnet_departure_event, + ifnet_departure_tag); + EVENTHANDLER_DEREGISTER(ifnet_rename_event, ifnet_rename_tag); + EVENTHANDLER_DEREGISTER(ifnet_link_event, ifnet_linkstate_tag); /* Unregister function hooks */ - ng_ether_attach_p = NULL; - ng_ether_detach_p = NULL; ng_ether_output_p = NULL; ng_ether_input_p = NULL; ng_ether_input_orphan_p = NULL; - ng_ether_link_state_p = NULL; break; default: @@ -858,23 +859,9 @@ ng_ether_mod_event(module_t mod, int event, void *data) } static void -vnet_ng_ether_init(const void *unused) +ng_ether_vnet_init(void *arg __unused) { - struct ifnet *ifp; - - /* If module load was rejected, don't attach to vnets. */ - if (ng_ether_attach_p != ng_ether_attach) - return; - - /* Create nodes for any already-existing Ethernet interfaces. */ - IFNET_RLOCK(); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type == IFT_ETHER || - ifp->if_type == IFT_L2VLAN || - ifp->if_type == IFT_BRIDGE) - ng_ether_attach(ifp); - } - IFNET_RUNLOCK(); + if_foreach_sleep(NULL, NULL, ng_ether_attach, NULL); } -VNET_SYSINIT(vnet_ng_ether_init, SI_SUB_PSEUDO, SI_ORDER_ANY, - vnet_ng_ether_init, NULL); +VNET_SYSINIT(ng_ether_vnet_init, SI_SUB_PROTO_IF, SI_ORDER_ANY, + ng_ether_vnet_init, NULL); From nobody Mon Dec 22 02:23:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQJ1rcnz6Ly4n for ; Mon, 22 Dec 2025 02:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQH6Pchz3RK4 for ; Mon, 22 Dec 2025 02:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+nCuss8CgAruyyhr1VmDIIe1CfjGJvNX1/HbZJq/r8=; b=WaM6h3CVdC1S5HF55e5yMGd1xdYrd0vqsIkFLqPNgj+mv3oBv2cjsH2aSlp6M3WYyJFwgH SDNHjE9VMcUgw8ZDiAxyrbvKSa9PiItXf3aAlxfJL1EjrJQ4qkFN/FmBKVU1Yn7e56yUdm gBFhqJRyssT7Yuvbb49CxC/WhD4D2qo7nEJAPm9dzac0hNU963GNJWbMTZRmZJwrzRdq4X WJ2DqrMLHivYKrFpwdv7dV5OJa+iGvHyx0bH7wG9U0sfzLttvWU9TVUSDg3kAm65x/emYo J9kAEIIxIm9Z2OumVLRC+wgN84A1GFzLrqpf5J7SQUGdVVjeQypifEDgtFmFfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+nCuss8CgAruyyhr1VmDIIe1CfjGJvNX1/HbZJq/r8=; b=hM1s4YWT8IKihKdrU7DFdZbSdNmDW+vz3maaUjXtH4nMoLTED4OQufMPbbqv4dtOlu2Ye4 0PKWj+umCW3SfTleVr7l0qEpNbdRaUm0CMzdwZi4xuqahpRsGaWkKCLOexd2wgHW6FtmAA 2gcekNNdpccsLIBHD76+opCOwyhVlYUYYWhpCs8Mu30lhaTOb/mrUWZeFOZifnGqm9B9Xw NK0fLBzr2MRI6skLNnEN4vXOHcr3JPT+NhDWSUiETZ2EldmFP4F5gILosqn1ezFDtn4jSb PEVJ3odvGxQm0Cf8HLMb9rat1v8UxYlwv7joxrnxBrWK09Q3fHTYGyW2v4RKTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370231; a=rsa-sha256; cv=none; b=YkBNd7Z+LHYMZZ6rt4/5t2eDPynSkMo+/+oqfHgcoSJHmEWD++KVi2QlFcqJKI8Cx7Lgka wlBZdrVP4t4AGm1/kZjzt4nI6Fm2SJ2jZliF+Ycwrg3A/9CyafWFeKA9Fo0f6neY1eLuSU y0Mt8j5j6NN8ktR4f/HFXtLkU0Iz7QAvPCdJeggg0WVH/PmPjcSrvXyEQAujyuz5Io7Twz 0+K9s7t+tKD6ZhXwpMunLMOX8SJ+CPzMfx051k0o2x29R2GpGH2j4AilvY56pveirb2PSd AoEr2PiXXrXjeMyX2KVzXFoeC75T0zjw3BKz/vZUJqc54Zds7dCZzyMkJZhCUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQH616pz15sC for ; Mon, 22 Dec 2025 02:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37f05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 129e15d49943 - main - ipfw: fix bpf tap point lookup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 129e15d4994311958db59a1718d4ff42d440ce2b Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:51 +0000 Message-Id: <6948abb7.37f05.2a08a421@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=129e15d4994311958db59a1718d4ff42d440ce2b commit 129e15d4994311958db59a1718d4ff42d440ce2b Author: Gleb Smirnoff AuthorDate: 2025-12-22 01:18:27 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 ipfw: fix bpf tap point lookup The trick I blindly used works for pointers to structs, but not for rule numbers that can differ only by 1. PR: 291854 Fixes: 3daae1ac1d82ecdcd855101bab5206e914b12350 --- sys/netpfil/ipfw/ip_fw_bpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_bpf.c b/sys/netpfil/ipfw/ip_fw_bpf.c index aa92d30007c2..d9897f700d57 100644 --- a/sys/netpfil/ipfw/ip_fw_bpf.c +++ b/sys/netpfil/ipfw/ip_fw_bpf.c @@ -63,10 +63,10 @@ struct ipfw_tap { char name[sizeof("ipfw4294967295")]; }; -static int32_t +static inline int tap_compare(const struct ipfw_tap *a, const struct ipfw_tap *b) { - return ((int32_t)(a->rule/2 - b->rule/2)); + return (a->rule != b->rule ? (a->rule < b->rule ? -1 : 1) : 0); } RB_HEAD(tap_tree, ipfw_tap); VNET_DEFINE_STATIC(struct tap_tree, tap_tree); From nobody Mon Dec 22 02:23:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQK2s2lz6LyCq for ; Mon, 22 Dec 2025 02:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMQK0BGwz3RHj for ; Mon, 22 Dec 2025 02:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370233; h=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=LI2RXYSoULI9RYbw8Q1DXQW1VTl1uHUvdn/LsU0jhRs=; b=ipEWXNxR1IqKS9gXqohb43Iy1ayHyA2gPnk93e+lrnBZ/dS47nzqDuF+eP9cXQsZi5U4Cw ygw6QRf//TcBKoYchSR/oRvV6BTJoy/q+PtdDIa/Y68F2b/w0nHQVXBz+xzwXuQ1LV4tJ7 Ij3gYQ0qmhtnUK6gziq21JbUZFHjxs6rtHLuaaU/Ctv0bLrRrZOfpP6zTaDASig5SdlOtS P1ssgPY42ZnRg24cZ8e8NvLXsj4ozQ1EGNx3X5/UfidXHMKQ0JKkz+EPRP77i1LVWt3Ly0 1JUW1eSOxZni0hanYyDI+mzc80ELAm7pOrv07Lmtnkak/AJ4oMRAvit8UUjMbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370233; h=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=LI2RXYSoULI9RYbw8Q1DXQW1VTl1uHUvdn/LsU0jhRs=; b=ok9GBG1aiAAKO4M5PkIhv6s7Eypm/2jAIkzIktFMQP08qXp7ttLbpXcww+WMQ6LBeCAAVF B3TDHmKUvCGu8pVjpmHzLEKdmAYXhGKVqrAdeV9VkdMTrWpyozN3RGpgQs5ydKgzQj5+/h vMebcrzQaF6wGW346AP59ADVC8j1GuIVAWDsk/1L5lStH2awPPRHagP8k4qsJei0FtRuf+ wnO43anvfgauAUB1d4BgfQA+5v5T05TaMiDuiljdlFHw02EZOvvPOEi4Bm1J0EUCq069+z PXTJiGwNFu19uBdo24dEqym1fnZby9+/lwLFqftqZh6T4OTGI7VjPPqIqbwUxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370233; a=rsa-sha256; cv=none; b=hJgkNUSS4T/NcUUv/f7qc39EMGHbfI1E4DHaIkWYDmuSkWOCipMPkwnJUY06/NSFUjTDzY p9XSBDARV77ok/tweBOcv1VnRzjfScqISOGfL0QpiUjb9nFTy/JaS0BpRrsVEVr+2fWoyz CcOBLyjGQYIID8wZHvQ4bqkGv9xCMeJe4Q5dWhxua7ptRbXXYU/M+oEHEvTap+eeoTUz/T xxVyjorEp1mrngVOLAIRgclfrFjf0i4ACj9Vum8xFnhRyW3b0ZGjaoWlPKFMRYA4ftlXeL NqKvrogi0EcXSORCBebkuy67roJVkXfYENEwQwjiJkcjphhyLs490/PVYmUOyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQJ6npXz16Dw for ; Mon, 22 Dec 2025 02:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37437 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Guy Harris From: Gleb Smirnoff Subject: git: 88b04633c29e - main - libpcap: fix resource leaks and set error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88b04633c29e3a8fd2ac88febd1aedf409ce6925 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:52 +0000 Message-Id: <6948abb8.37437.77874608@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=88b04633c29e3a8fd2ac88febd1aedf409ce6925 commit 88b04633c29e3a8fd2ac88febd1aedf409ce6925 Author: Guy Harris AuthorDate: 2025-12-22 01:26:32 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:28 +0000 libpcap: fix resource leaks and set error messages In finddevs_bpf() close the BPF device descriptor and free the device list buffer before returning. For ioctl() and malloc() errors, use pcapint_fmt_errmsg_for_errno() to generate an error message. Fix some comments. (cherry picked from commit 6870404f35da32d63a0a8789edb010842dd6b208) --- contrib/libpcap/pcap-bpf.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/contrib/libpcap/pcap-bpf.c b/contrib/libpcap/pcap-bpf.c index 83a363eee0bd..9ca8df156219 100644 --- a/contrib/libpcap/pcap-bpf.c +++ b/contrib/libpcap/pcap-bpf.c @@ -45,7 +45,7 @@ #if defined(__FreeBSD__) && __FreeBSD_version < 1600006 /* - * Add support for capturing on FreeBSD usbusN interfaces. + * Add support for creating FreeBSD usbusN interfaces as necessary. */ static const char usbus_prefix[] = "usbus"; #define USBUS_PREFIX_LEN (sizeof(usbus_prefix) - 1) @@ -2039,8 +2039,8 @@ pcap_activate_bpf(pcap_t *p) #if defined(__FreeBSD__) && __FreeBSD_version < 1600006 /* - * If this is legacy FreeBSD, and the device name begins with "usbus", - * try to create the interface if it's not available. + * If this is FreeBSD 15 or earlier, and the device name begins + * with "usbus", try to create the interface if it's not available. */ if (strncmp(p->opt.device, usbus_prefix, USBUS_PREFIX_LEN) == 0) { /* @@ -2879,18 +2879,48 @@ finddevs_bpf(pcap_if_list_t *devlistp, char *errbuf) const char *name; int fd; - if ((fd = bpf_open(errbuf)) < 0) + if ((fd = bpf_open(errbuf)) < 0) { + /* + * XXX - this just means we won't have permission to + * open any BPF devices, an thus we don't have + * permission to capture on network interfaces. + */ return (-1); + } memset(&bi, 0, sizeof(bi)); - if (ioctl(fd, BIOCGETIFLIST, (caddr_t)&bi) != 0 || bi.bi_size == 0) + if (ioctl(fd, BIOCGETIFLIST, (caddr_t)&bi) != 0) { + pcapint_fmt_errmsg_for_errno(errbuf, + PCAP_ERRBUF_SIZE, errno, "BIOCGETIFLIST to get buffer size"); + close(fd); return (-1); + } + if (bi.bi_size == 0) { + /* + * There are no devices attached to BPF. + * This means that, in practice, whatever network + * interfaces we found don't support packet capture + * or injection. + */ + close(fd); + return (0); + } - if ((bi.bi_ubuf = malloc(bi.bi_size)) == NULL) + if ((bi.bi_ubuf = malloc(bi.bi_size)) == NULL) { + pcapint_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, errno, + "malloc"); + close(fd); return (-1); + } - if (ioctl(fd, BIOCGETIFLIST, (caddr_t)&bi) != 0) + if (ioctl(fd, BIOCGETIFLIST, (caddr_t)&bi) != 0) { + pcapint_fmt_errmsg_for_errno(errbuf, + PCAP_ERRBUF_SIZE, errno, "BIOCGETIFLIST to attached devics"); + free(bi.bi_ubuf); + close(fd); return (-1); + } + close(fd); for (name = bi.bi_ubuf; bi.bi_count > 0; bi.bi_count--, name += strlen(name) + 1) From nobody Mon Dec 22 02:24:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMRG5Xy6z6Ly5F; Mon, 22 Dec 2025 02:24:42 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMRG2Bxrz3SXD; Mon, 22 Dec 2025 02:24:42 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F6ZO3sk6SaoTuOdDryxhsSbS41UncrK9XlEh+vfsb+Q=; b=JO0C4wfIHHX17f/WaP7gpI/Q76qzS7OqRV4VaT54AkPGX8dwO5rqYhEnOvm43NE1sFQ89Y iDjG6lgKUXamfet8GBKC6pIRwMvAUV0MBn94zZX9bNfCKFOP9ZzG3G+GaH5bIYwS+cTxOJ d4PQXVnnOr755Z7fYdA6ODJgAeIIBJsSky9xZHvk6Po1Ew6XV2D4m64bkgJ90Tm/zrYx/t 74JpZVDRr3uvSW92rf5jvDRbJYWrltEx/hhqJwqgpnIMqPbWDNIHgS7CDoPAFKYMNMCNEc KMhDl4W/SagBRRhbWD6ITwuKOyrYrDrg4zVW1vegTLBCtIZ5AWU3Xf8U/wJiCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F6ZO3sk6SaoTuOdDryxhsSbS41UncrK9XlEh+vfsb+Q=; b=Yvfi2J6Ny0DAlYYNR1IG0Znw3yOeQEAf2sXfYxaIDC+QYTOzcu9ssM4wYsax7+M5Dc2zC2 nL5NJRuafaoOVRXGB4R9QAAr9whVuqwMwUCf+DWw1BH3suUjxHuoLemqBLOu3EExqUNO/o vyzUqVo2dYaJi5ke6mvAjCA0Cwf2nHkRufIAeiYT4UmQWIPSQrKM3HqZTGi2qctExkY51D ImUC/yz9A5+/HwlFm0JvUGbd9uQKUC9jrpkiqfpDJIWu+bHZ8gpDbD7cJjpg6m5/tZFHYJ xojHO0YdKP87MclLpjR1rAXkM8JykjxUu8/xH2ishPBWAWo95AYQRT4vTh6sQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370282; a=rsa-sha256; cv=none; b=yzY4XJRc9riOVJqdfuAyvD/3LQJ4mC3v0BLbwkKVvdw4qvBKxywFaGmAMf3o0xoV8kU/Wn v36VmDnyT64srIaBqlJ4ojOF2/Cyh8q20NUx2l79nHZgAHD/yaVVpodTmmcSvgrPdZg944 RaMfy21jpGqBN4kpt4bNxMrOfIsJoTraS5hm8lEntJzhnvH2Lni/03dkRy76NumLZZujlt 6qVc9aZmesj2V/MyWxUOQhlmevuolNlgKEXnXRxYCqlreR81xaCBwWCrQeRYhPcCAJZehE 4/qtXjkFYfZv7De7PoV56EjcSVT2qIquZmf1N3VtopDFtLR+PWUeodNARKgcGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dZMRF4Zbzzrl3; Mon, 22 Dec 2025 02:24:41 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Sun, 21 Dec 2025 18:24:39 -0800 From: Gleb Smirnoff To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0d469d23715d - main - net: attach IPv4 and IPv6 stacks to an interface with EVENTHANDLER(9) Message-ID: References: <694452f3.32deb.4d0ab2a7@gitrepo.freebsd.org> <4A394DAA-1FCE-440A-8E92-88BD9B4EE087@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <4A394DAA-1FCE-440A-8E92-88BD9B4EE087@FreeBSD.org> On Fri, Dec 19, 2025 at 12:10:09PM +0100, Kristof Provost wrote: K> I’m seeing panics on pfsync interface destruction now: K> K> panic: mld_change_state: bad ifp This is fixed by 77939d64f23da4b0b599fad6edd967ffd1d17217. -- Gleb Smirnoff From nobody Mon Dec 22 02:33:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMdy1FNbz6M0Tl for ; Mon, 22 Dec 2025 02:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMdx60t1z3VFw for ; Mon, 22 Dec 2025 02:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1LXE/GkKG8NolGIU7p8W38T5FexF/2lZMQClSXkTKM=; b=tAxsGoJlxdLblU1oRIriCo5nR7yhMC4rz99hjekJvgOkxmukdJpnqbPHklpat1CowTiez8 39ECdRezqnGGiTKVkksvMLt2V0h3/PFUYyu/VpLZ3KiB50GCQsWOmi3YXKzIEljnTyEeJB 5stTaUhmg+FoaLUGryLKpY5uXTVO8BqeO8Fq9DdycYOKke4g2Iu5WRXgv6KEJGspJ9d2yB +cm12QEv4M4tbQENl5ZZpr6Iu2TFAZkKf+uOI1rv+7nIvS8spIGj3lL6F2uixhGYX3Ya8B Tx1L0iNxILLQc0YSDOwWlymKNA4QM08NzadasGBQaz3Vt7WF5X7ACu0lURy55w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1LXE/GkKG8NolGIU7p8W38T5FexF/2lZMQClSXkTKM=; b=FD3eC3CNvwLXzhB5ZD2m4wRP9bFs3/RFjFJWTQIpefR0rxcDnsU0V+AS0kqmhDpxaEnOq4 f9jpxKir4VCtY0DZW2CaamqvApFY3NFqsksy7YI7vMXnzgV/OlpRMBj3kzIZRSuNutbDgH IbviW7ULih8G5S4V8ACghSnVZAVWYXK3eTKsPTHyrz9NsiLrimXHbaHoAXfDtnS/qFgp2/ C5BUC/1mkXjXvvcABCKLJkj97dQYc+ZRW0tb0Q+wKR7MG8Nirj9XvWD3kzzL/IIKZW9ieY NrsjGhCzxNlQTSc0IlAtZ/RxP3ExexCe1A5WA+r3V+pozhziECq7AbI29pIGCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370837; a=rsa-sha256; cv=none; b=V0kOvFhxxnBdgpHKfVawcLKA6Tjf9c0mYfxO1DKJKRZ2qPfB9WWNyXhXvrbDNsiPhyTle8 2lXT3Tr7xVmjeOeUI1Yo0fy9edhuN3GH1606otgXiUY/awjJvEMBoskz5artLBrnVRk1AV I77KaUOCdAdFj2W3q5aaX8z5S+95E55Sgp0AgOcx4bKmA4rQ6AR0Jtd13dmYawT0a0rbdI F005fotYCUiOHx5ypN2KcekoGbK84B+XNtqdQ58fgmjaYZ4Qg6oRqAhBkzr4G/HfaI3mfr W0it42omjd6EITC9ackiRMvSJWqw01a8hobfNqdPNP6hmZ9vysn5m/Gq2Ou1uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMdx59gGz16pp for ; Mon, 22 Dec 2025 02:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 388a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:33:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: c8282c0dc36f - stable/14 - Fix zgrep(1) wrapper regression, add test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8282c0dc36faefc3c5273daca6b85e3d1912d7b Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:33:57 +0000 Message-Id: <6948ae15.388a8.6f57feb@gitrepo.freebsd.org> The branch stable/14 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=c8282c0dc36faefc3c5273daca6b85e3d1912d7b commit c8282c0dc36faefc3c5273daca6b85e3d1912d7b Author: Craig Leres AuthorDate: 2025-12-13 23:43:02 +0000 Commit: Craig Leres CommitDate: 2025-12-22 02:33:24 +0000 Fix zgrep(1) wrapper regression, add test @bdrewery reported D48873 broke "bzgrep -q '1 2' /var/log/messages.0.bz2" The mistake was in using $* instead of "$@" (I suspect $* is never right). Reported by: bdrewery Reviewed by: markj Approved by: markj Fixes: 1070477cc8b7 ("Fix remaining zgrep(1) wrapper script regressions") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54217 (cherry picked from commit 80726c2257e9d6d79341aac65ba22987f53619bc) --- usr.bin/grep/tests/grep_freebsd_test.sh | 10 ++++++++++ usr.bin/grep/zgrep.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index 906b70645151..eaf3694c2b1e 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -117,6 +117,15 @@ color_dupe_body() atf_check -o match:"^ +1 color.out" wc -l color.out } +atf_test_case qflag +qflag_body() +{ + # Test whitespace in argument + printf "1 2 3 4\n5 6 7 8\n" > in + + atf_check zgrep -q '1 2' in +} + atf_init_test_cases() { atf_add_test_case grep_r_implied @@ -124,4 +133,5 @@ atf_init_test_cases() atf_add_test_case gnuext atf_add_test_case zflag atf_add_test_case color_dupe + atf_add_test_case qflag } diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh index 8bd630726647..474f3868db9d 100755 --- a/usr.bin/grep/zgrep.sh +++ b/usr.bin/grep/zgrep.sh @@ -109,7 +109,7 @@ do grep_args="${grep_args} ${pre}" shift # Put back partial arg - set -- "-${post}" $* + set -- "-${post}" "$@" ;; -[ABCDdefm]) if [ $# -lt 2 ] From nobody Mon Dec 22 02:33:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMf16jCTz6M0S5 for ; Mon, 22 Dec 2025 02:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZMf15FzNz3Vb0 for ; Mon, 22 Dec 2025 02:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=auRl/VjdEzJsKrsGwyouBsanN121wAVGgYNAtwaNCEM=; b=UFxCv1TGZPGGUuHOylMZhjBK1ML57W1+97h3BkbrUYDHm1hq73Pkg2j3Ez0OZx19LBfZPY GWxKi2JKPYAgh9rmGyCp/G/bYWhnSUrTcym43qh5JibAl5zjwJ2DEJzOLmkR1ofZCIDUWu wsiXIcKn/WmUwVUD2q9giuqpvsUYhYmk8T0FJLa7lS2Y/DDiAmbHoO/k6jDkB/NMaN5bfw c2S+iT2mkEbHQtdTjCuOlbvFypbYALPPkz1zn3AGdwXvYThv03MYeJYJr9+eWCMtGsz06y 97ebGSfO4EstFvdaW4H6VACVAHsCA4pm8aqGjMPksv/smwA3pCQG5x0xStuY+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=auRl/VjdEzJsKrsGwyouBsanN121wAVGgYNAtwaNCEM=; b=usbLE64u3ETI9aXT6x6ex8pdLkLboAzEXgJ1NUSZsu4tF8VGjnHAle0mf6iiiNjbTeRLQS SnYUVKCqhvYDELst6fRzpXLAvdQC3/aJjIhHpPQ4HWrI2mGnp7qhzCqBMKs/P+HmHWyMoM ON8qkbS+Ak6CiUDWFZj/Bo3wfCCU71f5QiI4T9VYj7ytI673evNun3YFN1gBFrTCpQQNvy oHzMVkOBfxrxa+RAFvCkuiUxYu/U+EAZvnEIhRZWOvJOkwla6T/ej3F/vrK1xFSfjlBWVb zDmlo7uX1UQEJ1fF9OklXvCgBDnryjBNFKk6AyiMbBsZV1Gi4+mU9b3ysjkoKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370841; a=rsa-sha256; cv=none; b=a4lAHkuRqV5wRFfBsiSPpRaY4c6Gk4cQ8A1M+VtGvPXJv5VzfJ8znkHuAa0HVvwf+0+yV5 CPE5n/RMoIuUkYWY5H/q3SfSE5nl0hMwRbW1EWdea3m6S2gCcCQH+1DcA9rbTtDTAfWL+o 8dDP94gXZFceTb1sPDH00n7nH7X/L3jdtBlu0pqPrEdKXnPaBeJiy7E5Q0XGUeKMNZ4kAt qvLpuzoFT3buaXikdWr3hVVBNRnwp1SL+k5sAVyj1tqu9abyeik2igycJQsVrmbBqh7Dwb 1GyLA+HlTTLB9RZP15R45VLL73jaZhdeZEEvYszaulfX2cIjsQqt8C86cXJ48Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMf14dGfz16LV for ; Mon, 22 Dec 2025 02:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:33:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 4706a2bea988 - stable/14 - Fix remaining zgrep(1) wrapper script regressions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4706a2bea9880b6bc86a2f1e45b330de447ea91f Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:33:56 +0000 Message-Id: <6948ae14.38d0c.713f7b48@gitrepo.freebsd.org> The branch stable/14 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=4706a2bea9880b6bc86a2f1e45b330de447ea91f commit 4706a2bea9880b6bc86a2f1e45b330de447ea91f Author: Craig Leres AuthorDate: 2025-02-08 21:19:54 +0000 Commit: Craig Leres CommitDate: 2025-12-22 02:33:09 +0000 Fix remaining zgrep(1) wrapper script regressions Summary: Fix short flags without whitespace, e.g: zgrep -wefoo test Fix multiple -e flags: zgrep -e foo -e xxx test Previously only the last pattern would be used. Clean up possible leading blank in ${grep_args}. Update comment: 2.51 -> 2.6.0 Add a test case for the last known zgrep wrapper issue: recursion (-r) not implemented. Reviewed By: markj Differential Revision: https://reviews.freebsd.org/D48873 (cherry picked from commit 1070477cc8b7a88b1fd2b1ba810a1fff761799a1) --- contrib/netbsd-tests/usr.bin/grep/t_grep.sh | 24 ++++++++++--- usr.bin/grep/zgrep.sh | 52 +++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh index b1412a7a0715..c4ba9a9657db 100755 --- a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh +++ b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh @@ -221,8 +221,6 @@ zgrep_combined_flags_head() } zgrep_combined_flags_body() { - atf_expect_fail "known but unsolved zgrep wrapper script regression" - echo 'foo bar' > test atf_check -o inline:"foo bar\n" zgrep -we foo test @@ -278,8 +276,6 @@ zgrep_multiple_eflags_head() } zgrep_multiple_eflags_body() { - atf_expect_fail "known but unsolved zgrep wrapper script regression" - echo foobar > test atf_check -o inline:"foobar\n" zgrep -e foo -e xxx test @@ -940,6 +936,25 @@ zgrep_multiple_files_body() echo bar > test2 atf_check -s exit:1 zgrep foo test1 test2 } + +atf_test_case zgrep_recursive +zgrep_multiple_files_head() +{ + atf_set "descr" "Checks for zgrep wrapper recursion" +} +zgrep_recursive_body() +{ + atf_expect_fail "unimplemented zgrep wrapper script functionality" + + mkdir -p tester1 + echo foobar > tester1/test + atf_check -o inline:"tester1/test:foobar\n" zgrep -r foo tester1 + + mkdir -p tester2 + echo foobar > tester2/test1 + echo foobar > tester2/test2 + atf_check -o inline:"tester2/test1:foobar\ntester2/test2:foobar\n" zgrep -r foo tester2 +} # End FreeBSD atf_init_test_cases() @@ -996,5 +1011,6 @@ atf_init_test_cases() atf_add_test_case mflag atf_add_test_case mflag_trail_ctx atf_add_test_case zgrep_multiple_files + atf_add_test_case zgrep_recursive # End FreeBSD } diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh index d7a52dcad141..8bd630726647 100755 --- a/usr.bin/grep/zgrep.sh +++ b/usr.bin/grep/zgrep.sh @@ -74,7 +74,7 @@ esac while [ $# -gt 0 -a ${endofopts} -eq 0 ] do case $1 in - # from GNU grep-2.5.1 -- keep in sync! + # from GNU grep-2.6.0 -- keep in sync! --) shift endofopts=1 @@ -85,6 +85,9 @@ do shift ;; --regexp=*) + if [ ${pattern_found} -ne 0 ]; then + grep_args="${grep_args} -e ${pattern}" + fi pattern="${1#--regexp=}" pattern_found=1 shift @@ -100,20 +103,31 @@ do grep_args="${grep_args} $1" shift ;; - -*[ABCDXdefm]) + -[EFGHILOSUVabchilnopqsuvwxyz]*) + post="${1#-?}" + pre=${1%${post}} + grep_args="${grep_args} ${pre}" + shift + # Put back partial arg + set -- "-${post}" $* + ;; + -[ABCDdefm]) if [ $# -lt 2 ] then echo "${prg}: missing argument for $1 flag" >&2 exit 1 fi case $1 in - -*e) + -e) + if [ ${pattern_found} -ne 0 ]; then + grep_args="${grep_args} -e ${pattern}" + fi pattern="$2" pattern_found=1 shift 2 continue ;; - -*f) + -f) pattern_file=1 ;; *) @@ -122,6 +136,27 @@ do grep_args="${grep_args} $1 $2" shift 2 ;; + -[ABCDdefm]*) + post="${1#-e}" + case ${1} in + -e*) + if [ ${pattern_found} -ne 0 ]; then + grep_args="${grep_args} -e ${pattern}" + fi + pattern="${post}" + pattern_found=1 + shift + continue + ;; + -f*) + pattern_file=1 + ;; + *) + ;; + esac + grep_args="${grep_args} ${post}" + shift + ;; -) hyphen=1 shift @@ -130,7 +165,7 @@ do echo "${prg}: the ${1} flag is not currently supported" >&2 exit 1 ;; - -*) + -?) grep_args="${grep_args} $1" shift ;; @@ -156,12 +191,15 @@ then pattern_found=1 fi +# Clean up possible leading blank +grep_args="${grep_args# }" + # call grep ... if [ $# -lt 1 ] then # ... on stdin if [ ${pattern_file} -eq 0 ]; then - ${cattool} ${catargs} - | ${grep} ${grep_args} -- "${pattern}" - + ${cattool} ${catargs} - | ${grep} ${grep_args} -e "${pattern}" -- - else ${cattool} ${catargs} - | ${grep} ${grep_args} -- - fi @@ -176,7 +214,7 @@ else for file; do if [ ${pattern_file} -eq 0 ]; then ${cattool} ${catargs} -- "${file}" | - ${grep} --label="${file}" ${grep_args} -- "${pattern}" - + ${grep} --label="${file}" ${grep_args} -e "${pattern}" -- - else ${cattool} ${catargs} -- "${file}" | ${grep} --label="${file}" ${grep_args} -- - From nobody Mon Dec 22 09:31:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZXw25FQbz6Khxd for ; Mon, 22 Dec 2025 09:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZXw24Rydz4DkQ for ; Mon, 22 Dec 2025 09:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766395906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ahOJKM2A/q0iLIZntKoNaKUDvXgxpfKv3btr3DZjEVM=; b=ajmTfL9IBQ0PSeKCKkHkKVXpvMbhv2dJOgV7+v76Y7kNzX46u52+c5KoLl4h05bOi2Iezs fAigEQlt5HLNJ/SSiA8N3gjT82FqN3nw5t9b6F+A40jp6Yt/2uVVMLipqv0lH/zGZTPazL Vzg8IWe4qhXwo3PhMsBR2kqkq3xpXk+g81zO64M3Eg2GNRWToP2ML8/YlVLv8bcv7OJ6s+ BwcS3FKGoB6mfc4VIg9V/q0963Sbc89Cd2DjmwdOCLHOo7pe3u0DpCyaQU6tZF66+ACK19 dsavErKAnEM7t90EsYnUNVjjBXJXHXwkumYlpXuxT3i3mwzfjzjKGd8OdYE9bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766395906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ahOJKM2A/q0iLIZntKoNaKUDvXgxpfKv3btr3DZjEVM=; b=H8yoGiC9XgVv8M4Ztysw5pGDMFdR+rK946FZ1h8jbAqg0079H3vOFM5Ow+GDYDG/vVWBsS 9KhOQROoZN5Qs1seUvAJYyve+Y773YMjENRaKyW/j/ClFoGsjPA37IgobjLz2m+9X++TdU qrzvUpX7Q19VJHUOZigWPOffB/MxrFsXhKC3F2Bs8uf2meCteSJE09gF6mYqMArLeA18M0 +TdoZ+8AP/EvqKrX5IDLZsFMc866/vpItok2siBhFe0s+1qMVwffXafsqMabnYcfCngnG9 7/uFRDiyNFGxP221H9ik5uRzF1LGx4RZsfexeggjfAtWUtkFETXCtmnBVb2pzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766395906; a=rsa-sha256; cv=none; b=AXVkj1f7opHpLZwnzy0t8NfCk0S6E4BW3Lea9Nae2cGb5gOQatV7+X4eRl1fV9TDUvMqbu +eweZl+2zhYezQpWVQQ9sO5+JYwa1KfVLKKo++8Idys9gKEapuCE5o9LI2G3xt1lP5YW4/ PBUBGLuaAXPOJXaGzSahtCf5vOJ8wKrotZWRObyKWkON3sXqMDeh6L/LbYcDCPY7tTDzj4 aNl29PHiIeLQJ9xxn2RCNirdbhACW5b6pW40lKoQoBghOXteyRFg9RY3Ov9ndm5llJZke9 WnJV1dfMd/e3goHF2NhBf0Y33DShUT5XBBiyeLUEzzNraXOP1yxId67GkJSv8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZXw242j1z4wS for ; Mon, 22 Dec 2025 09:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 90be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 09:31:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: cf1eaaf41cef - main - Reduce number of external symbols in libllvm, libclang and liblldb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf1eaaf41cefe7e3aef45f6dab862191a3939ed8 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 09:31:46 +0000 Message-Id: <69491002.90be.d40a7f8@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cf1eaaf41cefe7e3aef45f6dab862191a3939ed8 commit cf1eaaf41cefe7e3aef45f6dab862191a3939ed8 Author: Dimitry Andric AuthorDate: 2025-12-21 21:37:57 +0000 Commit: Dimitry Andric CommitDate: 2025-12-22 09:31:40 +0000 Reduce number of external symbols in libllvm, libclang and liblldb In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, upstream builds the shared libraries using several visibility options, which reduces the number of external symbols, and makes the libraries a bit smaller. On my test machine: * libprivatellvm.so goes from 75643 to 34706 symbols (~54% reduction) * libprivateclang.so goes from 53250 to 33531 symbols (~37% reduction) * libprivatelldb.so goes from 27242 to 18798 symbols (~31% reduction) Note: to get the full benefit, a clean build is required. Incremental builds should still work, but I didn't want to force a full rebuild on everybody. MFC after: 1 week --- lib/clang/libllvm/Makefile | 12 ++++++++++++ lib/clang/llvm.build.mk | 1 + 2 files changed, 13 insertions(+) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 810eac08d8d5..7c45375b8fbf 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -48,6 +48,8 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB + SRCDIR= llvm/lib # Explanation of different SRCS variants below: @@ -2050,6 +2052,16 @@ SRCS_ALL+= ${SRCS_COV} SRCS+= ${GENSRCS} SRCS+= ${SRCS_ALL:O} +# Optimization: for all source files under Target/*/*, use -fvisibility=hidden, +# which reduces the number of external symbols in the resulting shared library. +# This is also what upstream does. +.for src in ${SRCS} +. if "${src:MTarget/*/*}" +CFLAGS.${src:T}+= -fvisibility=hidden +.info ${src}: CFLAGS.${src:T} +. endif +.endfor + llvm/CodeGen/GenVT.inc: ${LLVM_SRCS}/include/llvm/CodeGen/ValueTypes.td ${LLVM_MIN_TBLGEN} -gen-vt \ -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index a26e15679242..b8b4be7dfe28 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -122,6 +122,7 @@ LDFLAGS+= -Wl,-m,elf64lriscv_fbsd CXXSTD= c++17 CXXFLAGS+= -fno-exceptions CXXFLAGS+= -fno-rtti +CXXFLAGS+= -fvisibility-inlines-hidden .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) CXXFLAGS.clang+= -stdlib=libc++ .else From nobody Mon Dec 22 11:50:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZc071SKGz6KybY for ; Mon, 22 Dec 2025 11:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZc065sWhz3Bvp for ; Mon, 22 Dec 2025 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766404230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6jmc7B3aUBxDe7Z++XPxc8w64yPc0gm5I1qLN9bp1W0=; b=HtZHtmZ7T0K4JlvEkOUVor9EciCvCslV0d45l5wFTuW7TqtLe3pxhqruBcg3JgY0SX8Av2 vlwkhuhqvUgy1NMd8JgBsnZ862/CfPivLOrqr803KsSupMYYMlYVC/SKisCW2l1S5oJkD0 4izVoh4ALAXGVCcF0WOYnVzIGAzHw3kJT/uWn65PS2dOJH8ivQLezltPibblDSErRAN9rN VElBHbe5PS52mFIyWfMvemqq4WNFDRY0ZfFZVBvVz4mGYIKi3zF21h+zvnAdgmBRgRYKZR DpKYVCm91t4Gd9e8nu0UfjKHgDW6zximH6qFbWEri8/zBt2/4mKldeehdnd3fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766404230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6jmc7B3aUBxDe7Z++XPxc8w64yPc0gm5I1qLN9bp1W0=; b=aimyQbixIPvc/ajauQUC740f+Uv1dS1JND61Ww8Zi5xr8yjaQWcTFuk0vRalEStPxlGMfz Y6XoNLrxvHJgZ/qJpPErevCP8xYQqHlaNIKTq/bB+5TaI4jXkFdmAKY+ofyDRdqVNtZrq4 85eIQCH5PVhseDFzTli8sGBthiFsttEkTmkj9J/GfjZ5v8AVdw3kM03m3Y3dXHd0xg1w7T 3vxtH4Jxl5PCMSTrWGxfYijQfXpfslW9bAsDu0qynS5qwlpqdfo0S0XaOT+mztuifIbNyr uqaSONGeFo0npNnz9rXi83vQxT2B5XXall4sLBg0GUJo98VOZ1fMRLcCyWKMwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766404230; a=rsa-sha256; cv=none; b=azlmRQ2P3+S975DLJhmfo2ZUy1wT9SsEeSMxfbGHwcm5Mv7SZWoDJlpUhJ5Mde+35nSseU NV/UIqdMTqOUMrJZW4N+Sm4kwieAs5kyxnFro2orDO6bJkoO5NDKq4QyQDJI4xxDvpxdor /oCvO5U6b4HKBx1zNua+G/Q2NmUbRDGtXOyWZkoFq0IlX6iFcH9tbyi9+vxBOgCePIRA2P nbgbvklHHUhhqfhtFMTQ4hBvD058ukLEeGD3rfEVI3eFRCBd64DFjTbZEl6lRsPdFhK0+K HGHcOmwiUaAqVhJqwg2WreW0PZTxh4U3J0M5f7iENMtO4znpvht//eAWNjRIeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZc064yvfz8WX for ; Mon, 22 Dec 2025 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2677b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 11:50:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3b1126208f44 - main - Remove debug crutch I accidentally left in List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b1126208f44a90c7dc04a87207e54b22d45893c Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 11:50:30 +0000 Message-Id: <69493086.2677b.543656f0@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3b1126208f44a90c7dc04a87207e54b22d45893c commit 3b1126208f44a90c7dc04a87207e54b22d45893c Author: Dimitry Andric AuthorDate: 2025-12-22 11:49:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-22 11:49:42 +0000 Remove debug crutch I accidentally left in Fixes: cf1eaaf41cef MFC after: 1 week --- lib/clang/libllvm/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 7c45375b8fbf..a4e9c628d99e 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2058,7 +2058,6 @@ SRCS+= ${SRCS_ALL:O} .for src in ${SRCS} . if "${src:MTarget/*/*}" CFLAGS.${src:T}+= -fvisibility=hidden -.info ${src}: CFLAGS.${src:T} . endif .endfor From nobody Mon Dec 22 12:33:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZcxb24V8z6L40d for ; Mon, 22 Dec 2025 12:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZcxb1Dqbz3GRG for ; Mon, 22 Dec 2025 12:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766406803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYhRUD6hOAl+eLjx/nbF6NWBRcJqjpLCFuoTtAe4UTs=; b=AVFqDGUGO4MX42WyPenZ+fUNam2FCEoL7LNGkv5V+VXsLbLeoHuKKdEctSsDK0GnCEVl4j waC9vOW6xW5glEFz1IFpjpoE/iJO7/g1qLqIWyesfoSPbLyMND1RCLTqZE2Vn+deyLIzp+ MrG8P0s65Z7+LcXNaAgJjRbfspfaakBPBZtv+7cCy2Vg6C33/Itfsf3LSHWSwvxNbnOPcw eispeHqJZ6i7bWsRd7oGNvuyjKOHUGXQa4tHZo5sxM+7TzXUDhS7jWyKiXeT1z10FGLpYq WUUTFTpBbOjA+ytsbcKikVDzq3rb1C16R+Fxpc2lyLwwqu2718Gb2PsMHYITFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766406803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYhRUD6hOAl+eLjx/nbF6NWBRcJqjpLCFuoTtAe4UTs=; b=Io0cDV6P+fSe9X5VPyiHw7ORzXB/ixLkVa2Ot6zsRzbg0pgr5OUTF9Q3+aGfJ1IhThR6uR 44MN0jKuHNagZYMezWt76hjYZMcHPwr4+iuJVrgwILCDHIOG3SmS6qW7LZJLxq8p/4YpBG +BoeofHfhCv9wTuAmiXLtQqD3ltUi8lHeId6e14FikW2RwHShyhOPb0f1vx7KAwsHD1qeM XApAtRfEJBmp3dbpMyMvByXDiDql0/aiuko2fYxF/pkWlHuEy28LLwUdpTAFdXRHav1Q8x Z+D9X3ltnbp/cikK0GjQC1VD5Ax8KY2BowmR1tK65oNgG5Tx+0jx8GkCp3PGSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766406803; a=rsa-sha256; cv=none; b=DJrVwMVz4d0u9b6EvrVmFVAdkUKumjiwnsD2rVtWM6JWIEwiHIJGm+ZcBrfhjo4qkOClOZ xhcJcf3WNymn3dcwCXDQiWN316HwMlKaPht/5ZkQ/49Z+PU04FyqSwH2xXyO9zvAHB01zD SN5KBOCV7RbA53cY82NkC51Cd7mobVOOHnEu00gR3cdh5pjYBgv7pdGiuosuZCyh9ROYY4 +jS0cY4dhhSvWee9ljOnqnxPVE8ypHj6Zzkuyypru8Ug37ZzG4KyFcf5sM5/4B9hzn8Jbl 9w9X3H/CLC9KIXllddY8STeI9LZWpDc+jXn7ckvApdalKrC7nlsW/oUvnZSIHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZcxb0lQhz9jF for ; Mon, 22 Dec 2025 12:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3488e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 12:33:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 183513d15f22 - main - sys/netipsec: ensure sah stability during input callback processing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 183513d15f2290a42b542753aaffe9de2152575b Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 12:33:23 +0000 Message-Id: <69493a93.3488e.7902a5a8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=183513d15f2290a42b542753aaffe9de2152575b commit 183513d15f2290a42b542753aaffe9de2152575b Author: Konstantin Belousov AuthorDate: 2025-12-09 08:55:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-22 12:31:25 +0000 sys/netipsec: ensure sah stability during input callback processing Citing ae: this fixes some rare panics, that are reported in derived projects: `panic: esp_input_cb: Unexpected address family'. Reported by: ae Tested by: ae, Daniel Dubnikov Reviewed by: ae, Ariel Ehrenberg (previous version) Sponsored by: NVidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54325 --- sys/net/if_ipsec.c | 12 ++++++++++-- sys/netipsec/ipsec.h | 7 +++++-- sys/netipsec/ipsec6.h | 5 ++++- sys/netipsec/ipsec_input.c | 17 +++++++++++++---- sys/netipsec/xform_ah.c | 16 ++++++++++++++-- sys/netipsec/xform_esp.c | 10 ++++++++-- sys/netipsec/xform_ipcomp.c | 16 ++++++++++++++-- 7 files changed, 68 insertions(+), 15 deletions(-) diff --git a/sys/net/if_ipsec.c b/sys/net/if_ipsec.c index df10af66471c..fd4fb37debfa 100644 --- a/sys/net/if_ipsec.c +++ b/sys/net/if_ipsec.c @@ -450,7 +450,8 @@ ipsec_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, } int -ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) +ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af, + struct rm_priotracker *sahtree_tracker) { IPSEC_RLOCK_TRACKER; struct secasindex *saidx; @@ -459,13 +460,16 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) if (sav->state != SADB_SASTATE_MATURE && sav->state != SADB_SASTATE_DYING) { + ipsec_sahtree_runlock(sahtree_tracker); m_freem(m); return (ENETDOWN); } if (sav->sah->saidx.mode != IPSEC_MODE_TUNNEL || - sav->sah->saidx.proto != IPPROTO_ESP) + sav->sah->saidx.proto != IPPROTO_ESP) { + ipsec_sahtree_runlock(sahtree_tracker); return (0); + } IPSEC_RLOCK(); CK_LIST_FOREACH(sc, ipsec_idhash(sav->sah->saidx.reqid), idhash) { @@ -487,6 +491,7 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) } if (sc == NULL) { IPSEC_RUNLOCK(); + ipsec_sahtree_runlock(sahtree_tracker); /* Tunnel was not found. Nothing to do. */ return (0); } @@ -494,6 +499,7 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || (ifp->if_flags & IFF_UP) == 0) { IPSEC_RUNLOCK(); + ipsec_sahtree_runlock(sahtree_tracker); m_freem(m); return (ENETDOWN); } @@ -503,6 +509,8 @@ ipsec_if_input(struct mbuf *m, struct secasvar *sav, uint32_t af) */ m->m_pkthdr.rcvif = ifp; + ipsec_sahtree_runlock(sahtree_tracker); + m_clrprotoflags(m); M_SETFIB(m, ifp->if_fib); BPF_MTAP2(ifp, &af, sizeof(af), m); diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 44e7d9667d5b..b8969e88abbe 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -330,12 +330,14 @@ VNET_DECLARE(int, natt_cksum_policy); struct inpcb; struct ip; struct m_tag; +struct rm_priotracker; struct secasvar; struct sockopt; struct tcphdr; union sockaddr_union; -int ipsec_if_input(struct mbuf *, struct secasvar *, uint32_t); +int ipsec_if_input(struct mbuf *, struct secasvar *, uint32_t, + struct rm_priotracker *); struct ipsecrequest *ipsec_newisr(void); void ipsec_delisr(struct ipsecrequest *); @@ -357,7 +359,8 @@ void ipsec_setspidx_inpcb(struct inpcb *, struct secpolicyindex *, u_int); void ipsec4_setsockaddrs(const struct mbuf *, const struct ip *, union sockaddr_union *, union sockaddr_union *); -int ipsec4_common_input_cb(struct mbuf *, struct secasvar *, int, int); +int ipsec4_common_input_cb(struct mbuf *, struct secasvar *, int, int, + struct rm_priotracker *sahtree_tracker); int ipsec4_check_pmtu(struct ifnet *, struct mbuf *, struct ip *ip1, struct secpolicy *, int); int ipsec4_process_packet(struct ifnet *, struct mbuf *, struct ip *ip1, diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h index a7410733c43f..0747b88059ab 100644 --- a/sys/netipsec/ipsec6.h +++ b/sys/netipsec/ipsec6.h @@ -60,12 +60,15 @@ VNET_DECLARE(int, ip6_ipsec_ecn); #define V_ip6_ipsec_ecn VNET(ip6_ipsec_ecn) struct inpcb; +struct rm_priotracker; + struct secpolicy *ipsec6_checkpolicy(const struct mbuf *, struct inpcb *, int *, int); void ipsec6_setsockaddrs(const struct mbuf *, union sockaddr_union *, union sockaddr_union *); -int ipsec6_common_input_cb(struct mbuf *, struct secasvar *, int, int); +int ipsec6_common_input_cb(struct mbuf *, struct secasvar *, int, int, + struct rm_priotracker *sahtree_tracker); int ipsec6_check_pmtu(struct ifnet *, struct mbuf *, struct secpolicy *, int); int ipsec6_process_packet(struct ifnet *, struct mbuf *, struct secpolicy *, struct inpcb *, u_long); diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 221ac879cb18..34767420086a 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -339,7 +339,7 @@ ipsec4_ctlinput(ipsec_ctlinput_param_t param) */ int ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, - int protoff) + int protoff, struct rm_priotracker *sahtree_tracker) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); struct epoch_tracker et; @@ -492,7 +492,9 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, /* Handle virtual tunneling interfaces */ if (saidx->mode == IPSEC_MODE_TUNNEL) - error = ipsec_if_input(m, sav, af); + error = ipsec_if_input(m, sav, af, sahtree_tracker); + else + ipsec_sahtree_runlock(sahtree_tracker); if (error == 0) { error = netisr_queue_src(isr_prot, (uintptr_t)sav->spi, m); if (error) { @@ -507,6 +509,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, bad: NET_EPOCH_EXIT(et); bad_noepoch: + ipsec_sahtree_runlock(sahtree_tracker); key_freesav(&sav); if (m != NULL) m_freem(m); @@ -590,7 +593,7 @@ extern ipproto_input_t *ip6_protox[]; */ int ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, - int protoff) + int protoff, struct rm_priotracker *sahtree_tracker) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); struct epoch_tracker et; @@ -734,7 +737,9 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, } /* Handle virtual tunneling interfaces */ if (saidx->mode == IPSEC_MODE_TUNNEL) - error = ipsec_if_input(m, sav, af); + error = ipsec_if_input(m, sav, af, sahtree_tracker); + else + ipsec_sahtree_runlock(sahtree_tracker); if (error == 0) { error = netisr_queue_src(isr_prot, (uintptr_t)sav->spi, m); @@ -748,6 +753,9 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, key_freesav(&sav); return (error); } + + ipsec_sahtree_runlock(sahtree_tracker); + /* * See the end of ip6_input for this logic. * IPPROTO_IPV[46] case will be processed just like other ones @@ -787,6 +795,7 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, return (0); bad: NET_EPOCH_EXIT(et); + ipsec_sahtree_runlock(sahtree_tracker); key_freesav(&sav); if (m) m_freem(m); diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 8f08872eb38a..65c67db983d6 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -692,6 +692,7 @@ ah_input_cb(struct cryptop *crp) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); unsigned char calc[AH_ALEN_MAX]; + struct rm_priotracker sahtree_tracker; struct mbuf *m; struct xform_data *xd; struct secasvar *sav; @@ -711,6 +712,14 @@ ah_input_cb(struct cryptop *crp) nxt = xd->nxt; protoff = xd->protoff; cryptoid = xd->cryptoid; + ipsec_sahtree_rlock(&sahtree_tracker); + if (sav->state >= SADB_SASTATE_DEAD) { + /* saidx is freed */ + DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); + AHSTAT_INC(ahs_notdb); + error = ESRCH; + goto bad; + } saidx = &sav->sah->saidx; IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET || saidx->dst.sa.sa_family == AF_INET6, @@ -808,12 +817,14 @@ ah_input_cb(struct cryptop *crp) switch (saidx->dst.sa.sa_family) { #ifdef INET6 case AF_INET6: - error = ipsec6_common_input_cb(m, sav, skip, protoff); + error = ipsec6_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif #ifdef INET case AF_INET: - error = ipsec4_common_input_cb(m, sav, skip, protoff); + error = ipsec4_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif default: @@ -823,6 +834,7 @@ ah_input_cb(struct cryptop *crp) CURVNET_RESTORE(); return error; bad: + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); if (sav) key_freesav(&sav); diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 7aec10549e6c..be8c18da60b3 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -492,6 +492,7 @@ static int esp_input_cb(struct cryptop *crp) { IPSEC_DEBUG_DECLARE(char buf[128]); + struct rm_priotracker sahtree_tracker; uint8_t lastthree[3]; const struct auth_hash *esph; struct mbuf *m; @@ -507,6 +508,7 @@ esp_input_cb(struct cryptop *crp) xd = crp->crp_opaque; CURVNET_SET(xd->vnet); sav = xd->sav; + ipsec_sahtree_rlock(&sahtree_tracker); if (sav->state >= SADB_SASTATE_DEAD) { /* saidx is freed */ DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); @@ -527,6 +529,7 @@ esp_input_cb(struct cryptop *crp) if (ipsec_updateid(sav, &crp->crp_session, &cryptoid) != 0) crypto_freesession(cryptoid); xd->cryptoid = crp->crp_session; + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); return (crypto_dispatch(crp)); } @@ -658,12 +661,14 @@ esp_input_cb(struct cryptop *crp) switch (saidx->dst.sa.sa_family) { #ifdef INET6 case AF_INET6: - error = ipsec6_common_input_cb(m, sav, skip, protoff); + error = ipsec6_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif #ifdef INET case AF_INET: - error = ipsec4_common_input_cb(m, sav, skip, protoff); + error = ipsec4_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif default: @@ -673,6 +678,7 @@ esp_input_cb(struct cryptop *crp) CURVNET_RESTORE(); return error; bad: + ipsec_sahtree_runlock(&sahtree_tracker); if (sav != NULL) key_freesav(&sav); if (m != NULL) diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index 05a01b75e0bb..61fb9413a01a 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -283,6 +283,7 @@ static int ipcomp_input_cb(struct cryptop *crp) { IPSEC_DEBUG_DECLARE(char buf[IPSEC_ADDRSTRLEN]); + struct rm_priotracker sahtree_tracker; struct xform_data *xd; struct mbuf *m; struct secasvar *sav; @@ -300,6 +301,14 @@ ipcomp_input_cb(struct cryptop *crp) skip = xd->skip; protoff = xd->protoff; cryptoid = xd->cryptoid; + ipsec_sahtree_rlock(&sahtree_tracker); + if (sav->state >= SADB_SASTATE_DEAD) { + /* saidx is freed */ + DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); + IPCOMPSTAT_INC(ipcomps_notdb); + error = ESRCH; + goto bad; + } saidx = &sav->sah->saidx; IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET || saidx->dst.sa.sa_family == AF_INET6, @@ -365,12 +374,14 @@ ipcomp_input_cb(struct cryptop *crp) switch (saidx->dst.sa.sa_family) { #ifdef INET6 case AF_INET6: - error = ipsec6_common_input_cb(m, sav, skip, protoff); + error = ipsec6_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif #ifdef INET case AF_INET: - error = ipsec4_common_input_cb(m, sav, skip, protoff); + error = ipsec4_common_input_cb(m, sav, skip, protoff, + &sahtree_tracker); break; #endif default: @@ -380,6 +391,7 @@ ipcomp_input_cb(struct cryptop *crp) CURVNET_RESTORE(); return error; bad: + ipsec_sahtree_runlock(&sahtree_tracker); CURVNET_RESTORE(); if (sav != NULL) key_freesav(&sav); From nobody Mon Dec 22 14:47:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZgwS6Wyjz6LHKy for ; Mon, 22 Dec 2025 14:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZgwS61nCz3Sbv for ; Mon, 22 Dec 2025 14:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766414856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j/JpBwvUgz0Ha5D26T3PV0HtT3DF/kiFyyF4pJZFFZo=; b=wFxapTE24fmA5EplX/ZgVS4S1D3QCCuT+IDdRQ9KtCD8SGAUaV6IDHEm0peu1fzSQpR8Oy kLO8eyEfX2j61OlsR0IJvvhHJEjVQkBSXYMpnVflw7+XBBtnBDka5XXwvQyh6gR6y8qFMJ w65er4yb3wwRU3hNQcELAfWYHSZtMRxb68MXrP4SIdmgUxpax+aWfEw9GnnBbHYsS/ol0d HhGHu0ipocNQL46Jw+FC/LhlU18smchhg/qatK3ZYCiLpHAmslHPPyJWjOAe0OpIyd89lt Ip/Dv2GzzkJ9eYrpVS1T6tdm59Yot0uHGduU2pZ3Yw+OaIWy9n1iY4D1GLFngA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766414856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j/JpBwvUgz0Ha5D26T3PV0HtT3DF/kiFyyF4pJZFFZo=; b=I4f+R0CGglj43WOrqNhwF5+bOPUONgpwPvNTkh0SijK8X9pXN4Kd/MXqbLBBAYHVjhq7Cb AyOnZQ/7fo93u3tps4vNZhfIPne3YFw5fgTwljCGQqUUMooy+ofpX574mhF990ueZUyhSp +4Vwp7drZfEGDUm/E9xcPvbFWFyBF6ImrHndtHAg+cvQJBMIMzLW1vLPTjGLVaCh/S5mwa 0H3KtcUc4+nEHF/wZ5GpSYBeJPOQAjF0p4Xs/6Ph2org/76lJ4BDzKBntjfYjYeDSJXFpV B/ISz7reGzMfWPWY80ZVXuynq0ctQNQTMX0y0tsklVJDqtT/Qnq3C0erHHja6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766414856; a=rsa-sha256; cv=none; b=SmNbkCH2tztxImNcVaViiU+PJq7NqxTQPnsueot30i7B3rgu6ZF3fco3d5nTlNaomI6fjt 8Y3cgww5iUr6WUX59L820J63ClMDAWzBIewrhDvxfKwlXx1yfbHO0o7ID5iCHAxMcpsd+q RuVQChiUlSfhYXJA7apZiM5LucH1mV6dUenFMnf7M3yKNbcy3let/mv3GyXA9trgYhJ2Rp NZDI2nC5M7Tfl9n0+pgBekeZn4g+yA6vWxB/M98NJ4NiJ67SriwNZLq+mUA+lxec1rNX4k a3LlnkdTgjgEFI6Nis+edf5wzCxTR1JxBRzrNIL2zWBbQG1wFJB+aWOk95cL+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZgwS5Kp7zVfW for ; Mon, 22 Dec 2025 14:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40f0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 14:47:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 15178d8ed290 - main - pf: Fix state handling when ICMP packets are diverted List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15178d8ed2904d5c4fa31a1531e60dcb1e0f9209 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 14:47:36 +0000 Message-Id: <69495a08.40f0c.397e3ac0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=15178d8ed2904d5c4fa31a1531e60dcb1e0f9209 commit 15178d8ed2904d5c4fa31a1531e60dcb1e0f9209 Author: Mark Johnston AuthorDate: 2025-12-20 18:18:50 +0000 Commit: Mark Johnston CommitDate: 2025-12-22 14:47:27 +0000 pf: Fix state handling when ICMP packets are diverted Commit 66f2f1c83247 ("pf: handle divert packets") missed a case that I happened to hit while testing something. Add a regression test for the ICMP case, based on the existing test. Fix a buglet in the existing test (missing whitespace after "["). Reviewed by: kp Sponsored by: OPNsense Sponsored by: Klara, Inc. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54321 --- sys/netpfil/pf/pf.c | 10 ++++++---- tests/sys/netpfil/pf/divert-to.sh | 40 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2ebaf61a165f..755b87bcfeb7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11178,10 +11178,12 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 } action = pf_test_state_icmp(&s, &pd, &reason); if (action == PF_PASS || action == PF_AFRT) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule; - a = s->anchor; + if (s != NULL) { + if (V_pfsync_update_state_ptr != NULL) + V_pfsync_update_state_ptr(s); + r = s->rule; + a = s->anchor; + } } else if (s == NULL) action = pf_test_rule(&r, &s, &pd, &a, &ruleset, &reason, inp, &match_rules); diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh index 153136199311..3028c9e75afd 100644 --- a/tests/sys/netpfil/pf/divert-to.sh +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -402,8 +402,7 @@ pr260867_body() "pass in on ${epair}b proto tcp from any to port 7 divert-to 0.0.0.0 port 1001" reply=$(echo "foo" | nc -N 192.0.2.2 7) - if ["${reply}" != "foo" ]; - then + if [ "${reply}" != "foo" ]; then atf_fail "Did not receive echo reply" fi } @@ -413,6 +412,42 @@ pr260867_cleanup() pft_cleanup } +atf_test_case "pr260867_icmp" "cleanup" +pr260867_icmp_head() +{ + atf_set descr 'Variant of the PR260867 test' + atf_set require.user root +} + +pr260867_icmp_body() +{ + pft_init + divert_init + + epair=$(vnet_mkepair) + + atf_check ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec alcatraz $(atf_get_srcdir)/../common/divapp 1001 divert-back & + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "pass in on ${epair}b proto icmp from any to any divert-to 0.0.0.0 port 1001" + + atf_check -o ignore ping -c 3 192.0.2.2 +} + +pr260867_icmp_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "in_div" @@ -426,4 +461,5 @@ atf_init_test_cases() atf_add_test_case "in_dn_in_div_in_out_div_out_dn_out" atf_add_test_case "pr260867" + atf_add_test_case "pr260867_icmp" } From nobody Mon Dec 22 14:47:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZgwV0652z6LH2G for ; Mon, 22 Dec 2025 14:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZgwT5gxMz3SRJ for ; Mon, 22 Dec 2025 14:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766414857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bOG5YYtELlB4iC9gmM9Eyjrko6X5EG7UlnUWqLphiKw=; b=Q1gOa3MJ3C1QBiLAXX4Wl4OrHu+tcNjnJtlA5OZRxqPPXmTl4nq9s3AFKrIfBQsV+Wz2hC Za6CXpYpxpFrcu7hsx4d+Vvp8vU90uMGKK6cTs6KWRsuF8Gz6oWZe9IfscHKhDGD5QsYbv KdEhd+4RA3cl8t58GViVEhsm+roBLDTIGKe9f6k82PLLXP/URjaynzJ7xWJxN1ETvv1twI OUJqVT/sTAIJ6mc25AwDbMYdNNod+d83qvYfzH7oplhfNeiKHJJfWDnJMm9nn6GFnD+UgD fVvfmq13yycmai1bAutIvj+Fc0t3ipBawTFkoIk1OqmpD3Oeqrmw91rZA91mug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766414857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bOG5YYtELlB4iC9gmM9Eyjrko6X5EG7UlnUWqLphiKw=; b=Ssf8qKoOsGIRJ0mpBPYv7DmTh1NZ9xSPScgxg53XXEZQ7E/K+a35XcuWIgWlJy6YWOcx7f 9bl0IjOf2wOX9dYgi6iC97OCGctP6boN531wHluI2/GrCqMdNmTsPVX7/08FR7AtcYeDqD iIOt4a9eHz/+uXVTYBqRNJPqgNUgrR5Zdy/suA7qVj9OxMQJxNJyPuXWfOBf5O3QX+4RsO hSGJimKIV3kkNiCjVABy1KPCLTsiwb58znUZ9HIyPKydJeFJ9L/Vewg7cVJ1sl5G+gMt34 U6JDsl6p8+yt1iKs+y1+she/4+fs+TuGxDUCqn+U2j6QgtTdd0Bc5p9UHV1Ojw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766414857; a=rsa-sha256; cv=none; b=wRND/AaBLlzSPkLFcpHlUXJIn9BvI5/2ohjdq0V+MYn9LaLXKDTKxt4bl7HaOmjJX/TiyY 5DdL4bwCTT8lD91sMssvuB5aZIUgjXUZX5RdnLQswytoWL5cBTUoP4YO+9CyXPCCL9Oo/5 Mq2NEufPGBXWKclAlvyVWcOpgrqRt+hkwfHXFyJvCgl8V8Ugho2kCflLBHF0VMV0Yx2SiS kFSLJDJvPPvcc3igulTqWOXHOOwPyrZAtdtCFszlCCtYQyE+k/K2T62xfNFcfhLZOhxEgd /ZG6eDz7U9+O6aruM53qP4Qoq884qEvjRWr6Ryhm5C7yygCTJ067RFIl9DAZyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZgwT573jzVpT for ; Mon, 22 Dec 2025 14:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f5b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 14:47:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: da8ab1324942 - main - inotify: Avoid resetting the cookie List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da8ab13249420e85935b89794f333f0755e56385 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 14:47:37 +0000 Message-Id: <69495a09.3f5b9.24b4d6d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da8ab13249420e85935b89794f333f0755e56385 commit da8ab13249420e85935b89794f333f0755e56385 Author: Mark Johnston AuthorDate: 2025-12-21 23:49:26 +0000 Commit: Mark Johnston CommitDate: 2025-12-22 14:47:27 +0000 inotify: Avoid resetting the cookie The IN_MOVED_FROM and _TO events only apply to names in a watched directory, never to a watched directory itself. So, the cookie value there is always zero, and in particular we should not reset the caller-provided cookie value, as it may be used later. Add a regression test. Reported by: arrowd MFC after: 1 week --- sys/kern/vfs_inotify.c | 7 ++----- tests/sys/kern/inotify_test.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index fd1ef39b13f7..716fdc96e5fb 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -723,7 +723,6 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, } break; case IN_MOVED_FROM: - cookie = 0; selfevent = IN_MOVE_SELF; break; case _IN_ATTRIB_LINKCOUNT: @@ -734,10 +733,8 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, break; } - if ((selfevent & ~_IN_DIR_EVENTS) != 0) { - inotify_log(vp, NULL, 0, selfevent | isdir, - cookie); - } + if ((selfevent & ~_IN_DIR_EVENTS) != 0) + inotify_log(vp, NULL, 0, selfevent | isdir, 0); } /* diff --git a/tests/sys/kern/inotify_test.c b/tests/sys/kern/inotify_test.c index 713db55afc22..0a4df4e5fcaa 100644 --- a/tests/sys/kern/inotify_test.c +++ b/tests/sys/kern/inotify_test.c @@ -761,6 +761,36 @@ ATF_TC_BODY(inotify_event_move, tc) close_inotify(ifd); } +ATF_TC_WITHOUT_HEAD(inotify_event_move_dir); +ATF_TC_BODY(inotify_event_move_dir, tc) +{ + char dir[PATH_MAX], subdir1[PATH_MAX], subdir2[PATH_MAX]; + uint32_t cookie1, cookie2; + int error, ifd, wd1, wd2; + + ifd = inotify(IN_NONBLOCK); + + wd1 = watch_dir(ifd, IN_MOVE, dir); + snprintf(subdir1, sizeof(subdir1), "%s/subdir", dir); + error = mkdir(subdir1, 0755); + ATF_REQUIRE(error == 0); + wd2 = inotify_add_watch(ifd, subdir1, IN_MOVE); + ATF_REQUIRE(wd2 != -1); + + snprintf(subdir2, sizeof(subdir2), "%s/newsubdir", dir); + error = rename(subdir1, subdir2); + ATF_REQUIRE(error == 0); + + cookie1 = consume_event_cookie(ifd, wd1, IN_MOVED_FROM, IN_ISDIR, + "subdir"); + cookie2 = consume_event_cookie(ifd, wd1, IN_MOVED_TO, IN_ISDIR, + "newsubdir"); + ATF_REQUIRE_MSG(cookie1 == cookie2, + "expected cookie %u, got %u", cookie1, cookie2); + + close_inotify(ifd); +} + ATF_TC_WITHOUT_HEAD(inotify_event_open); ATF_TC_BODY(inotify_event_open, tc) { @@ -858,6 +888,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, inotify_event_create); ATF_TP_ADD_TC(tp, inotify_event_delete); ATF_TP_ADD_TC(tp, inotify_event_move); + ATF_TP_ADD_TC(tp, inotify_event_move_dir); ATF_TP_ADD_TC(tp, inotify_event_open); ATF_TP_ADD_TC(tp, inotify_event_unmount); return (atf_no_error()); From nobody Mon Dec 22 15:50:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZjK73Qbmz6LMnd for ; Mon, 22 Dec 2025 15:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZjK65NnSz3Y7N for ; Mon, 22 Dec 2025 15:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766418634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtVldstdwKXGpGG3jUO+RFC2irSWx7cTlIoN+GPE4QY=; b=DETh8qIoDeyCP3Tpv0nDGKaQepDRmZcXVeFH9B66Q26dQMZSA0RFHivcBIXebeaNwlZ1WX fx9XUcjsg4UXr+2ivlv0/1zD8P0HdLLB8f1Hz5LI5wf2LSej158hIDbtWBTf7yNsFSbN/s 64vTUfo44e6d3Lj5OA+X5aaZzzocxpEk6QPalEbK2zYpKeqyNe1oeBXvYVET+1rza63QhY 2vFyplNuqrdgttFu3CLhsk9G23ZSJVQxqO0aazMpsTxBSSJyK7fpaBY0PberWnNitIt7RJ hYu9RGEsEcaH+uQMkDtPqBaGl5jDOTCRWH4gzfEnVCo6hx/gC5tQn6dAPVjMhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766418634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtVldstdwKXGpGG3jUO+RFC2irSWx7cTlIoN+GPE4QY=; b=c8Dud4Mnowyl4l7hS0jbQydNjlZwv0WrUDCWQOAkLf39okOG9oO6yNqvAY/Na6GBdPRaiC 2cHafiyxUyMIhRyhq0MXgP3slG/cgnmFp0Hddb8Q258pSENIs0zgMgeKVUdUfsD+1CETqK gLyUdkilAMc50joSQH4IuXtOaSC5IVwUz8GvEMS7qvKTFBMDpz+rA3PLkC8+jQ9ZkAysFn z6NhHZkW4pqrAiY2iMmIBetF9tHkcGCpma1z7WL2gc7hBjC8HCNL4QMHsr4AjwMe+KM/Mx JIasJo3XiFPa8Cb5HDmRblZYwzEqEshtIO4cdBLUbnt0vWzB45oRIc5cJ9/3Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766418634; a=rsa-sha256; cv=none; b=gFl9MHK7VFj/FLXp7/FLWzZlZ6id0UVvb1R0Ie0fpwBex9dd9pSadFJCUK1MWT8DQfY6aG hHFtrY+8zG/BePLBdutIJeeVP5i1RrEQJUB+LolTg6JcwZycOEzeqJ8FGPn2GYjRVzKjAw syRvtPfkEoBkXkruBOO8kh04ISA65TuehoeRCMoB6V/MOMEXcuL5QwrMQyCX9FvkcIptcY A7YgzRLIdaNoSFDDlc/tJfQH8VqYMaZHPnJez5OIkABaK5La/lEFS71zKDaYEiMJEtBiu/ QjWaQqFw3VB8abU0rk005QPO1pPIv6onIoHvDd/Stb5XRXIlpa6MXAXtc38EnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZjK64NY4zYgl for ; Mon, 22 Dec 2025 15:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 458ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 15:50:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3a4275a5f1f5 - main - telnet: Remove usage of ALIGN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a4275a5f1f5dccd6918c4eff3b84488e322ad5d Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 15:50:34 +0000 Message-Id: <694968ca.458ee.2105ea40@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a4275a5f1f5dccd6918c4eff3b84488e322ad5d commit 3a4275a5f1f5dccd6918c4eff3b84488e322ad5d Author: Mark Johnston AuthorDate: 2025-12-22 15:18:52 +0000 Commit: Mark Johnston CommitDate: 2025-12-22 15:18:52 +0000 telnet: Remove usage of ALIGN gcc doesn't like ALIGN() being applied to an array type. Just use __aligned instead. Reported by: Jenkins Reviewed by: brooks Fixes: 80203a27e964 ("Add sys/_align.h replacing machine/_align.h") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54290 --- contrib/telnet/telnet/commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c index ca3460e455ad..2005362b5326 100644 --- a/contrib/telnet/telnet/commands.c +++ b/contrib/telnet/telnet/commands.c @@ -2848,7 +2848,7 @@ cmdrc(char *m1, char *m2) static int sourceroute(struct addrinfo *ai, char *arg, unsigned char **cpp, int *lenp, int *protop, int *optp) { - static char buf[1024 + ALIGNBYTES]; /*XXX*/ + static char buf[1024] __aligned(sizeof(void *)); /*XXX*/ unsigned char *cp, *cp2, *lsrp, *ep; struct sockaddr_in *_sin; #ifdef INET6 @@ -2888,7 +2888,7 @@ sourceroute(struct addrinfo *ai, char *arg, unsigned char **cpp, int *lenp, int lsrp = *cpp; ep = lsrp + *lenp; } else { - *cpp = lsrp = (char *)ALIGN(buf); + *cpp = lsrp = buf; ep = lsrp + 1024; } From nobody Mon Dec 22 16:28:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZk9B66ftz6LR0K for ; Mon, 22 Dec 2025 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZk9B59pVz3cGd for ; Mon, 22 Dec 2025 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766420926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1DL7F87O6QwKiXICxmC08slTx4uDKhybPzy+i+tmoD8=; b=ZMkEdeFoCRsQmdKjph2DJbDhZqbUoyDVg0BCbF2opUsVVARtmrNL7XRso+WFj2dcnAFciq ASiSwFqyGlnwfxUtkdKVLSpYDtdJvy/RzQQyrN6pNfhBlbSChN0jwtF055liEaqWO8qyIO 1GwzXwtJR9EpKN3YACoaCQlUm6RPc9JceLqGPl7wf2/cDdKmXbosyDIQl0zvXvgJslGqef H7GsjWruFzH8ujOVYsU2KGvf/9+HiekYIlMilop9JQw6oQtxgSTVcvgFNrRPAyD+HbXEsy 0jFOew7lzN6AGl7A2gWEX+QW4fddvJJvd6Cgb0wjxQ8Rld4RxL3P5xn+6bWNhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766420926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1DL7F87O6QwKiXICxmC08slTx4uDKhybPzy+i+tmoD8=; b=IxKmjhhzsV0vBUZHXrMJ106rGs/BgCBCzVTHYnDt+OXXV+4yCJPWYk04OX8ql+05hfVFs+ 5UIn59vUfRvsOn9MrE/Gc3ZkyojHuEaiOr++HWtL6jhaSst8BJzURYxbIUHPzOJavvO213 WAavy+NP19fjBPYszCFrGf7vnleAW7ca6OfFMTYHXRK319hzDpebD4K4kRhHhvUVHQ0AGB wwjezVaXc4u5s/WemGVI84TJl/btiS8L7XX+lBsHKj27bXeSwPNxqfCxtyYQv/wmbvSHa+ mHkPnAhsVuJ0Q64khuq+ip0++Cqd0BoICRl66fDZs1zWoWhDoTtU7ZlJRPZP+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766420926; a=rsa-sha256; cv=none; b=MV1OJrCj1Qc0TZO7z5P/jXFj1TCcuXSAZ6nOng9p+bNsDDrOHstKBqWNQ+0nDtQfIAFVNG sPhsgGfJc9sObxevqireLm8TfGppBrmfVBuQ0QXLTEhp0a70f4VUn1Mix5+2rF6HV6q0Xz mDf8VySxTwg/0M06RhhUKyM3sxpLQX6K85V5pq9XZpMQQLOOztdC6kA0yHidddkxBlLY7u cN63nVD71beh5lXrDx+A4NpilbLIGIGaJx3eK5d/EjasgG0AwNkuOyj3aG8XdnGaI8D44l d3TQ3qg2UUgDiOVueoOMiPld6HaUaDBNAS94G8+wFwEux5UmgJtlrunrap9FXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZk9B4SkwzZT6 for ; Mon, 22 Dec 2025 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 96b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 16:28:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4f35a84b3241 - main - atf_python: support setting interface mtu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f35a84b32412f5cf54e08cd97cd6eee407fb30e Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 16:28:46 +0000 Message-Id: <694971be.96b4.4ea2bfc7@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f35a84b32412f5cf54e08cd97cd6eee407fb30e commit 4f35a84b32412f5cf54e08cd97cd6eee407fb30e Author: Kristof Provost AuthorDate: 2025-12-21 10:28:29 +0000 Commit: Kristof Provost CommitDate: 2025-12-22 16:28:33 +0000 atf_python: support setting interface mtu Teach the vnet support code to set interface MTU. Some tests make use of this, so have the framework handle it. Adapt a few pf tests to use this. Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D54333 --- tests/atf_python/sys/net/vnet.py | 6 ++++++ tests/sys/netpfil/pf/frag6.py | 3 +-- tests/sys/netpfil/pf/icmp.py | 8 +------- tests/sys/netpfil/pf/nat66.py | 7 +------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index f75a3eaa693e..93bfa4437940 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -109,6 +109,9 @@ class VnetInterface(object): ret.append(if2); return ret + def set_mtu(self, mtu): + run_cmd("/sbin/ifconfig {} mtu {}".format(self.name, mtu)) + def setup_addr(self, _addr: str): addr = ipaddress.ip_interface(_addr) if addr.version == 6: @@ -370,6 +373,7 @@ class VnetTestTemplate(BaseTest): idx = iface_map.vnet_aliases.index(vnet.alias) prefixes6 = topo[iface.alias].get("prefixes6", []) prefixes4 = topo[iface.alias].get("prefixes4", []) + mtu = topo[iface.alias].get("mtu", 0) if prefixes6 or prefixes4: ipv6_ifaces.append(iface) iface.turn_up() @@ -378,6 +382,8 @@ class VnetTestTemplate(BaseTest): for prefix in prefixes6 + prefixes4: if prefix[idx]: iface.setup_addr(prefix[idx]) + if mtu != 0: + iface.set_mtu(mtu) for iface in ipv6_ifaces: while iface.has_tentative(): time.sleep(0.1) diff --git a/tests/sys/netpfil/pf/frag6.py b/tests/sys/netpfil/pf/frag6.py index 26ae7af7c90c..ca2d231edccb 100644 --- a/tests/sys/netpfil/pf/frag6.py +++ b/tests/sys/netpfil/pf/frag6.py @@ -226,7 +226,7 @@ class TestFrag6_RouteTo(VnetTestTemplate): "vnet2": {"ifaces": ["if1", "if2"]}, "vnet3": {"ifaces": ["if2"]}, "if1": {"prefixes6": [("2001:db8::1/64", "2001:db8::2/64")]}, - "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")]}, + "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")], "mtu": 1300}, } def vnet2_handler(self, vnet): @@ -238,7 +238,6 @@ class TestFrag6_RouteTo(VnetTestTemplate): "pass in route-to (%s 2001:db8:1::2) from 2001:db8::1 to 2001:db8:666::1" % if2name, ]) - ToolsHelper.print_output("/sbin/ifconfig %s mtu 1300" % if2name) ToolsHelper.print_output("/sbin/sysctl net.inet6.ip6.forwarding=1") def vnet3_handler(self, vnet): diff --git a/tests/sys/netpfil/pf/icmp.py b/tests/sys/netpfil/pf/icmp.py index c5e945d60e99..93daf33e5201 100644 --- a/tests/sys/netpfil/pf/icmp.py +++ b/tests/sys/netpfil/pf/icmp.py @@ -43,13 +43,10 @@ class TestICMP(VnetTestTemplate): "vnet2": {"ifaces": ["if1", "if2"]}, "vnet3": {"ifaces": ["if2"]}, "if1": {"prefixes4": [("192.0.2.2/24", "192.0.2.1/24")]}, - "if2": {"prefixes4": [("198.51.100.1/24", "198.51.100.2/24")]}, + "if2": {"prefixes4": [("198.51.100.1/24", "198.51.100.2/24")], "mtu": 1492}, } def vnet2_handler(self, vnet): - ifname = vnet.iface_alias_map["if1"].name - if2name = vnet.iface_alias_map["if2"].name - ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ "set reassemble yes", @@ -61,8 +58,6 @@ class TestICMP(VnetTestTemplate): ToolsHelper.print_output("/sbin/sysctl net.inet.ip.forwarding=1") ToolsHelper.print_output("/sbin/pfctl -x loud") - ToolsHelper.print_output("/sbin/ifconfig %s mtu 1492" % if2name) - def vnet3_handler(self, vnet): # Import in the correct vnet, so at to not confuse Scapy import scapy.all as sp @@ -70,7 +65,6 @@ class TestICMP(VnetTestTemplate): ifname = vnet.iface_alias_map["if2"].name ToolsHelper.print_output("/sbin/route add default 198.51.100.1") ToolsHelper.print_output("/sbin/ifconfig %s inet alias 198.51.100.3/24" % ifname) - ToolsHelper.print_output("/sbin/ifconfig %s mtu 1492" % ifname) def checkfn(packet): icmp = packet.getlayer(sp.ICMP) diff --git a/tests/sys/netpfil/pf/nat66.py b/tests/sys/netpfil/pf/nat66.py index 16b4ef3dd02b..339895b253ae 100644 --- a/tests/sys/netpfil/pf/nat66.py +++ b/tests/sys/netpfil/pf/nat66.py @@ -39,13 +39,11 @@ class TestNAT66(VnetTestTemplate): "vnet1": {"ifaces": ["if1"]}, "vnet2": {"ifaces": ["if1", "if2"]}, "vnet3": {"ifaces": ["if2"]}, - "if1": {"prefixes6": [("2001:db8::2/64", "2001:db8::1/64")]}, + "if1": {"prefixes6": [("2001:db8::2/64", "2001:db8::1/64")], "mtu": 9000}, "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")]}, } def vnet2_handler(self, vnet): - ifname = vnet.iface_alias_map["if1"].name - ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) outifname = vnet.iface_alias_map["if2"].name ToolsHelper.print_output("/sbin/pfctl -e") @@ -130,8 +128,6 @@ class TestNAT66(VnetTestTemplate): @pytest.mark.require_progs(["scapy"]) def test_npt_icmp(self): cl_vnet = self.vnet_map["vnet1"] - ifname = cl_vnet.iface_alias_map["if1"].name - ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) ToolsHelper.print_output("/sbin/route add -6 2001:db8:1::/64 2001:db8::1") @@ -160,7 +156,6 @@ class TestNAT66(VnetTestTemplate): def test_npt_route_to_icmp(self): cl_vnet = self.vnet_map["vnet1"] ifname = cl_vnet.iface_alias_map["if1"].name - ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::3/64" % ifname) ToolsHelper.print_output("/sbin/route add -6 2001:db8:1::/64 2001:db8::1") From nobody Mon Dec 22 17:18:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZlGc2Ljnz6LVyZ for ; Mon, 22 Dec 2025 17:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZlGc1l9nz3hSc for ; Mon, 22 Dec 2025 17:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766423912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yt1Mcl5r5HvZfxDKUuWlwofkoR3PEXRw+jXeoWk4R7c=; b=HVmhbbEb8Ue9q5QsNkwpE3BDulEdc9tVwHXKpnr3lerRk9+bzbAYy/UlsXYwNuydp3G//5 YevZ1peW4Q5MCxG/nZbYqjbdZwhugVqcuQEv/FA2EcRsBHpvD8QoppSOturLZBGo5uoZqk rgYllbkyAugWFR4SjzYCexDHPZnYiz4odtUMHe1U9XVURgEAHNpi7HafyMVJC7IaJBB8o8 UmBNM/ZBbezKhMDohW03ugqaS6dfAx/F/Yurdxqo7Vw58iLogrSA5f4mZFjsvVSecXR2ln rU1WUjnV6+caAU6pJSojrkBVA0dUeCsfPyW9ZDAUIprwdpHu8ItvABXPCUz4rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766423912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yt1Mcl5r5HvZfxDKUuWlwofkoR3PEXRw+jXeoWk4R7c=; b=E6t/ltgMTA8NOyBhDPe6n31bzzIxJkBQsUHLF8BuaqoLKl89086DkqrYKt3hy5PKuIZckf cQkmqmClwlAHVrm7p6Ws3NV9+6pOrtPxAwJiYwQvUJSRjLkKwGB5dfTFGCf6naEzEUcmdx pQZYjk4bGwVOlhowTc89+xFx4smgPYgEknqkZC3ntZr3dLFxPweR2nbXnDu19atxGq9x3+ JcgKAJ1uAE7kmCH/tt9OIc5M/QC5kVqz6k1KfJN8pIrZJ+4EN/bb3P9yBddJKTldA0nEJs czhkrSvcwdMiWvxXsrh1zRFI+ABhlD1uVtbxu3Vh4R8D5oorPQRTdn58w8YQKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766423912; a=rsa-sha256; cv=none; b=TdDOdak2+dWHCWCVD3WSVuF9adFWGlGsMFm9o+NMVQeVQpt2o4h7Sxpt7kovm4RH13YNF8 K30z/FvfJH82CajpMBHGYyZuM/vbtt8bfWf3pcy/8fBoIHSRqVtRZJqp/PfjrUVW/TE0dg GF2AtZIUxb3ssGeQNnOx/cZ19/pdY25iXX0G9y1VwM+0ktY0bKnPLbjSKqrWlQ3xblp1f7 i2ZEOhG+M1VbRYlvAnhmkEG0GbgW0yXgVXfx7F9jGDxCx8awJSf2mjiTfI39g2CmQNZ1dD CpJHgAvzfjMRCzFY7V1bSbCCzGJAya0DRETV9C6ODEtU7tlAYsNDE1hhCn/rCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZlGc0rwJzc4s for ; Mon, 22 Dec 2025 17:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f60e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 17:18:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: f51e9d0e0988 - main - fusefs: Fix further intermittency in the BadServer.ShortWrite test case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f51e9d0e0988df58c94db586ab5c8b5fd091c004 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 17:18:32 +0000 Message-Id: <69497d68.f60e.67ff85e1@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f51e9d0e0988df58c94db586ab5c8b5fd091c004 commit f51e9d0e0988df58c94db586ab5c8b5fd091c004 Author: Alan Somers AuthorDate: 2025-12-21 15:32:31 +0000 Commit: Alan Somers CommitDate: 2025-12-22 17:18:16 +0000 fusefs: Fix further intermittency in the BadServer.ShortWrite test case After being unmounted, the mockfs server would occasionally read from /dev/fuse again, if the main function didn't exit fast enough, getting an ENODEV error. Handle that appropriately. Reported by: Siva Mahadevan Fixes: d86025c1d49c84c4dc8c3635c83c078ad56e5a53 MFC after: 1 week Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D54331 --- tests/sys/fs/fusefs/mockfs.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index b6a32d9b60af..a377ba832ef5 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -980,7 +980,11 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { + if (res < 0 && errno == ENODEV && m_expect_unmount) { + /* The kernel unmounted us, as expected. */ + m_quit = true; + } + if (res < 0 && errno != EBADF && !m_quit) { m_quit = true; FAIL() << "read: " << strerror(errno); } From nobody Mon Dec 22 21:24:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZrkq4sz7z6Ldpq for ; Mon, 22 Dec 2025 21:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZrkq41Czz485j for ; Mon, 22 Dec 2025 21:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766438691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZpKxgXrde44iK3RrVDSipCXufT5eKoqRU9BovzWV7Mw=; b=J+L3v3je8xzrgclmjaUHgOtApJJNqBtCCZ9i4INH2pdt4gjzuPL8F4JYOZ6q1NL9QTWV7I cbNnx+vh/zwSn9cM8zQijQ9Ts1D+7oIIW+QD2NQusMGsXxkE5MLrNdmgqE8cgqXEuS+CLB 6BtL2UfR1xU1aY1TnUScPxed+5wB26+VfbSMzWpLmqyI6Bz/F92kjOT0d2/PkYOJTO8Gg2 mu+LUFnfEaWU0w5YyaZ2XebUaCICP2TbXphkVqGUn6WP3u0CN3+guNQ4soilzUvY65LuS1 WzaSlKBT7nML/0oAEsjvKENvB5h575dQwMQlJrX1hu/BwPhi0J/t9cD9/fugBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766438691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZpKxgXrde44iK3RrVDSipCXufT5eKoqRU9BovzWV7Mw=; b=rAwmFsq/0YWQ49izUGykq4M16776RmMLlhARmjt/9SFlukQ3TgO1CCgjsSZoRIMlxk3ks+ IEb2Kh1IzFJDje6TlMdKLExZmQoSwYFuHHgwIU4vk3Tv4FzgldWnYkULjdAf2AiMMN+ee9 VPz7/4Wguz07kxjCHCEj4MBNhG5ootAT7uC/t2zbLAE7zZlZaaLkAnDBhsogsXjC4kEkJA REVsIjjmld/iuNK0C5SUOgHbdQxmuIqy6IfdA6L/QJForGnmfhzNqXrWs0h3ribyqzYaZH NkwMVqaWXeqHxkRduQNeO8tdr4947brrjs5e/vjeukclw9fv3DMWkb/PqLVPaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766438691; a=rsa-sha256; cv=none; b=ZGhbipNKQHbYDXej9N6yd/vnZQ9W29RgD6+J3zzk6OJ6q9AOZy3dbTYAqhBIYqJj/Zwj3k U3WHZ32FT6TUb1BJihN3zNEOpKYLA9Ot3SU3vZwQLtWDYtWWwDCxFZ0WqLB/3+XwaJV/tZ xElE9M6HlAV2L09G2zEKM4fJdCkJE7NlrSonXW3HIu2NeDTnZbiXK82kFJsjBppksM7G9F inbRXARrJsV6mn4vwHMNam/AiBkgCKDFMx41jYkJYvdspSh4e9KWAEPJ6NPYbt4IdUVP6Y 5ulSWHfB5uRRel2ARSrKlNx11s5+zG04gg1DQX/EMjjxXS8tZOIo+DvpZ+eAKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZrkq3JrXzjgH for ; Mon, 22 Dec 2025 21:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 812a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 21:24:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b1fb628a1aff05b661ebb063f1795aa24ab54c6 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 21:24:51 +0000 Message-Id: <6949b723.812a.7bd17f29@gitrepo.freebsd.org> The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=1b1fb628a1aff05b661ebb063f1795aa24ab54c6 commit 1b1fb628a1aff05b661ebb063f1795aa24ab54c6 Author: Poul-Henning Kamp AuthorDate: 2025-12-22 21:23:45 +0000 Commit: Poul-Henning Kamp CommitDate: 2025-12-22 21:24:42 +0000 Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. --- sys/dev/usb/quirk/usb_quirk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 802ea2b2ae6a..cd48d6d1d364 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -574,6 +574,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { /* This works much better with if_cdce than if_ure */ USB_QUIRK(LENOVO, TBT3LAN, UQ_CFG_INDEX_1), + USB_QUIRK(REALTEK, RTL8153, UQ_CFG_INDEX_1), }; #undef USB_QUIRK_VO #undef USB_QUIRK_REV From nobody Mon Dec 22 21:52:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZsM24m8Pz6Lhp8 for ; Mon, 22 Dec 2025 21:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZsM22ZyMz3Gmv for ; Mon, 22 Dec 2025 21:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766440366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7dJrpw2SZe8RQtFsh3Rp5CJrexqMpbKop4Dbk8T+LfU=; b=Z2sOAHqlCPJF3/MU3VJmvsoytuitKtIvpvztGwF6wCPws9oym0KuM7u1a+XAfLxdpqkvoj 46BPr49F1jEgV0MhEFt3C1C988QcqxXf3dW60BTH/7sAxsdODCVKh19PfeCoQmbwNRIFKw 5gERmvTtN0F5z8lFHFy3i9GzYn8RuanW9Im7FKeaZpn5OIbsUSkq++QzvJ5YMCjYBdtxqi w+zbsNV3/PyHQ3QmOql6zUwvalMSTKQgNoL+dyoNzAbGk+xPWy/O6RhnIsPLUzozHdF5pg c8J+INXJtCH+3iEbT0bMrep5fFVRRxaPWJjuI/lYPet7QKBt8c2L8d7bScBy4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766440366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7dJrpw2SZe8RQtFsh3Rp5CJrexqMpbKop4Dbk8T+LfU=; b=gr5uSALBRLXcm9MIBaHVTweSXShVKVjCpIsuoIUwW5xJqWR1rVQiHbdqBYGpGEjH8yizDg btjOGsxR4CqXA95dfX8n9+nkUlPlVA41ZKTG2N0k9lCNat9XsxyWzMNe8254ggtt/lKe7K O6Jk0yUWyPIQJtGhWnguMagDh20dbVyrYEq0dQoSpiyrZO83lPRNv8RBeVjzGNkw8Qi+WR KpwX6Ed853CuAhCVAU11q3TpEtPdFlHBFPY2V207ApHG1YAuVpetVcV4MHgpreo0MUJgcC FaV3SvBL1kg7DSIIjZ2IEw2LK2LT7qlUQBNnouBN5SK/+PvZZyAvlbEjT2cjMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766440366; a=rsa-sha256; cv=none; b=DwLH6Gg+zc+sx3Uywit4vHaptRYrIQJjbKGeQsRiPb+nVWkxrDXc57Fct/uXP6HXb4dEXC uC9I0rjoGB8J4DPlMQ2tCVhV2FYMTpvHy7ze7zUALM62NiNrDJK+NzbeS5haNVeTux7Xhf g+w5EPfQzRcG1A0can+gbIYd6YJnOyzq+5kSc9Hud7cCbXE4XdCQCH0qFE9xCe6Bcc2IPH Ji1zeanjclJ7Cta24KWislnbzmmPC/iaFpys4ewDFAJzD3s01mpxeHpkv8bpXGDtBNOlF4 fQ5G+ZUfQ2t9tfIg4PhzCN14XoaN+LTUR2aii8m6n8yA5Yoe9VN9wEKqCl2nHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZsM227SXzkXP for ; Mon, 22 Dec 2025 21:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8cfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 21:52:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 9f49f436a9ec - main - nfs: Add some support for POSIX draft ACLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f49f436a9ec9441dacae8117280a83ddea7b9c6 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 21:52:46 +0000 Message-Id: <6949bdae.8cfe.1168db08@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=9f49f436a9ec9441dacae8117280a83ddea7b9c6 commit 9f49f436a9ec9441dacae8117280a83ddea7b9c6 Author: Rick Macklem AuthorDate: 2025-12-22 21:51:15 +0000 Commit: Rick Macklem CommitDate: 2025-12-22 21:51:15 +0000 nfs: Add some support for POSIX draft ACLs An internet draft (expected to become an RFC someday) https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls describes an extension to NFSv4.2 to handle POSIX draft ACLs. This is the fifth of several patches that implement the above draft. This one mostly adds an extra argument to two functions in nfscommon.ko. Unfortunately, these functions are called in many places, so the changes are numerous, but straightforward. Since the internal KAPI between the NFS modules is changed by this commit, all of nfscommon.ko, nfscl.ko and nfsd.ko must be rebuilt from sources. There should be no semantics change for the series at this point. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfs/nfs_commonacl.c | 2 +- sys/fs/nfs/nfs_commonsubs.c | 51 +++++++++++++++++----------------------- sys/fs/nfs/nfs_var.h | 10 ++++---- sys/fs/nfsclient/nfs_clcomsubs.c | 2 +- sys/fs/nfsclient/nfs_clport.c | 2 +- sys/fs/nfsclient/nfs_clrpcops.c | 32 ++++++++++++++----------- sys/fs/nfsserver/nfs_nfsdport.c | 28 +++++++++++----------- sys/fs/nfsserver/nfs_nfsdserv.c | 4 ++-- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 9 files changed, 65 insertions(+), 68 deletions(-) diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c index 2120b095823b..64272b35a82d 100644 --- a/sys/fs/nfs/nfs_commonacl.c +++ b/sys/fs/nfs/nfs_commonacl.c @@ -40,7 +40,7 @@ static int nfsrv_acemasktoperm(u_int32_t acetype, u_int32_t mask, int owner, */ int nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep, - bool server, int *aceerrp, int *acesizep, NFSPROC_T *p) + bool server, int *aceerrp, int *acesizep) { u_int32_t *tl; int len, gotid = 0, owner = 0, error = 0, aceerr = 0; diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 2b0ce45d05dd..950288027d76 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -1148,12 +1148,11 @@ nfsmout: */ int nfsrv_dissectacl(struct nfsrv_descript *nd, NFSACL_T *aclp, bool server, - int *aclerrp, int *aclsizep, __unused NFSPROC_T *p) + bool posixacl, int *aclerrp, int *aclsizep) { uint32_t *tl; int i, aclsize; int acecnt, error = 0, aceerr = 0, acesize; - bool posixacl = false; *aclerrp = 0; if (aclp != NULL) @@ -1186,7 +1185,7 @@ nfsrv_dissectacl(struct nfsrv_descript *nd, NFSACL_T *aclp, bool server, else error = nfsrv_dissectace(nd, &aclp->acl_entry[i], server, &aceerr, - &acesize, p); + &acesize); } else if (posixacl) error = nfsrv_skipace(nd, ACL_TYPE_ACCESS, &acesize); else @@ -1328,7 +1327,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsv3_pathconf *pc, struct statfs *sbp, struct nfsstatfs *sfp, struct nfsfsinfo *fsp, NFSACL_T *aclp, int compare, int *retcmpp, u_int32_t *leasep, u_int32_t *rderrp, bool *has_namedattrp, - uint32_t *clone_blksizep, NFSPROC_T *p, struct ucred *cred) + uint32_t *clone_blksizep, uint32_t *trueformp, NFSPROC_T *p, + struct ucred *cred) { u_int32_t *tl; int i = 0, j, k, l = 0, m, bitpos, attrsum = 0; @@ -1648,8 +1648,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, NFSACL_T *naclp; naclp = acl_alloc(M_WAITOK); - error = nfsrv_dissectacl(nd, naclp, true, - &aceerr, &cnt, p); + error = nfsrv_dissectacl(nd, naclp, true, false, + &aceerr, &cnt); if (error) { acl_free(naclp); goto nfsmout; @@ -1659,8 +1659,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, *retcmpp = NFSERR_NOTSAME; acl_free(naclp); } else { - error = nfsrv_dissectacl(nd, NULL, true, - &aceerr, &cnt, p); + error = nfsrv_dissectacl(nd, NULL, true, false, + &aceerr, &cnt); if (error) goto nfsmout; *retcmpp = NFSERR_ATTRNOTSUPP; @@ -1669,14 +1669,13 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, } else { if (vp != NULL && aclp != NULL) error = nfsrv_dissectacl(nd, aclp, false, - &aceerr, &cnt, p); + false, &aceerr, &cnt); else error = nfsrv_dissectacl(nd, NULL, false, - &aceerr, &cnt, p); + false, &aceerr, &cnt); if (error) goto nfsmout; } - attrsum += cnt; break; case NFSATTRBIT_ACLSUPPORT: @@ -2470,13 +2469,9 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, *tl)) *retcmpp = NFSERR_NOTSAME; } -#ifdef notyet } else if (trueformp != NULL) { *trueformp = fxdr_unsigned(uint32_t, *tl); } -#else - } -#endif attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_ACLTRUEFORMSCOPE: @@ -2497,8 +2492,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, NFSACL_T *naclp; naclp = acl_alloc(M_WAITOK); - error = nfsrv_dissectacl(nd, naclp, true, - &aceerr, &cnt, p); + error = nfsrv_dissectacl(nd, naclp, true, true, + &aceerr, &cnt); if (error) { acl_free(naclp); goto nfsmout; @@ -2508,8 +2503,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, *retcmpp = NFSERR_NOTSAME; acl_free(naclp); } else { - error = nfsrv_dissectacl(nd, NULL, true, - &aceerr, &cnt, p); + error = nfsrv_dissectacl(nd, NULL, true, true, + &aceerr, &cnt); if (error) goto nfsmout; *retcmpp = NFSERR_ATTRNOTSUPP; @@ -2518,14 +2513,13 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, } else { if (vp != NULL && aclp != NULL) error = nfsrv_dissectacl(nd, aclp, false, - &aceerr, &cnt, p); + true, &aceerr, &cnt); else error = nfsrv_dissectacl(nd, NULL, false, - &aceerr, &cnt, p); + true, &aceerr, &cnt); if (error) goto nfsmout; } - attrsum += cnt; break; case NFSATTRBIT_POSIXDEFAULTACL: @@ -2535,8 +2529,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, NFSACL_T *naclp; naclp = acl_alloc(M_WAITOK); - error = nfsrv_dissectacl(nd, naclp, true, - &aceerr, &cnt, p); + error = nfsrv_dissectacl(nd, naclp, true, true, + &aceerr, &cnt); if (error) { acl_free(naclp); goto nfsmout; @@ -2546,8 +2540,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, *retcmpp = NFSERR_NOTSAME; acl_free(naclp); } else { - error = nfsrv_dissectacl(nd, NULL, true, - &aceerr, &cnt, p); + error = nfsrv_dissectacl(nd, NULL, true, true, + &aceerr, &cnt); if (error) goto nfsmout; *retcmpp = NFSERR_ATTRNOTSUPP; @@ -2556,14 +2550,13 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, } else { if (vp != NULL && aclp != NULL) error = nfsrv_dissectacl(nd, aclp, false, - &aceerr, &cnt, p); + true, &aceerr, &cnt); else error = nfsrv_dissectacl(nd, NULL, false, - &aceerr, &cnt, p); + true, &aceerr, &cnt); if (error) goto nfsmout; } - attrsum += cnt; break; default: diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index fe2462d94fd5..0211acf7f00b 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -334,8 +334,8 @@ int nfsm_advance(struct nfsrv_descript *, int, int); void *nfsm_dissct(struct nfsrv_descript *, int, int); void newnfs_copycred(struct nfscred *, struct ucred *); void newnfs_copyincred(struct ucred *, struct nfscred *); -int nfsrv_dissectacl(struct nfsrv_descript *, NFSACL_T *, bool, int *, - int *, NFSPROC_T *); +int nfsrv_dissectacl(struct nfsrv_descript *, NFSACL_T *, bool, bool, int *, + int *); int nfsrv_getattrbits(struct nfsrv_descript *, nfsattrbit_t *, int *, int *); int nfsrv_getopbits(struct nfsrv_descript *, nfsopbit_t *, int *); @@ -343,8 +343,8 @@ int nfsv4_loadattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, struct nfsfh **, fhandle_t *, int, struct nfsv3_pathconf *, struct statfs *, struct nfsstatfs *, struct nfsfsinfo *, NFSACL_T *, - int, int *, u_int32_t *, u_int32_t *, bool *, uint32_t *, NFSPROC_T *, - struct ucred *); + int, int *, u_int32_t *, u_int32_t *, bool *, uint32_t *, uint32_t *, + NFSPROC_T *, struct ucred *); int nfsv4_lock(struct nfsv4lock *, int, int *, struct mtx *, struct mount *); void nfsv4_unlock(struct nfsv4lock *, int); void nfsv4_relref(struct nfsv4lock *); @@ -441,7 +441,7 @@ int nfs_supportsposixacls(struct vnode *); /* nfs_commonacl.c */ int nfsrv_dissectace(struct nfsrv_descript *, struct acl_entry *, - bool, int *, int *, NFSPROC_T *); + bool, int *, int *); uint32_t nfs_aceperm(acl_perm_t); int nfsrv_dissectposixace(struct nfsrv_descript *, struct acl_entry *, bool, int *, int *); diff --git a/sys/fs/nfsclient/nfs_clcomsubs.c b/sys/fs/nfsclient/nfs_clcomsubs.c index 05963074e53d..2b48e257381e 100644 --- a/sys/fs/nfsclient/nfs_clcomsubs.c +++ b/sys/fs/nfsclient/nfs_clcomsubs.c @@ -272,7 +272,7 @@ nfsm_loadattr(struct nfsrv_descript *nd, struct nfsvattr *nap) if (nd->nd_flag & ND_NFSV4) { error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, - NULL, NULL); + NULL, NULL, NULL); } else if (nd->nd_flag & ND_NFSV3) { NFSM_DISSECT(fp, struct nfs_fattr *, NFSX_V3FATTR); nap->na_type = nfsv34tov_type(fp->fa_type); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 77e71d4153c9..c5f7ce0a12c7 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -828,7 +828,7 @@ nfscl_wcc_data(struct nfsrv_descript *nd, struct vnode *vp, == (ND_NFSV4 | ND_V4WCCATTR)) { error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (error) return (error); /* diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 47f880d2a96a..0cdcde6cca28 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -678,7 +678,7 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, if (ret) ndp->nfsdl_flags |= NFSCLDL_RECALL; error = nfsrv_dissectace(nd, &ndp->nfsdl_ace, false, - &ret, &acesize, p); + &ret, &acesize); if (error) goto nfsmout; } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && @@ -699,7 +699,7 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, ("nfsrpc_openrpc: Getattr repstat")); error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, p, cred); + NULL, NULL, NULL, NULL, NULL, NULL, p, cred); if (error) goto nfsmout; } @@ -1358,7 +1358,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred, if ((nd->nd_flag & ND_NFSV4) != 0) error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, leasep, NULL, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); else error = nfsm_loadattr(nd, nap); } else @@ -2754,7 +2754,7 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, if (ret) dp->nfsdl_flags |= NFSCLDL_RECALL; error = nfsrv_dissectace(nd, &dp->nfsdl_ace, false, - &ret, &acesize, p); + &ret, &acesize); if (error) goto nfsmout; } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && @@ -3601,7 +3601,8 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, nfsva.na_mntonfileno = UINT64_MAX; error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, p, cred); + NULL, NULL, NULL, NULL, NULL, NULL, + p, cred); if (error) { dotdotfileid = dotfileid; } else if (gotmnton) { @@ -3851,7 +3852,8 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, nfsva.na_mntonfileno = UINT64_MAX; error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, &rderr, NULL, NULL, p, cred); + NULL, NULL, &rderr, NULL, NULL, NULL, + p, cred); if (error) goto nfsmout; NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); @@ -4076,7 +4078,8 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, nfsva.na_mntonfileno = UINT64_MAX; error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, p, cred); + NULL, NULL, NULL, NULL, NULL, NULL, + p, cred); if (error) { dotdotfileid = dotfileid; } else if (gotmnton) { @@ -4353,7 +4356,8 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, nfsva.na_mntonfileno = 0xffffffff; error = nfsv4_loadattr(nd, NULL, &nfsva, &nfhp, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, &rderr, NULL, NULL, p, cred); + NULL, NULL, &rderr, NULL, NULL, NULL, + p, cred); if (error) goto nfsmout; } @@ -5018,7 +5022,7 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, if (nd->nd_repstat == 0) { error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, sbp, fsp, NULL, 0, NULL, leasep, NULL, - NULL, cloneblksizep, p, cred); + NULL, cloneblksizep, NULL, p, cred); if (!error) { nmp->nm_fsid[0] = nap->na_filesid[0]; nmp->nm_fsid[1] = nap->na_filesid[1]; @@ -5113,7 +5117,7 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc, bool *has_namedattrp, if (nd->nd_repstat == 0) { error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, pc, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, - has_namedattrp, clone_blksizep, p, cred); + has_namedattrp, clone_blksizep, trueformp, p, cred); if (!error) *attrflagp = 1; } else { @@ -5430,7 +5434,7 @@ nfsrpc_getacl(struct vnode *vp, acl_type_t acltype, struct ucred *cred, if (!nd->nd_repstat) error = nfsv4_loadattr(nd, vp, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, aclp, 0, NULL, NULL, NULL, NULL, NULL, - p, cred); + NULL, p, cred); else error = nd->nd_repstat; m_freem(nd->nd_mrep); @@ -8532,7 +8536,7 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, if (ret != 0) ndp->nfsdl_flags |= NFSCLDL_RECALL; error = nfsrv_dissectace(nd, &ndp->nfsdl_ace, false, - &ret, &acesize, p); + &ret, &acesize); if (error != 0) goto nfsmout; } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && @@ -8556,7 +8560,7 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, if (*++tl == 0) { error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, p, cred); + NULL, NULL, NULL, NULL, NULL, NULL, p, cred); if (error != 0) goto nfsmout; if (ndp != NULL) { @@ -8759,7 +8763,7 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, if (ret != 0) dp->nfsdl_flags |= NFSCLDL_RECALL; error = nfsrv_dissectace(nd, &dp->nfsdl_ace, false, - &ret, &acesize, p); + &ret, &acesize); if (error != 0) goto nfsmout; } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index ec2c15485601..7d64f211b058 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3228,8 +3228,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, attrsum += NFSX_HYPER; break; case NFSATTRBIT_ACL: - error = nfsrv_dissectacl(nd, aclp, true, &aceerr, - &aclsize, p); + error = nfsrv_dissectacl(nd, aclp, true, false, &aceerr, + &aclsize); if (error) goto nfsmout; if (aceerr && !nd->nd_repstat) @@ -3421,8 +3421,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, attrsum += 2 * NFSX_UNSIGNED; break; case NFSATTRBIT_POSIXACCESSACL: - error = nfsrv_dissectacl(nd, aclp, true, &aceerr, - &aclsize, p); + error = nfsrv_dissectacl(nd, aclp, true, true, &aceerr, + &aclsize); if (error != 0) goto nfsmout; if (!nd->nd_repstat) { @@ -3436,8 +3436,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, attrsum += aclsize; break; case NFSATTRBIT_POSIXDEFAULTACL: - error = nfsrv_dissectacl(nd, daclp, true, &aceerr, - &aclsize, p); + error = nfsrv_dissectacl(nd, daclp, true, true, &aceerr, + &aclsize); if (error != 0) goto nfsmout; if (!nd->nd_repstat) { @@ -5746,7 +5746,7 @@ nfsrv_writedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, int len, (ND_NFSV4 | ND_V4WCCATTR)) { error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL); + NULL, NULL); NFSD_DEBUG(4, "nfsrv_writedsdorpc: wcc attr=%d\n", error); if (error != 0) goto nfsmout; @@ -5778,7 +5778,7 @@ nfsrv_writedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, int len, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL); + NULL, NULL); } NFSD_DEBUG(4, "nfsrv_writedsdorpc: aft loadattr=%d\n", error); nfsmout: @@ -5945,7 +5945,7 @@ nfsrv_allocatedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL); + NULL, NULL); } else error = nd->nd_repstat; NFSD_DEBUG(4, "nfsrv_allocatedsdorpc: aft loadattr=%d\n", error); @@ -6113,7 +6113,7 @@ nfsrv_deallocatedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, (ND_NFSV4 | ND_V4WCCATTR)) { error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL); + NULL, NULL); NFSD_DEBUG(4, "nfsrv_deallocatedsdorpc: wcc attr=%d\n", error); if (error != 0) goto nfsmout; @@ -6128,7 +6128,7 @@ nfsrv_deallocatedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL); + NULL, NULL); } else error = nd->nd_repstat; NFSD_DEBUG(4, "nfsrv_deallocatedsdorpc: aft loadattr=%d\n", error); @@ -6277,7 +6277,7 @@ nfsrv_setattrdsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, (ND_NFSV4 | ND_V4WCCATTR)) { error = nfsv4_loadattr(nd, NULL, dsnap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, - NULL, NULL); + NULL, NULL, NULL); NFSD_DEBUG(4, "nfsrv_setattrdsdorpc: wcc attr=%d\n", error); if (error != 0) goto nfsmout; @@ -6302,7 +6302,7 @@ nfsrv_setattrdsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); error = nfsv4_loadattr(nd, NULL, dsnap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, - NULL, NULL); + NULL, NULL, NULL); } NFSD_DEBUG(4, "nfsrv_setattrdsdorpc: aft setattr loadattr=%d\n", error); nfsmout: @@ -6591,7 +6591,7 @@ nfsrv_getattrdsrpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, if (nd->nd_repstat == 0) { error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); /* * We can only save the updated values in the extended * attribute if the vp is exclusively locked. diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index a296082f31d3..3eb3471d9ac9 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4410,8 +4410,8 @@ nfsrvd_verify(struct nfsrv_descript *nd, int isdgram, if (!nd->nd_repstat) { nfsvno_getfs(&fs, isdgram); error = nfsv4_loadattr(nd, vp, &nva, NULL, &fh, fhsize, NULL, - sf, NULL, &fs, NULL, 1, &ret, NULL, NULL, NULL, NULL, p, - nd->nd_cred); + sf, NULL, &fs, NULL, 1, &ret, NULL, NULL, NULL, NULL, NULL, + p, nd->nd_cred); if (!error) { if (nd->nd_procnum == NFSV4OP_NVERIFY) { if (ret == 0) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 3fae2be5af46..cb8bbc45b379 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4689,7 +4689,7 @@ errout: } else if (error == 0 && procnum == NFSV4OP_CBGETATTR) error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, - NULL, NULL, p, NULL); + NULL, NULL, NULL, p, NULL); m_freem(nd->nd_mrep); } NFSLOCKSTATE(); From nobody Mon Dec 22 23:23:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZvMt3rmQz6LqsQ for ; Mon, 22 Dec 2025 23:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZvMt2Yf9z3S1V for ; Mon, 22 Dec 2025 23:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766445818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSkD3rlf5qIJ61BhFMKqjC2MPGvpTDf/fyDzWNx2wvE=; b=F/HpiRrQ5fPujjeZl+qt21pl8N7mCSQs8VlhkH4/nklCPN81wK8MWfAAo8/YtQgqDn+8SW bgaHo83lE/vs2m3YVrSvLXix8WxpRjvnVxuv+zcmyqZCFLcwjjYR7MTEUgsyrzuNCBz86w s9uNdSWxyu3Gs5O7KIZkw6SZtXNHhWYa5rShZJxXlaKOcOfn86xaLItorJ99DvCWXSt/oK +CRDsI1RmIuVVS5HN0yG67HqN3+GW533r9wU4xTUj6nkP162Umoeh5mrleInUiUDF3bHBh KAdukxIt/Qht+9AAHCXY7sX6xO7yA2ddZzADKsRRm7ZQMLN/yVF9wAlsh//L6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766445818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSkD3rlf5qIJ61BhFMKqjC2MPGvpTDf/fyDzWNx2wvE=; b=xGejo8wTUr7scoBs3PVNk/1VyhHRhu24Km8Sg4ZQeJqeSamtQQk/SIO1FfcvUkirl6BYoq LH3vB/yoYrOOiVXC7KmZlxE6XNpDKTjWUgmgxxM01m0h84ix63HgdNKKMPRvBGtJTFGpvr 20FP+0OCnJcObdtjfxxhCvZBFSEAJFTKSs+ZkFWzVMcLkzmfRW4oHyaGfUjTyoEehcOprD hR/HqkLubCd8TkXq6aDwF+bS0WSfvvoX3eypsipSKS4WiQemqcMky05f9ZgAofQBIHNve5 HWR+OWYf0v1xB0cdZq7zg0KpLCoEBCfO5NnJpxW7I3ohcCe8KYLkYfxQ8CvOWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766445818; a=rsa-sha256; cv=none; b=WxPT+Xb2Kr+TtfYPLkl2nE8QYOk7NSTmW0BavR9azD8FFxKAuaUI3nWKkUq/vQQv6t0eBY 4hm3GFN22wgmYRWlDBQlYa08MQDRkRh3u/C0R0jOgnaSuhpMCMwimhA5YYcxsu/13OBG5H 31JPsNwxPcE1b+IOzFaU3KJhwn1UB70qzi43CDZcuQHoe032z+Vu0IVH0cNM+0YOJsEEQJ VH/QK6Bkf9klssnvSa88qSrXZ7V/FLb0hmL+YjpH2o9f1E2RQVveVqAGg0UM8N1Hl6sdSh qtQOds6T1sEOcQCbsEvN96HQ9W9G4jYBCJe49bY3tMAoeUWIz0mNpOZio0wxZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZvMt25kJzmrp for ; Mon, 22 Dec 2025 23:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 223f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 23:23:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: e35191ccf3b3 - main - nfs: Add some support for POSIX draft ACLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e35191ccf3b3bdf02905f7e11dc0dd4796593c07 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 23:23:38 +0000 Message-Id: <6949d2fa.223f0.a61809e@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e35191ccf3b3bdf02905f7e11dc0dd4796593c07 commit e35191ccf3b3bdf02905f7e11dc0dd4796593c07 Author: Rick Macklem AuthorDate: 2025-12-22 23:22:09 +0000 Commit: Rick Macklem CommitDate: 2025-12-22 23:22:09 +0000 nfs: Add some support for POSIX draft ACLs An internet draft (expected to become an RFC someday) https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls describes an extension to NFSv4.2 to handle POSIX draft ACLs. This is the final patch in the series that enables the extension of NFSv4.2 to support POSIX draft ACLs. At this time, only UFS mounted with the "acls" option will work, and only for FreeBSD built with these patches. Patches for client and server for the Linux kernel are in the works. (I'll admit my next little project is cleaning the Linux patches up for submission for upstream.) To make these changes really useful, the FreeBSD port of OpenZFS needs to be patched to add POSIX draft ACL support. (Support for POSIX draft ACLs is already in the Linux port of OpenZFS.) Interopeability with NFSv4.2 clients and servers that do not support this extension should not be a problem. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfs/nfsproto.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 41150ef88188..6e67c5be3416 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1208,7 +1208,11 @@ struct nfsv3_sattr { NFSATTRBM_SUPPATTREXCLCREAT | \ NFSATTRBM_CLONEBLKSIZE | \ NFSATTRBM_CHANGEATTRTYPE | \ - NFSATTRBM_XATTRSUPPORT) + NFSATTRBM_XATTRSUPPORT | \ + NFSATTRBM_ACLTRUEFORM | \ + NFSATTRBM_ACLTRUEFORMSCOPE | \ + NFSATTRBM_POSIXDEFAULTACL | \ + NFSATTRBM_POSIXACCESSACL) /* * These are the set only attributes. @@ -1238,7 +1242,9 @@ struct nfsv3_sattr { NFSATTRBM_TIMEMODIFYSET) #define NFSATTRBIT_SETABLE2 \ (NFSATTRBM_MODESETMASKED | \ - NFSATTRBM_MODEUMASK) + NFSATTRBM_MODEUMASK | \ + NFSATTRBM_POSIXDEFAULTACL | \ + NFSATTRBM_POSIXACCESSACL) /* * NFSATTRBIT_NFSV41 - Attributes only supported by NFSv4.1. @@ -1259,7 +1265,11 @@ struct nfsv3_sattr { (NFSATTRBM_CLONEBLKSIZE | \ NFSATTRBM_CHANGEATTRTYPE | \ NFSATTRBM_XATTRSUPPORT | \ - NFSATTRBM_MODEUMASK) + NFSATTRBM_MODEUMASK | \ + NFSATTRBM_ACLTRUEFORM | \ + NFSATTRBM_ACLTRUEFORMSCOPE | \ + NFSATTRBM_POSIXDEFAULTACL | \ + NFSATTRBM_POSIXACCESSACL) /* * Set of attributes that the getattr vnode op needs. From nobody Mon Dec 22 23:30:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZvWk5Nkzz6LrCl for ; Mon, 22 Dec 2025 23:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZvWk4HmFz3TVh for ; Mon, 22 Dec 2025 23:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766446226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YAeJq4+XRXOu3v44d5QQdRxZ59SOQ+4wNyH3PnlICYQ=; b=WHwiVTDKl2jzMZ43n6h0rpOYKJIKAM7SE0cR/oOCUznzNEBPhF7txEYuTmudtGG+5JVjfg 7MY7iYAvExKa/ZRBbHXxD9xUgX0LqNIQDF2tPsNs7vB0BIlHR1Rjk2HZq+9HMfXv1SF0hY 75boK9g0E//z2wkDso5d6O71giKxXdYkMrTkPJ0vechNwnQS2pdWkC3QxE8WYvUnpQ/A61 8AetrDCEsTmJHo2Q/1gLSabprSWEweOAxvt7tCiCbHjcl0ziMw/YmpjebXpUC1ri3dbu6d C9umMl7LLZclSBIBTNyezBqklHsuSaYm2UQxHkOSj5QR5WH5TNV2S/dRJgznKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766446226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YAeJq4+XRXOu3v44d5QQdRxZ59SOQ+4wNyH3PnlICYQ=; b=nKAe9o63ZeRM8Jl4Am9G+NOZIfAImLFC8Vablj5ct3HJ0G8R9v1HH+TdXyU4eygf2ZWcEd ro4pdCb5wSLr1UwqtRhAAM//K6M3F6NbQm6AUuNnGjrhnJD7Su79DTuUYipIxF7P8bkj59 KtFpAypskOou9IGepbld68QPetj8tGhgqoR3IUILfVvHxUJ40d3ZgYI0GYsflWOp5pUCJr TUKM1DSONH7bja+nitGLbN5Ar8Sz3ZU/UUQ1mP8HO0hhg4W4eCPZr8g3Ww3XDuh2mi08Yd iyE039PkihTfH8dVhLjpX9cvar4QOhN+0lRTPeGt6r2Z9AU6Llcd3jg5GZsN0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766446226; a=rsa-sha256; cv=none; b=aC7QTHtit4MiYbukAZOmdSrci5MGgrG2giUGqSZLvoHK0tjmS88qiX7Czugv5zlklNr/Gv 5BSP/C7yZ6+QcnJAGTBYNFRtq9CQsVxSQpcaNXFyCFAIeG1nHN5KwtvPgX/TVhEMwxt1+s JhGm5AKJVKW+n47YQNdPkJBbLaMyjM5NcoZFf+M4sbyz6tXnl0ONjltjQk+9KLRSXtXXpK G8PYdHdGF1FG1ovcg52SJLwDx+sT08hFFZH7NVbd5oZh5puOeIq6LODuZBis6QoVPp1hfB 0Peqr0NQPBtVWO0ADBIFemEF3KthTx7Ej8SqTP0pKk5GoIz5jh8J3D7VnY7gxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZvWk3Wzmzmrt for ; Mon, 22 Dec 2025 23:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23b59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 23:30:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 60eb371c2b9a - main - UPDATING: Add an entry for commit 9f49f436a9ec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60eb371c2b9aab8cfe3196dc960cc5db1f0ec584 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 23:30:26 +0000 Message-Id: <6949d492.23b59.41342991@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=60eb371c2b9aab8cfe3196dc960cc5db1f0ec584 commit 60eb371c2b9aab8cfe3196dc960cc5db1f0ec584 Author: Rick Macklem AuthorDate: 2025-12-22 23:28:59 +0000 Commit: Rick Macklem CommitDate: 2025-12-22 23:28:59 +0000 UPDATING: Add an entry for commit 9f49f436a9ec --- UPDATING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPDATING b/UPDATING index f6cf0109f894..40fb9fbac87d 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20251222: + Commit 9f49f436a9ec changed the internal KAPI between the NFS + modules. As such, nfscommon, nfscl and nfsd must all be rebuilt + from sources. + 20251212: Timeouts for SCSI bus probing have been drastically reduced. They are now tuneables that can be set in the boot loader should you have a From nobody Tue Dec 23 02:30:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZzWt4f8fz6M7Qx for ; Tue, 23 Dec 2025 02:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZzWt1rNVz3qq8 for ; Tue, 23 Dec 2025 02:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766457050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DuWUbeja3tDdSJC4DkQfBEn1TO0+FmgnalCdv1ZCOiU=; b=q8TxjpxvfF0V5ccXHKOStkv+mj7ITQ8/yErNckMqoZi/YJd7SdcFn/TuHQJ2cKZ+ZZjiOw zhyaGPuSmRsBVhonZecEC5HQzuLex9lzJghZJ+VL/gcGUAt481huCEUjQFLyHcbT7CkRET hgfaKZ2UDfQQNt5J9mwWVLY9VgZQ5uESoLe9ovnoxKKPJThijuyulaymp6qDIxHoH64Qv2 irsHN500MQvHBEnjuQWWo9ftOR5FVt6+Jz7HBtOQpjv0kqk4SZa3R4aTnuCxad4t9nvMcq +ElzeQxdx8CD6/kV20xAMt11/ZmKnJipq7iEapy1cUqbUXK3LusdPY+MBeEDNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766457050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DuWUbeja3tDdSJC4DkQfBEn1TO0+FmgnalCdv1ZCOiU=; b=onlbOkdraAty4GvMBnbutklnU35VjbqxQbDdErdzrjXVj9KYG49YWrhcWoiG7YbTdACdu+ Ntqrsnd2CCVzY6kDc0Xz0yFzAeGJ0fv7eMZPj2kQp/tyqM1SgBPKyWZ3U45zH0L1dRIamO JsoWzZtz71/qET+67tmZa5a4NfuNKd2ZhBHjV+YZ4UDzVkd+25GpTXDwR4xcRXEoWe2YUn LTxYU8SO/jObasj/QxWBUoQf1mUVu9XHrFOVXpx2U5fSyXEUfSyMBoW8dI+RV9AK90lChk n+LgCv2f3vgM+zeLr3H0QVsqVDJk2BW9o0cSuTZqW4Ll+TFJUgapC4y0Tuf7IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766457050; a=rsa-sha256; cv=none; b=WsH0sTdLmIB0WYiTj1shvtC8BUQkuYVMf3T1nikxH2visIYs1/m7iBIcOS582V37b6iVcc eQygMBkBW8JHP5vcF/Qv0gwpVRkiGLw33kmvNQG84Q/E5lq1miYtiYVCKJNWeiZ7+TSKTN zQXCtAsIDczRcCFVhxemWNa0EkLasG48ZdLCOpt03KmZQifhDyVMPJNLokkoohDTsNt5dj s+zvEYQpJvAEGKcGZuew9+GbMV1APu7S4on02mNAJDILltfo0P5OdkPqcZ7ATGGWlMPT0a mchbq4pztXhACmRUNgzxLdhqPy+VZf5k+lN3WkFUFbkz/xTT7Lb1EyjzFdR1tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZzWt0nFpzsbB for ; Tue, 23 Dec 2025 02:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e4b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 02:30:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 4fe8aa4a67ca - stable/15 - blocklist: Add vendor import instructions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4fe8aa4a67ca3169b14f9cdf204412940af96488 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 02:30:49 +0000 Message-Id: <6949fed9.3e4b4.75278e91@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4fe8aa4a67ca3169b14f9cdf204412940af96488 commit 4fe8aa4a67ca3169b14f9cdf204412940af96488 Author: Jose Luis Duran AuthorDate: 2025-12-16 00:55:24 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-23 02:29:39 +0000 blocklist: Add vendor import instructions Add vendor import instructions for blocklist. It includes a "freebsd-changes.sh" script that takes care of adapting paths and functions into FreeBSD. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49510 (cherry picked from commit 715cc257137099e022c7eecea4cd6995bb7604a3) --- contrib/blocklist/FreeBSD-upgrade | 97 ++++++++++++++++++++++++++++++++++++ contrib/blocklist/freebsd-changes.sh | 18 +++++++ 2 files changed, 115 insertions(+) diff --git a/contrib/blocklist/FreeBSD-upgrade b/contrib/blocklist/FreeBSD-upgrade new file mode 100644 index 000000000000..3e91d36cabb6 --- /dev/null +++ b/contrib/blocklist/FreeBSD-upgrade @@ -0,0 +1,97 @@ +FreeBSD maintainer's guide to blocklist +======================================= + +These instructions describe the blocklist vendor import procedure, +following the Committer's Guide +(https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git). + +> [!NOTE] +> This guide follows the convention that a `freebsd` remote is pointing +> to gitrepo.FreeBSD.org/src.git. + +1. Grab our top level directory: + + freebsd=$(git rev-parse --show-toplevel) + +2. Create a Git worktree under a temporary directory: + + worktree=$(mktemp -d -t blocklist) + git worktree add ${worktree} vendor/blocklist + +3. Clone the blocklist repo (https://github.com/zoulasc/blocklist.git): + + blocklist_repo=$(mktemp -d -t blocklist-repo) + git clone https://github.com/zoulasc/blocklist.git ${blocklist_repo} + cd ${blocklist_repo} + commit=$(git rev-parse HEAD) + commit_short=$(git rev-parse --short HEAD) + date=$(git show -s --format=%cd --date=format:%Y-%m-%d) + tag=$(git show -s --format=%cd --date=format:%Y%m%d) + +4. Copy to the vendor branch using rsync (net/rsync): + + rsync -va --del --exclude=".git" ${blocklist_repo}/ ${worktree} + +5. Take care of added/deleted files: + + cd ${worktree} + git add -A ${worktree} + git status + git diff --staged + +6. Commit: + + message=$(cat <<-EOM + blocklist ${date} (${commit_short}) + + Upstream hash ${commit}. + + Obtained from: https://github.com/zoulasc/blocklist + EOM + ) + git commit -e -m "Vendor import of ${message}" + +7. Tag: + + git tag -a -e -m "Tag ${message}" vendor/blocklist/${tag} + + At this point, the vendor branch can be pushed to the FreeBSD + repo via: + + git push --follow-tags freebsd vendor/blocklist + +8. Merge from the vendor branch: + + cd ${freebsd} + git subtree merge -P contrib/blocklist vendor/blocklist + + Some files may have been deleted from FreeBSD's copy of + blocklist. When git prompts for these deleted files during the + merge, choose 'd' (leaving them deleted). + +9. Resolve conflicts. + +10. Diff against the vendor branch: + + git diff --diff-filter=M vendor/blocklist/${tag} HEAD:contrib/blocklist + + Review the diff for any unexpected changes. + +11. Run the FreeBSD changes script: + + cd contrib/blocklist + sh ./freebsd-changes.sh + +12. If source files have been added or removed, update the + appropriate makefiles to reflect changes in the vendor's + Makefile.in. + +13. Build and install world, reboot, test. Pay particular attention + to the fingerd(8) and sshd(8) integration. + +14. Commit. + +15. Cleanup: + + rm -fr ${blocklist_repo} ${worktree} + git worktree prune diff --git a/contrib/blocklist/freebsd-changes.sh b/contrib/blocklist/freebsd-changes.sh new file mode 100644 index 000000000000..8ddea13b638f --- /dev/null +++ b/contrib/blocklist/freebsd-changes.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +# +# FreeBSD-specific changes from upstream +# + +# Remove Debian port +rm -fr port/debian + +# /libexec -> /usr/libexec +sed -i "" -e 's| /libexec| /usr/libexec|g' bin/blocklistd.8 +sed -i "" -e 's|"/libexec|"/usr/libexec|g' bin/internal.h + +# NetBSD: RT_ROUNDUP -> FreeBSD: SA_SIZE (from net/route.h) +sed -i "" -e 's/RT_ROUNDUP/SA_SIZE/g' bin/conf.c + +# npfctl(8) -> ipf(8), ipfw(8), pfctl(8) +sed -i "" -e 's/npfctl 8 ,/ipf 8 ,\n.Xr ipfw 8 ,\n.Xr pfctl 8 ,/g' bin/blocklistd.8 From nobody Tue Dec 23 02:30:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZzWv3qGfz6M7T5 for ; Tue, 23 Dec 2025 02:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZzWv1C0Nz3r3k for ; Tue, 23 Dec 2025 02:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766457051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZunleqZeeOwXZQq6Lhu8peTqC00I2Tx4ZUy7jbgFc2w=; b=cf6XNuiGuIsA7Zw7iBlsN4hOv1pPOzlqzXP8ahEOb1vKjOE4FH8nzU8MB8KPPFQ7WtXZFk eZC7XOzqiOh3qkrG0FvlyCiM4Zx3xPj0NVnm/eWKK8Y1P89uswhZGjhmjtZ3QtWC2v+v3w yC1X22U6A1LlEo+y214mlhfZmIZMKX2z4N+5Kfzxqf1KPx7bc8+Tcojp6yMfR2wzNl3nUL CCqCuuigE1AZbc2DP3M/k6ARh/aQch61uHFekg9Acq/pw/nAqSr6n+YW7tSYYSnmb3IRlb a7jqa1gIDOLRUWQhpxGFeYXGop0zIyVTEW4Gp1LeQtDSyItDbss33FrvXjFTjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766457051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZunleqZeeOwXZQq6Lhu8peTqC00I2Tx4ZUy7jbgFc2w=; b=tJ6bTbLY9Vxqz417afbtuEN+ngjMkbCOTXp9xo5yR1+x7/91/l/+n27NhW34t/lvm2DbzP hyBy15QU6bSpNSOfLZj4kXTY6S+Rhi60d9G2x+5pISzfp9+Jy1PVULffSuOiuypEXUZvZm gyId/AjikkPFQggKWItkPYJNiFw1L5d+8vve50y2ss1q8XJpHygw5z/k8hZlVPZsuiAnvD Gjpz+go5WGCB+XtAY9WR5Eo5JgaXIPrB7fjR+lj+4dePrw+tpsosMZBicc+lgdOy0r2ZZp jT3T/ea7iSRqhcQVQc/QAN5vKeCt9rJ9Pgx/+wAke9T6KF3Q/KGZURngVvNClQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766457051; a=rsa-sha256; cv=none; b=taLip9E0QlD5jJa/zuOV+4fUXq7VPiBWmfdPqYeD/ErF+a3Mj89XCEKAZfauziA1VE5Y8E zaMcF9MVsrL8HPCN/apiEoD+D1rmySMJo7ANDnA1lF7lFciYCXnqj4VerQFCSA01JNOTg/ gYnijrWjDw6vGjSfG7nXKmPwzMpU16Fvvfz0/KKmTZ5Ec+lD8BKR1NUBDv5sdowZDkYzuj QT+dYdlGy1+aTb4W/5FeWO9IQN7lVmCx+vfCs0qAC3GT8w6mjYm0ps8xeTpG3E/dtzfFv2 a6lAwDWuLoPeA5KItslDMRwf0inST5RpkGQnvO62codfXcTtr8slfY/J/RlWwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZzWv0nWlzsbD for ; Tue, 23 Dec 2025 02:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e51f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 02:30:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 749293292aea - stable/15 - MFV: Import blocklist 2025-12-15 (8a4b011) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 749293292aea9387de68dad931fe757209b66048 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 02:30:51 +0000 Message-Id: <6949fedb.3e51f.59f09808@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=749293292aea9387de68dad931fe757209b66048 commit 749293292aea9387de68dad931fe757209b66048 Author: Jose Luis Duran AuthorDate: 2025-12-16 01:03:30 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-23 02:30:03 +0000 MFV: Import blocklist 2025-12-15 (8a4b011) Merge commit 'bfef098f924950a085927b1e7dd6c6db4e651c5c' Changes: https://github.com/zoulasc/blocklist/compare/ff13526...8a4b011 PR: 258411 PR: 291680 MFC after: 1 week (cherry picked from commit 52395203f9ac40d321ed55d93e9887300261d3bf) --- contrib/blocklist/bin/blocklistd.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/contrib/blocklist/bin/blocklistd.c b/contrib/blocklist/bin/blocklistd.c index 47c145c7aae1..7bbb03c0cc41 100644 --- a/contrib/blocklist/bin/blocklistd.c +++ b/contrib/blocklist/bin/blocklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.14 2025/12/15 15:51:37 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.14 2025/12/15 15:51:37 christos Exp $"); #include #include @@ -191,12 +191,13 @@ process(bl_t bl) } if (getremoteaddress(bi, &rss, &rsl) == -1) - return; + goto out; if (debug || bi->bi_msg[0]) { sockaddr_snprintf(rbuf, sizeof(rbuf), "%a:%p", (void *)&rss); (*lfun)(bi->bi_msg[0] ? LOG_INFO : LOG_DEBUG, - "processing type=%d fd=%d remote=%s msg=\"%s\" uid=%lu gid=%lu", + "processing type=%d fd=%d remote=%s msg=\"%s\" " + "uid=%lu gid=%lu", bi->bi_type, bi->bi_fd, rbuf, bi->bi_msg, (unsigned long)bi->bi_uid, (unsigned long)bi->bi_gid); @@ -204,12 +205,12 @@ process(bl_t bl) if (conf_find(bi->bi_fd, bi->bi_uid, &rss, &c) == NULL) { (*lfun)(LOG_DEBUG, "no rule matched"); - return; + goto out; } if (state_get(state, &c, &dbi) == -1) - return; + goto out; if (debug) { char b1[128], b2[128]; @@ -269,6 +270,8 @@ process(bl_t bl) state_put(state, &c, &dbi); out: + close(bi->bi_fd); + if (debug) { char b1[128], b2[128]; (*lfun)(LOG_DEBUG, "%s: final db state for %s: count=%d/%d " @@ -541,15 +544,16 @@ main(int argc, char *argv[]) state = state_open(dbfile, flags, 0600); if (state == NULL) state = state_open(dbfile, flags | O_CREAT, 0600); + else { + if (restore) { + if (!flush) + rules_flush(); + rules_restore(); + } + } if (state == NULL) return EXIT_FAILURE; - if (restore) { - if (!flush) - rules_flush(); - rules_restore(); - } - if (!debug) { if (daemon(0, 0) == -1) err(EXIT_FAILURE, "daemon failed"); @@ -563,7 +567,7 @@ main(int argc, char *argv[]) conf_parse(configfile); } ret = poll(pfd, (nfds_t)nfd, tout); - if (debug && ret != 0) + if (debug) (*lfun)(LOG_DEBUG, "received %d from poll()", ret); switch (ret) { case -1: From nobody Tue Dec 23 02:53:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db02G2jmWz6M9Yj for ; Tue, 23 Dec 2025 02:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4db02G1rmmz3wf8 for ; Tue, 23 Dec 2025 02:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766458422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tjoJZgxnNaTgpeoZOhC70OkpnH5aTUR7w0h4xNIbsM=; b=ffMcWmwd3njh4pYMSxgNDtWMBUuG0Pjdtko7spD8vFIFQKvmWXeGkRabufVVVXSokcU51I uMjssn2g8D+v6cS06gtJJd0O8ANxA+zuEEkaxmHpC7XS1JtZU65NLyJGHEne6VL61UyioJ 44JHkxB4DATH5Beqt0Ncj5X6qYiV8inttj9NQqrPIVRY/Y9WRqXRtnwKQigdJ6jLdXD35Z TvaHdGeRxuWi96Wjb4a/1gw5hQQTqu91Gt50bvL+5StZTf2QTGn2n/zngc4aaX/Qzpi1kT gcpmlr2aU6fWr4kL99W6+AvT3IS/BuHGPCOOlLa+iuVTGspfJ5CsvATBF/BVkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766458422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tjoJZgxnNaTgpeoZOhC70OkpnH5aTUR7w0h4xNIbsM=; b=s4KXySS5qU5HHXnmjM9vwa1D6DxnErdvKAnWhphCmE8t7D2gqpb1ER4/nqmVDFigThyVg0 Mnl7NP28WCVh+a77m9CzF/UHfYZJiML7mo0FbAb/G/i7+PgCUsrFnPqozNUpbYYHC9aJll VcgSHlETnMpsZ9ynCj49mHlEvwUfsie/eZJo9jXSmfNfl34UIA72P0wqHYtTsfMgREKNem qH6nDlaHBEh30y8wGRtRa93yoWYK5frUzizo6La34sQURIj2SvsbaaPC7LbnIiIroIsdd2 hNrygpPbNiDjH3H5STrsY9WQ7gsZnw+4B6jl0ZRrq9KpACSUYNDbdcv7CJ3qjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766458422; a=rsa-sha256; cv=none; b=jmj2RA22Sk7Xcu7Nglqh3W4EtQsk1DcnTAj4h7oRx2CAvXqEenzl1fRZYkq738Bkv+HYGu hOQCqsc358GOXFDowyBmHlP7g/ibE/3NBwNB6yGzAgwDvhm3YsIbbsapMfgnNeOaxxWb2f UA/c0W78AT36FsnSHqgjy42kr1XhKcHzUl/TMue6cdDrw0kPDI8n/tm7yQR2BWT8/+ebFj EtCk2coeM3A81BDC2MDfLfRz0oMuuR6coWgF1bXgkKyUlR9SrVcPi7Cv6AaKK4qF3lH8y8 i8liBmr4VP6j0v/zJKNEwSahMiMGnLrisL7YNX/EF4kpRQ5cy0iq/qJ/h+qHsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4db02G1KmYztf6 for ; Tue, 23 Dec 2025 02:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40793 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 02:53:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b94e4c7037b0 - main - RELNOTES: Add an entry for 8e3fd450cc53 and friends List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b94e4c7037b0face3206cf313fd8966d6aa1eaae Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 02:53:42 +0000 Message-Id: <694a0436.40793.630201eb@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b94e4c7037b0face3206cf313fd8966d6aa1eaae commit b94e4c7037b0face3206cf313fd8966d6aa1eaae Author: Rick Macklem AuthorDate: 2025-12-23 02:51:41 +0000 Commit: Rick Macklem CommitDate: 2025-12-23 02:51:41 +0000 RELNOTES: Add an entry for 8e3fd450cc53 and friends --- RELNOTES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELNOTES b/RELNOTES index a78b9cdca164..9136fa151f2c 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +8e3fd450cc53, 949cff4dceff, 0e724de9ed6f, 9f49f436a9ec, e35191ccf3b3: + Add support for an extension to NFSv4.2 (RFCnnnn) that + supports handling of POSIX draft ACLs via getfacl(1)/setfacl(1). + dbac191956f9, fe21dbf70aa8: Support for the kcmp(2) system call and fcntl(F_DUPFD_QUERY) for Linux binaries. From nobody Tue Dec 23 05:51:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db3zf14fXz6MQSQ for ; Tue, 23 Dec 2025 05:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4db3zf03dZz3KsR for ; Tue, 23 Dec 2025 05:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766469102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wsNeJZ89j93Srws0/HsINyfn/nb5itn+QG0f96hMf/g=; b=bLIy7wUSrt25Bu4hTwhdp/mNK1uWpheSYbQrcKBIxRxvw327A18HMytFBEUS5kBnntJVC6 XyZV1CUh6C8m4zoF4qVeS/KPMcYBvvQI2jRfucs2ng4Wa7L1zyVo81IFsUCaQHASlmR6Td IRkKfedDYdSFdgXAxfIswkjZ1NCJzJWeVS+ur22mIprMy0T8CbwgNQ33phqWplRm49ht7f DdfI4dunfBmTzm0mf8nR3S1XBT+muQK6npDVjGQ3LCGul6sf8lArp1d6cMfGQsgGW+X8/P eVdA8k5S5dpqx2D32H8Iej+6z+SC0CxczBlzbwl1hTgj9Yiuy4wbHQW1FdeFhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766469102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wsNeJZ89j93Srws0/HsINyfn/nb5itn+QG0f96hMf/g=; b=BPY1/UPVPetvjgXxZBK8pFtOGJX8+oz/lEgQ/CNWYeo8OyqmPCivAh239jg4LR8EWHN6AP veE6EiveJdklGzv4EJT9ZI/vSoRLxrSpEdOdbxzOdn8br1TsPBv/Ofomojg+C3CMt5ciMs XK62mLd7goqP0JhTEgTR2Ma8mu6MvVi0DuZkjVp6uthU2+0mpEiqQqGpaKZks+JgIcysi2 wDsIL3pfteSeYioHdi6WSmfKY3qv9gYgBj0nT2emcj85lXLorj0aVPpRJgjJmSMI8PMhTh qFIOEJ8XHeBL99RGkehZL4HhHR6jnfqrPdq54RMeqG+VFmS9MO0TLS3WAeJUnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766469102; a=rsa-sha256; cv=none; b=LvciEe0P1tzC59liEx8E4T1kuuoWENlx48Wl/6La0x3ISW9wb0AaKV+IA28UtTQNyTwS7I sl0ELPRkwptuZAVelkgztPoS7rJLkZgPIRjuMgJYXPSMSzUHMxDvkkyBq3pMBirfhYwznu tQ5Wmn/yyzDHKIc0A+keEBEIILli6FuXDAlsfOh2sBi3lGfCM7gzZiARl99ZTh1ODJt/XR Bf64IXvKUBgKf1yCrXCbZtt+HNOeYG2V0UXyfxSYGw+iYf0BEsBfKUAitsQUeMIQR8rrU8 lYTwf3Xr9Ubq+WxXh7GpYqOVkG5C9UoKVSxGva6ibBo1yw0jZH2QxcMc/6aQtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4db3zd6dDWzyxk for ; Tue, 23 Dec 2025 05:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22193 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 05:51:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 44f656641c23 - main - Hyper-V: hn: just call vf's ioctl when changing mtu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44f656641c238cb3db31026f3e3bef36cd5231a8 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 05:51:41 +0000 Message-Id: <694a2ded.22193.3a2f040f@gitrepo.freebsd.org> The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=44f656641c238cb3db31026f3e3bef36cd5231a8 commit 44f656641c238cb3db31026f3e3bef36cd5231a8 Author: Wei Hu AuthorDate: 2025-12-23 04:23:39 +0000 Commit: Wei Hu CommitDate: 2025-12-23 05:38:40 +0000 Hyper-V: hn: just call vf's ioctl when changing mtu When changing mtu, if a vf is attached to the netvsc interface, just calling its ioctl to change vf's mtu is good enough. Tested by: whu MFC after: 3 days Sponsored by: Microsoft --- sys/dev/hyperv/netvsc/if_hn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 2ae9e710978e..79fdea371fbb 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3750,14 +3750,16 @@ hn_ioctl(if_t ifp, u_long cmd, caddr_t data) ifr_vf = *ifr; strlcpy(ifr_vf.ifr_name, if_name(vf_ifp), sizeof(ifr_vf.ifr_name)); - error = ifhwioctl(SIOCSIFMTU,vf_ifp, + error = ifhwioctl(SIOCSIFMTU, vf_ifp, (caddr_t)&ifr_vf, curthread); + HN_UNLOCK(sc); if (error) { - HN_UNLOCK(sc); if_printf(ifp, "%s SIOCSIFMTU %d failed: %d\n", if_name(vf_ifp), ifr->ifr_mtu, error); - break; + } else { + if_setmtu(ifp, ifr->ifr_mtu); } + break; } /* From nobody Tue Dec 23 07:16:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db5sL0K6Wz6MXyQ for ; Tue, 23 Dec 2025 07:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4db5sK6xW0z3TBC for ; Tue, 23 Dec 2025 07:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766474182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rycTGbTbPuEigU6hQOyTg36eAZ/a/I4mji/n9u2beb4=; b=tiAxk3w33X0oB7YcJzNadTD/rKEJOyWnnIglUDbsVXcJVraZcfmzjgsJP0hd58f3oc3T6i k3+AfpDr8/5r8sKZWW1ydLJdqR/F3Sq14laMTf1FxMY47D7z5jdKyX4VFUlHauKJQRylAO ksW1OHLbNxfvCib+skOHEg9WISviQt6Ac4GVYvG5zUQUzE/mYDLQz/P7igJ++9F78+a+eN opytf5if6v532YJWHlf9fhSzuJUjwDV0FHU3LGSn+DyaBBHV8iVuKG2R/OzRWEgDNAtfiM aFAA+ydhPbnrmJSans26sIvcZa3Y+SZCTe8HrX7nOGV73Ac/wRhEH8xgsdF75A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766474182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rycTGbTbPuEigU6hQOyTg36eAZ/a/I4mji/n9u2beb4=; b=UTKR+3F4Bmk9pYAzyEmkGO8lugl6Vh8wNKixcS472hLJQzFmdGhH+ZWNcZ3h4ImbAXuBHb WvpWJXN0y5FrNwebsyoWUImiNFJYmZ1+PZxoYFQjiviBvG/jIcFSI1z44uACAlkDApCxTl etZd2hxe6KTl7Fu0de10w5UP7NyblC/lX2d1EopvdcREZqIZAcdylTbA7jaBlyKgmryOpi YLiLXJV2bbIUYNKhURp5842FwTslkD2D3XbeKq4lrUnxeHOkneDtFatFka66TluYjgz0W8 7xlGS6MbEN3xs5PU+pSLxQVEwHxcLPB5gTTempfwck47M42zH9dIWTy0UVLjyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766474182; a=rsa-sha256; cv=none; b=Di2p3aTsqHuAiZeRPKGpdNxqlqiqwQKiv0zeU2WoZjT4bCcbr5XEtajvdl5hIZK1/0WdxR fRiUt/E0+Qg2IyPxS1EbrdcLVn72WEdq4KjxY4+q+OVsp2hwA9QUam3J6stU9SCuKrAvcP cS8CB1YfZbPaQ5JvVsZhv+e9TY5cJ//AQZ2R9sGkBP3MkFK9s+NGWOsgUVVCIoDiEgwKtB Zti++VKFYEAQlC7fL4GeXmc4hIICOr/pjn4FS5wyGd4r2M7Wzr4VOSWVv6pWqyqKlXqgNE IVZT9GMy8LGgfS/kRTaCf0Ue2Jx0Au4tf5xmKFJgvNgL2qsdl/5Z0dZUuSFtqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4db5sK5kGVz1239 for ; Tue, 23 Dec 2025 07:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26f75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 07:16:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: d0a2bd2765b3 - main - mana: support jumbo packet size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0a2bd2765b365c4be9b17c29306f848953e55a5 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 07:16:21 +0000 Message-Id: <694a41c5.26f75.6d21b0fe@gitrepo.freebsd.org> The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=d0a2bd2765b365c4be9b17c29306f848953e55a5 commit d0a2bd2765b365c4be9b17c29306f848953e55a5 Author: Wei Hu AuthorDate: 2025-12-23 07:00:38 +0000 Commit: Wei Hu CommitDate: 2025-12-23 07:00:38 +0000 mana: support jumbo packet size Remove the restriction of up to 4k packet size. Now the driver supports up to MJUM16BYTES size packets as long as hardware supporting it. Tested on VMs in Azure. Tested by: whu MFC after: 1 week Sponsored by: Microsoft --- sys/dev/mana/gdma.h | 6 ++++ sys/dev/mana/mana.h | 11 +++++-- sys/dev/mana/mana_en.c | 79 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/sys/dev/mana/gdma.h b/sys/dev/mana/gdma.h index 9e32d58dbfdc..90cd908055af 100644 --- a/sys/dev/mana/gdma.h +++ b/sys/dev/mana/gdma.h @@ -193,6 +193,9 @@ struct gdma_general_req { }; /* HW DATA */ #define GDMA_MESSAGE_V1 1 +#define GDMA_MESSAGE_V2 2 +#define GDMA_MESSAGE_V3 3 +#define GDMA_MESSAGE_V4 4 struct gdma_general_resp { struct gdma_resp_hdr hdr; @@ -409,6 +412,9 @@ struct gdma_context { struct gdma_resource msix_resource; struct gdma_irq_context *irq_contexts; + /* L2 MTU */ + uint16_t adapter_mtu; + /* This maps a CQ index to the queue structure. */ unsigned int max_num_cqs; struct gdma_queue **cq_table; diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index a037eb3f05c7..de34f8a82c6a 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -102,9 +102,6 @@ enum TRI_STATE { #define COMP_ENTRY_SIZE 64 #define MIN_FRAME_SIZE 146 -#define ADAPTER_MTU_SIZE 1500 -#define DEFAULT_FRAME_SIZE (ADAPTER_MTU_SIZE + 14) -#define MAX_FRAME_SIZE 4096 /* Unit number of RX buffers. Must be power of two * Higher number could fail at allocation. @@ -534,6 +531,9 @@ struct mana_port_context { uint16_t port_idx; uint16_t frame_size; + uint16_t max_mtu; + uint16_t min_mtu; + uint16_t mtu; bool port_is_up; bool port_st_save; /* Saved port state */ @@ -613,6 +613,11 @@ struct mana_query_device_cfg_resp { uint16_t max_num_vports; uint16_t reserved; uint32_t max_num_eqs; + + /* response v2: */ + uint16_t adapter_mtu; + uint16_t reserved2; + uint32_t reserved3; }; /* HW DATA */ /* Query vPort Configuration */ diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 949b498ceadc..bc8c172bab69 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -181,18 +181,19 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) new_mtu = ifr->ifr_mtu; if (if_getmtu(ifp) == new_mtu) break; - if ((new_mtu + 18 > MAX_FRAME_SIZE) || - (new_mtu + 18 < MIN_FRAME_SIZE)) { + if ((new_mtu > apc->max_mtu) || + (new_mtu < apc->min_mtu)) { if_printf(ifp, "Invalid MTU. new_mtu: %d, " "max allowed: %d, min allowed: %d\n", - new_mtu, MAX_FRAME_SIZE - 18, MIN_FRAME_SIZE - 18); + new_mtu, apc->max_mtu, apc->min_mtu); return EINVAL; } MANA_APC_LOCK_LOCK(apc); if (apc->port_is_up) mana_down(apc); - apc->frame_size = new_mtu + 18; + apc->frame_size = new_mtu + ETHER_HDR_LEN; + apc->mtu = new_mtu; if_setmtu(ifp, new_mtu); mana_dbg(NULL, "Set MTU to %d\n", new_mtu); @@ -421,17 +422,11 @@ mana_load_rx_mbuf(struct mana_port_context *apc, struct mana_rxq *rxq, if (alloc_mbuf) { mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->datasize); - if (unlikely(mbuf == NULL)) { - mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (unlikely(mbuf == NULL)) { - return ENOMEM; - } - mlen = MCLBYTES; - } else { - mlen = rxq->datasize; - } + if (unlikely(mbuf == NULL)) + return ENOMEM; - mbuf->m_pkthdr.len = mbuf->m_len = mlen; + mbuf->m_pkthdr.len = mbuf->m_len = rxq->datasize; + mlen = rxq->datasize; } else { if (rx_oob->mbuf) { mbuf = rx_oob->mbuf; @@ -911,9 +906,9 @@ mana_init_port_context(struct mana_port_context *apc) BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MJUMPAGESIZE, /* maxsize */ + MJUM16BYTES, /* maxsize */ 1, /* nsegments */ - MJUMPAGESIZE, /* maxsegsize */ + MJUM16BYTES, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg*/ &apc->rx_buf_tag); @@ -994,6 +989,9 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_DEV_CONFIG, sizeof(req), sizeof(resp)); + + req.hdr.resp.msg_version = GDMA_MESSAGE_V2; + req.proto_major_ver = proto_major_ver; req.proto_minor_ver = proto_minor_ver; req.proto_micro_ver = proto_micro_ver; @@ -1016,8 +1014,14 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, *max_num_vports = resp.max_num_vports; - mana_dbg(NULL, "mana max_num_vports from device = %d\n", - *max_num_vports); + if (resp.hdr.response.msg_version >= GDMA_MESSAGE_V2) + gc->adapter_mtu = resp.adapter_mtu; + else + gc->adapter_mtu = ETHERMTU + ETHER_HDR_LEN; + + mana_dbg(NULL, "mana max_num_vports from device = %d, " + "adapter_mtu = %u\n", + *max_num_vports, gc->adapter_mtu); return 0; } @@ -2295,7 +2299,7 @@ mana_alloc_rx_wqe(struct mana_port_context *apc, uint32_t buf_idx; int err; - if (rxq->datasize == 0 || rxq->datasize > PAGE_SIZE) { + if (rxq->datasize == 0) { mana_err(NULL, "WARNING: Invalid rxq datasize %u\n", rxq->datasize); } @@ -2359,6 +2363,28 @@ mana_push_wqe(struct mana_rxq *rxq) return 0; } +static uint32_t +mana_calc_rx_datasize(struct mana_port_context *apc) +{ + uint32_t effective_mtu = 0; + + if (apc->frame_size > MJUM16BYTES) { + mana_err(NULL, "mana frame_size %u is too big\n", + apc->frame_size); + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUM9BYTES) { + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUMPAGESIZE) { + effective_mtu = MJUM9BYTES; + } else if (apc->frame_size > MCLBYTES) { + effective_mtu = MJUMPAGESIZE; + } else { + effective_mtu = MCLBYTES; + } + + return effective_mtu; +} + static struct mana_rxq * mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, struct mana_eq *eq, if_t ndev) @@ -2381,14 +2407,8 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size; rxq->rxq_idx = rxq_idx; - /* - * Minimum size is MCLBYTES(2048) bytes for a mbuf cluster. - * Now we just allow maximum size of 4096. - */ - rxq->datasize = ALIGN(apc->frame_size, MCLBYTES); - if (rxq->datasize > MAX_FRAME_SIZE) - rxq->datasize = MAX_FRAME_SIZE; + rxq->datasize = mana_calc_rx_datasize(apc); mana_dbg(NULL, "Setting rxq %d datasize %d\n", rxq_idx, rxq->datasize); @@ -2914,10 +2934,13 @@ mana_probe_port(struct mana_context *ac, int port_idx, mana_rx_req_size); apc->port_handle = INVALID_MANA_HANDLE; apc->port_idx = port_idx; - apc->frame_size = DEFAULT_FRAME_SIZE; apc->last_tx_cq_bind_cpu = -1; apc->last_rx_cq_bind_cpu = -1; apc->vport_use_count = 0; + apc->max_mtu = gc->adapter_mtu - ETHER_HDR_LEN; + apc->min_mtu = MIN_FRAME_SIZE; + apc->mtu = ETHERMTU; + apc->frame_size = apc->mtu + ETHER_HDR_LEN; MANA_APC_LOCK_INIT(apc); @@ -2932,7 +2955,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setioctlfn(ndev, mana_ioctl); if_setgetcounterfn(ndev, mana_get_counter); - if_setmtu(ndev, ETHERMTU); + if_setmtu(ndev, apc->mtu); if_setbaudrate(ndev, IF_Gbps(100)); mana_rss_key_fill(apc->hashkey, MANA_HASH_KEY_SIZE); From nobody Tue Dec 23 08:36:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db7dl0Np3z6KxN8 for ; Tue, 23 Dec 2025 08:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4db7dk5qXmz3ZFg for ; Tue, 23 Dec 2025 08:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766478986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jKJ+zw/H/ovbjNvSfz9uTzMltUsk/06Jd/ZUlNk8Gk=; b=x3Zmo3R11H2QYZgWMKmHvaRK2MrvSSIz5I4n8P5G74cBGCqFSnSYG41RhG21zR2S6lZShR YGSTM+2ig6BbZ/S5YAc9t6nrwQe5CKJBMxJ6HOzcqiidNcQVM0yUAzYL44eDcDKxNr3GMJ i+gtMRGBnsz/ixdSCu8Jb7B9XCXthZTR/7PhL5vS4iIPlKI/waV00V4i83PwhaYVpVOS// kpqGM3EsPU18ckRPhocxLAa6yMqrXYtnA2d1VgfnyXeevrHPFbjpDRHzopI94GfPBRHdhf YQRwXZb73HEQ2ZK7QvEAhq0Aly8jtnJK7FLZNlofjf4+XoRm3tuJLIf+ZRsscg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766478986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jKJ+zw/H/ovbjNvSfz9uTzMltUsk/06Jd/ZUlNk8Gk=; b=i3hxTSJxVoJqiWBeY8gIRnGDYLr+sNykSqOBqzjIVGCYK/pVQcWuCXA+85nIG8KyTrAmTC nYuScfgrDIcfgBC060FlPvxNZu29SRnhUUYncl2LL4rpHrpvJ4reZotgGfMO0I+k4Be7Zi DxD3NZkfSkPcZtXamJtFDDo/8tKKJ4CeJP7Uch5WvRWvAmwxetW/Wg06RvYR+uVrdTZUTj P/aA1n0nno98mlBoLgbL+WSoxVVrml4Fxx88MN89E6rqOgZIO4WPheF1cTIL9SuwMAvHRh F1de5sTfg/Phzp6iwoF3YgA97UYJiuayJdRaNQlUN6VX6MU5y1jpaRgZ0pP8Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766478986; a=rsa-sha256; cv=none; b=TeKPebB0SUOyEICd5X0lrRQGtH52KnwO6vBLAZmWh+JGBB48/VfXYvF6jG/McEOuKIVe4F aJi5PkV0g6X3ekRCTjtK82iVjqhFfsMAKhj1jWYo1xtDWc3nye4zMrc6LAzlmdkhhlqCw7 aLYhh72o9K4lSSUHOKCvqSvQcDGw2rzZr2oeCxDVmSww0wUC1G82megCg2N/YLv1A8Oos+ X356/DPYdeJES8E57PqkqMZhL9uULA52JU9pynb3h0bPw4YwWhg2AE/s2JAw5i2z84Nwba roHF7zpdkozEV6b7kHm6gw+H7I6gRhrLbIlYA9YLOpidi6ag5A+HjI3zDpw8cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4db7dk4w9Zz14dl for ; Tue, 23 Dec 2025 08:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39faa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 08:36:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: ae12432049e7 - main - MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae12432049e7873ab3912643ae5d08297b8cbc49 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 08:36:16 +0000 Message-Id: <694a5480.39faa.1ebce7ea@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ae12432049e7873ab3912643ae5d08297b8cbc49 commit ae12432049e7873ab3912643ae5d08297b8cbc49 Merge: d0a2bd2765b3 762f11d98d5c Author: Xin LI AuthorDate: 2025-12-23 08:24:13 +0000 Commit: Xin LI CommitDate: 2025-12-23 08:24:13 +0000 MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. MFC after: 7 days contrib/xz/ChangeLog | 1586 +++++++++++++++++++++ contrib/xz/THANKS | 402 +++--- contrib/xz/doxygen/Doxyfile | 8 +- contrib/xz/src/common/my_landlock.h | 45 +- contrib/xz/src/common/mythread.h | 3 +- contrib/xz/src/liblzma/api/lzma/base.h | 6 +- contrib/xz/src/liblzma/api/lzma/container.h | 38 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 5 +- contrib/xz/src/liblzma/check/crc32_fast.c | 2 +- contrib/xz/src/liblzma/check/crc64_fast.c | 10 +- contrib/xz/src/liblzma/check/crc_common.h | 19 +- contrib/xz/src/liblzma/common/alone_decoder.c | 6 +- contrib/xz/src/liblzma/common/filter_common.c | 4 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 3 +- contrib/xz/src/liblzma/common/outqueue.h | 1 + contrib/xz/src/liblzma/common/stream_decoder_mt.c | 79 +- contrib/xz/src/liblzma/common/vli_decoder.c | 2 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 4 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 11 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 6 +- contrib/xz/src/liblzma/validate_map.sh | 4 +- contrib/xz/src/xz/args.c | 1 - contrib/xz/src/xz/file_io.c | 3 +- contrib/xz/src/xz/hardware.c | 72 + contrib/xz/src/xz/list.c | 2 + contrib/xz/src/xz/message.h | 4 + contrib/xz/src/xz/sandbox.c | 26 +- contrib/xz/src/xz/signals.c | 17 +- contrib/xz/src/xz/util.c | 4 + contrib/xz/src/xz/xz.1 | 9 +- contrib/xz/src/xzdec/xzdec.c | 2 +- lib/liblzma/config.h | 12 +- 33 files changed, 2072 insertions(+), 326 deletions(-) diff --cc lib/liblzma/config.h index 963d08c93e7a,000000000000..af0ee2fefb39 mode 100644,000000..100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@@ -1,652 -1,0 +1,658 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* How many MiB of RAM to assume if the real amount cannot be determined. */ +#define ASSUME_RAM 128 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* FreeBSD - disabled intentionally */ +/* #undef ENABLE_NLS */ + +/* Define to 1 if ARM64 CRC32 instruction is supported. See configure.ac for + details. */ +/* #undef HAVE_ARM64_CRC32 */ + +/* Define to 1 if bswap_16 is available. */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_32 is available. */ +/* #undef HAVE_BSWAP_32 */ + +/* Define to 1 if bswap_64 is available. */ +/* #undef HAVE_BSWAP_64 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if you have the 'cap_rights_limit' function. */ +#define HAVE_CAP_RIGHTS_LIMIT 1 +#endif + +/* Define to 1 if the system has the type 'CC_SHA256_CTX'. */ +/* #undef HAVE_CC_SHA256_CTX */ + +/* Define to 1 if you have the 'CC_SHA256_Init' function. */ +/* #undef HAVE_CC_SHA256_INIT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define to 1 if crc32 integrity check is enabled. */ +#define HAVE_CHECK_CRC32 1 + +/* Define to 1 if crc64 integrity check is enabled. */ +#define HAVE_CHECK_CRC64 1 + +/* Define to 1 if sha256 integrity check is enabled. */ +#define HAVE_CHECK_SHA256 1 + +/* Define to 1 if you have the 'clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if 'CLOCK_MONOTONIC' is declared in . */ +#define HAVE_CLOCK_MONOTONIC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define to 1 if the 32-bit x86 CRC assembly files are used. */ +/* FreeBSD - only enabled for i386 */ +#if defined(__FreeBSD__) && defined(__i386__) +#define HAVE_CRC_X86_ASM 1 +#endif + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */ +#define HAVE_DECODERS 1 + +/* Define to 1 if arm decoder is enabled. */ +#define HAVE_DECODER_ARM 1 + +/* Define to 1 if arm64 decoder is enabled. */ +#define HAVE_DECODER_ARM64 1 + +/* Define to 1 if armthumb decoder is enabled. */ +#define HAVE_DECODER_ARMTHUMB 1 + +/* Define to 1 if delta decoder is enabled. */ +#define HAVE_DECODER_DELTA 1 + +/* Define to 1 if ia64 decoder is enabled. */ +#define HAVE_DECODER_IA64 1 + +/* Define to 1 if lzma1 decoder is enabled. */ +#define HAVE_DECODER_LZMA1 1 + +/* Define to 1 if lzma2 decoder is enabled. */ +#define HAVE_DECODER_LZMA2 1 + +/* Define to 1 if powerpc decoder is enabled. */ +#define HAVE_DECODER_POWERPC 1 + +/* Define to 1 if riscv decoder is enabled. */ +#define HAVE_DECODER_RISCV 1 + +/* Define to 1 if sparc decoder is enabled. */ +#define HAVE_DECODER_SPARC 1 + +/* Define to 1 if x86 decoder is enabled. */ +#define HAVE_DECODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the 'elf_aux_info' function. */ +/* #undef HAVE_ELF_AUX_INFO */ + +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ +#define HAVE_ENCODERS 1 + +/* Define to 1 if arm encoder is enabled. */ +#define HAVE_ENCODER_ARM 1 + +/* Define to 1 if arm64 encoder is enabled. */ +#define HAVE_ENCODER_ARM64 1 + +/* Define to 1 if armthumb encoder is enabled. */ +#define HAVE_ENCODER_ARMTHUMB 1 + +/* Define to 1 if delta encoder is enabled. */ +#define HAVE_ENCODER_DELTA 1 + +/* Define to 1 if ia64 encoder is enabled. */ +#define HAVE_ENCODER_IA64 1 + +/* Define to 1 if lzma1 encoder is enabled. */ +#define HAVE_ENCODER_LZMA1 1 + +/* Define to 1 if lzma2 encoder is enabled. */ +#define HAVE_ENCODER_LZMA2 1 + +/* Define to 1 if powerpc encoder is enabled. */ +#define HAVE_ENCODER_POWERPC 1 + +/* Define to 1 if riscv encoder is enabled. */ +#define HAVE_ENCODER_RISCV 1 + +/* Define to 1 if sparc encoder is enabled. */ +#define HAVE_ENCODER_SPARC 1 + +/* Define to 1 if x86 encoder is enabled. */ +#define HAVE_ENCODER_X86 1 + +/* Define to 1 if __attribute__((__constructor__)) is supported for functions. + */ +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 + +/* Define to 1 if you have the 'futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the 'futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the 'futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + +/* Define to 1 if you have the 'getauxval' function. */ +/* #undef HAVE_GETAUXVAL */ + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the 'getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + ++/* Define to 1 if you have the 'getrlimit' function. */ ++#define HAVE_GETRLIMIT 1 ++ +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_GETTEXT */ + ++/* Define to 1 if 'HWCAP_CRC32' is declared in . */ ++/* #undef HAVE_HWCAP_CRC32 */ ++ +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* FreeBSD - only with clang because the base gcc does not support it */ +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_IMMINTRIN_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if Linux Landlock is supported. See configure.ac for details. + */ +/* #undef HAVE_LINUX_LANDLOCK */ + +/* Define to 1 if 64-bit LoongArch CRC32 instructions are supported. */ +/* #undef HAVE_LOONGARCH_CRC32 */ + +/* Define to 1 if .lz (lzip) decompression support is enabled. */ +#define HAVE_LZIP_DECODER 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 to enable bt2 match finder. */ +#define HAVE_MF_BT2 1 + +/* Define to 1 to enable bt3 match finder. */ +#define HAVE_MF_BT3 1 + +/* Define to 1 to enable bt4 match finder. */ +#define HAVE_MF_BT4 1 + +/* Define to 1 to enable hc3 match finder. */ +#define HAVE_MF_HC3 1 + +/* Define to 1 to enable hc4 match finder. */ +#define HAVE_MF_HC4 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if getopt.h declares extern int optreset. */ +#define HAVE_OPTRESET 1 + +/* Define to 1 if you have the 'pledge' function. */ +/* #undef HAVE_PLEDGE */ + +/* Define to 1 if you have the 'posix_fadvise' function. */ +#define HAVE_POSIX_FADVISE 1 + +/* Define to 1 if 'program_invocation_name' is declared in . */ +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ + +/* Define to 1 if you have the 'pthread_condattr_setclock' function. */ +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the 'SHA256Init' function. */ +/* #undef HAVE_SHA256INIT */ + +/* Define to 1 if the system has the type 'SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SHA256_H 1 + +/* Define to 1 if you have the 'SHA256_Init' function. */ +#define HAVE_SHA256_INIT 1 + +/* Define to 1 if the system has the type 'SHA2_CTX'. */ +/* #undef HAVE_SHA2_CTX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHA2_H */ + +/* Define to 1 if optimizing for size. */ +/* #undef HAVE_SMALL */ + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 + +/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 + +/* Define to 1 if 'st_atim.st__tim.tv_nsec' is a member of 'struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */ + +/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 + +/* Define to 1 if 'st_uatime' is a member of 'struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_UATIME */ + +/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for + symbol versioning. Define to 2 to if these are wanted only if also PIC is + defined (allows building both shared and static liblzma at the same time + with Libtool if neither --with-pic nor --without-pic is used). This define + must be used together with liblzma_linux.map. */ +/* #undef HAVE_SYMBOL_VERSIONS_LINUX */ + +/* Define to 1 if you have the 'sysctlbyname' function. */ +/* #undef HAVE_SYSCTLBYNAME */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BYTEORDER_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CDEFS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_ENDIAN_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if the system has the type 'uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if _mm_set_epi64x and _mm_clmulepi64_si128 are usable. See + configure.ac for details. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_USABLE_CLMUL 1 +#endif + +/* Define to 1 if you have the 'utime' function. */ +/* #undef HAVE_UTIME */ + +/* Define to 1 if you have the 'utimes' function. */ +/* #undef HAVE_UTIMES */ + +/* Define to 1 if you have the 'vasprintf' function. */ +#define HAVE_VASPRINTF 1 + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the 'wcwidth' function. */ +#define HAVE_WCWIDTH 1 + +/* Define to 1 if the system has the type '_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the '_futime' function. */ +/* #undef HAVE__FUTIME */ + +/* Define to 1 if _mm_movemask_epi8 is available. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE__MM_MOVEMASK_EPI8 1 +#endif + +/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported. + */ +#define HAVE___BUILTIN_ASSUME_ALIGNED 1 + +/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported. + */ +#define HAVE___BUILTIN_BSWAPXX 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 when using POSIX threads (pthreads). */ +#define MYTHREAD_POSIX 1 + +/* Define to 1 when using Windows Vista compatible threads. This uses features + that are not available on Windows XP. */ +/* #undef MYTHREAD_VISTA */ + +/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This + avoids use of features that were added in Windows Vista. */ +/* #undef MYTHREAD_WIN95 */ + +/* Define to 1 to disable debugging code. */ +#define NDEBUG 1 + +/* Name of package */ +#define PACKAGE "xz" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "xz@tukaani.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "XZ Utils" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "XZ Utils 5.8.1" ++#define PACKAGE_STRING "XZ Utils 5.8.2" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "xz" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://tukaani.org/xz/" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "5.8.1" ++#define PACKAGE_VERSION "5.8.2" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* The size of 'size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the number of available CPU cores can be detected with + cpuset(2). */ +#define TUKLIB_CPUCORES_CPUSET 1 + +/* Define to 1 if the number of available CPU cores can be detected with + pstat_getdynamic(). */ +/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */ + +/* Define to 1 if the number of available CPU cores can be detected with + sched_getaffinity() */ +/* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */ +/* #undef TUKLIB_CPUCORES_SYSCONF */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysctl(). */ +/* #undef TUKLIB_CPUCORES_SYSCTL */ + +/* Define to 1 if the system supports fast unaligned access to 16-bit, 32-bit, + and 64-bit integers. */ +/* FreeBSD - derive from __NO_STRICT_ALIGNMENT */ +/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */ + +/* Define to 1 if the amount of physical memory can be detected with + _system_configuration.physmem. */ +/* #undef TUKLIB_PHYSMEM_AIX */ + +/* Define to 1 if the amount of physical memory can be detected with + getinvent_r(). */ +/* #undef TUKLIB_PHYSMEM_GETINVENT_R */ + +/* Define to 1 if the amount of physical memory can be detected with + getsysinfo(). */ +/* #undef TUKLIB_PHYSMEM_GETSYSINFO */ + +/* Define to 1 if the amount of physical memory can be detected with + pstat_getstatic(). */ +/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */ + +/* Define to 1 if the amount of physical memory can be detected with + sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */ +#define TUKLIB_PHYSMEM_SYSCONF 1 + +/* Define to 1 if the amount of physical memory can be detected with sysctl(). + */ +/* #undef TUKLIB_PHYSMEM_SYSCTL */ + +/* Define to 1 if the amount of physical memory can be detected with Linux + sysinfo(). */ +/* #undef TUKLIB_PHYSMEM_SYSINFO */ + +/* Define to 1 to use unsafe type punning, e.g. char *x = ...; *(int *)x = + 123; which violates strict aliasing rules and thus is undefined behavior + and might result in broken code. */ +/* #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING */ + +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# define __STDC_WANT_IEC_60559_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ - #define VERSION "5.8.1" ++#define VERSION "5.8.2" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined(__FreeBSD__) +#include +#if defined(__NO_STRICT_ALIGNMENT) +#define TUKLIB_FAST_UNALIGNED_ACCESS 1 +#endif +#include +#if _BYTE_ORDER == _BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ +/* #undef _LARGE_FILES */ + +/* Number of bits in time_t, on hosts where this is settable. */ +/* #undef _TIME_BITS */ + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +/* #undef __MINGW_USE_VC2005_COMPAT */ + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ +/* #undef uintptr_t */ From nobody Tue Dec 23 10:38:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbBLd4JMsz6L8MM for ; Tue, 23 Dec 2025 10:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbBLd3lLdz3nQ6 for ; Tue, 23 Dec 2025 10:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766486313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ITziaMGCMnqmWRYpVos12Wjp1rqgzBEIL5ol0zITtfs=; b=IGIoQtvj+56/fUqqhxMpPQE3UGp40hscjCicuxm1XgfBpw0iqwFq5BOciATUKf0CyELJOB GgRAoMNwdn6XZs1dG4ZPj2DjX69JWfRTa+Mxmv4HYJh6FHgDB0BH6gJUxwckUfmtJPiP3x dVk+ZQMlJEIP2Es8AY/PARE8mOeE3PNXpfScoyR/z5qsW2W8m0xpSA87m24LHBuZUNaUCI xTjmgls6dmGfZzldOHj2pNWxrcDszXbEKM078QwLbHahRYZIZikRAXBL77mroT5z20N1Bv DIZOXBfT933sJyJmbZlqshzzxho7HoIwmt516VwgAMyWK+hh0EV8s/DW9ElCsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766486313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ITziaMGCMnqmWRYpVos12Wjp1rqgzBEIL5ol0zITtfs=; b=xttzD2ACLX+DM4e8UNV4okU2W70yIBheEfn6EMkPzdOj/HLNMfBRycN4LRPfD0Ugj00/tu Z+19/8NymANVa4GKVR2PbpZVSPTnrzY1txmF0pQYEj+juNV8zn4v2QYH+6OCbGzhkQf9DV KNA676KmkTy/I+gsMopJMY4UX7grp2QziZ8phoKTOEiYBNGYMY61ub1mO+F8tL42Nr5V08 J/KKYT3MEyvcO7EKboPEfPlp8uGTBAU/szoj6St1aDQOAEHyXEF4eg6SNOGZCCbWRcECXS hb3ofeHDwAfFgf9ywPKSR4Ie7qXgwBjQbJjKhddeCqSHHtsRaaJtuNHeHfBunw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766486313; a=rsa-sha256; cv=none; b=ozIbLSg4surZtLbFVbOTfOIyebmkZMA9pKZue3H7U5L3C9SAagmVJGHdjQ2UH8MH3bs0/6 ExsxutfHVhDjATclf0Nh4jdANmv3nYI47w4gl38QqPxK57X/MzADTkvSpa6qOQQm7V3X38 4Lj8OdgVCGmtv7lRkxQNHzE/7+UiXEH6ZYFnc6UF3cLlHHordR6Ic3fJQU5sjOOGKNzSs4 zxm1RcP0TjZEsJdpfra4H5rNhVdwAdQKwtKHuJBPzWAEBGJAte/tLPtxz8ymBfA0nnQ+X1 KWVoiucEYfBo2uu9rfCxkGIlXa+/SJZFAjP2R4Ox6MN4ut+JHdEBi/gAzUOw5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbBLd2cP6z170p for ; Tue, 23 Dec 2025 10:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id df8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 10:38:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 745c6c0431d0 - main - Resurrect standalone command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 745c6c0431d01b4fc3247f4eac08a2181d71e008 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 10:38:33 +0000 Message-Id: <694a7129.df8a.69ff4202@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=745c6c0431d01b4fc3247f4eac08a2181d71e008 commit 745c6c0431d01b4fc3247f4eac08a2181d71e008 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-23 10:36:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-23 10:36:39 +0000 Resurrect standalone command While command(1) is now classified by POSIX as an intrinsic utility and no longer required to exist as a standalone program, it turns out that we still have a use for it (cf. env(1)), so resurrect it. PR: 291879 Fixes: 4100bd6caa66 ("usr.bin: Remove intrinsic utilities") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54341 --- ObsoleteFiles.inc | 1 - usr.bin/Makefile | 1 + usr.bin/command/Makefile | 4 ++++ usr.bin/command/command.sh | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5034f84e1295..8c421ec4cc01 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -55,7 +55,6 @@ OLD_FILES+=usr/bin/alias OLD_FILES+=usr/bin/bg OLD_FILES+=usr/bin/cd -OLD_FILES+=usr/bin/command OLD_FILES+=usr/bin/fc OLD_FILES+=usr/bin/fg OLD_FILES+=usr/bin/getopts diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 844a2312fd73..5fa9821466da 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -23,6 +23,7 @@ SUBDIR= apply \ colrm \ column \ comm \ + command \ compress \ csplit \ ctlstat \ diff --git a/usr.bin/command/Makefile b/usr.bin/command/Makefile new file mode 100644 index 000000000000..786d3d9c6d06 --- /dev/null +++ b/usr.bin/command/Makefile @@ -0,0 +1,4 @@ +SCRIPTS=command.sh +MAN= + +.include diff --git a/usr.bin/command/command.sh b/usr.bin/command/command.sh new file mode 100755 index 000000000000..ab378f1e729a --- /dev/null +++ b/usr.bin/command/command.sh @@ -0,0 +1,2 @@ +#!/bin/sh +builtin command "$@" From nobody Tue Dec 23 13:40:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbGNl4NcWz6LRHs for ; Tue, 23 Dec 2025 13:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbGNl3dLMz4DBh for ; Tue, 23 Dec 2025 13:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766497239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AgabJ+/dSeW94Ghbz4e5EIYChu9K9rWHUEOhmx8opY=; b=oFrBn4ZA4lC+MzRHs6tztR3yMTsCcsoyCFtwLvIkTX/SjQS1A2n6k7p9w53kZpEjIW5gS5 9Y6RXG4EEbF8Kzn/CrGk/SMv/VjiDYRksmUY7+Zb9v28wEtEDiMwgOt4+n1i3l5WpjyOv9 se3AAlUAL2Xu4UU/OJcg9VUiT+1QGYaUZVEHM/v1G+02KRUXpAUHfvKfHnpmA1iYhG3bCA 6C3BBRAn9mdnMLNQAyIp2cq6XRERge4qvFRRHogaXxusJT54vMYqTzUUSUNScMwppy4gNv ztrla1zs4d2EvFB0F9/FZBK5bMA46ag56k/pS6F8ba4E/91/0Zw7mSIh8fiK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766497239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AgabJ+/dSeW94Ghbz4e5EIYChu9K9rWHUEOhmx8opY=; b=OZcF1l3O9Y8TaspUY9vSOvj6qWsPxyN6aIUr5Zab7t1pfLSrJWnfWymNvI6/K/rdsClBgs njTSzWfeQ2sExuz6fm+vQVlK1X/GctJnpOefUmchb/7afRYA8xYS3UiBGoMK8Y8BI+Nflt K549Ouk0Oy8yR2p6u8DS0UbU35JEpKRIWc5SIuDSBtxx0EPsKLq3s3A0cj49enwHUl5yjA I0NQe7HhFRe0fAL8DmCeb2s8RuenGacDfWQCMwELNxb+nzccgKDN4S9jPr8Hxkl92Gl6Zh vqzpORwrkg4s/Vla2PpQqKzzUWnV1T0YYBTecq9BHmjwIzjBUtQZSNX4H31CSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766497239; a=rsa-sha256; cv=none; b=P+J2+hqVQO4Pe35KmW1HFqD2WCN+KQnimul/Af8XECh9muVRFLCBf/EwQndgKsJsVt1yyN /iA2Q5OpYCkaED3+iAJhxIM97XKTTpaXkYawhjQ+26pwqGCZBGdy4kyb1Xi+kAP92M2rcl tpcebx+q8+WAKT3P5YVaCzpie7DBq/xbr8zqJvyEQnWm0LVJpTImcjKUOi9UWJ345hziMJ A/hUucsA86hIGgbwg1BR1X4F1+w7XYvXnQklWszMCAiws7jBlzd7LetSHbqdpgEmtwkh7s 3W6bDFVWCKJjqsPWZBBHd4L/UpCZLKJs1WmE9LwhkFRgoLXyUI8lHHznKtIXaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbGNl2zzXz1CVp for ; Tue, 23 Dec 2025 13:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38536 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 13:40:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: fbc321b9cdce - main - camcontrol.8: Descriptions before examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbc321b9cdceecd3c97742868da5d500423cf484 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 13:40:39 +0000 Message-Id: <694a9bd7.38536.453fe7f5@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=fbc321b9cdceecd3c97742868da5d500423cf484 commit fbc321b9cdceecd3c97742868da5d500423cf484 Author: Alexander Ziaee AuthorDate: 2025-12-23 13:36:49 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 13:40:29 +0000 camcontrol.8: Descriptions before examples This page has a lot of examples, so having them in the previous order can be confusing. Rewrite to the normal order where the descriptions come before the command, followed by a colon, which is still clear even jumping to the middle of the section. PR: 291759 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54285 --- sbin/camcontrol/camcontrol.8 | 349 ++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 201 deletions(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index bdda1828abf5..4963615fe6f6 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2684,303 +2684,250 @@ is the transport layer device. are the CAM application passthrough devices. .El .Sh EXAMPLES -.Dl camcontrol eject -n cd -u 1 -v -.Pp Eject the CD from cd1, and print SCSI sense information if the command -fails. +fails: .Pp -.Dl camcontrol tur da0 +.Dl camcontrol eject -n cd -u 1 -v .Pp Send the SCSI test unit ready command to da0. The .Nm -utility will report whether the disk is ready, but will not display sense -information if the command fails since the +utility will report whether the disk is ready, +but will not display sense information if the command fails since the .Fl v -switch was not specified. -.Bd -literal -offset indent -camcontrol tur da1 -E -C 4 -t 50 -Q head -v -.Ed +switch was not specified: +.Pp +.Dl camcontrol tur da0 .Pp Send a test unit ready command to da1. Enable kernel error recovery. Specify a retry count of 4, and a timeout of 50 seconds. -Enable sense -printing (with the -.Fl v -flag) if the command fails. -Since error recovery is turned on, the -disk will be spun up if it is not currently spinning. -The -.Tn SCSI -task attribute for the command will be set to Head of Queue. +Enable sense printing +.Pq with the Fl v flag +if the command fails. +Since error recovery is turned on, +the disk will be spun up if it is not currently spinning. +The SCSI task attribute for the command will be set to Head of Queue. The .Nm -utility will report whether the disk is ready. -.Bd -literal -offset indent -camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e - -i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1" -.Ed +utility will report whether the disk is ready: +.Pp +.Dl camcontrol tur da1 -E -C 4 -t 50 -Q head -v .Pp Issue a READ BUFFER command (0x3C) to cd1. Display the buffer size of cd1, and display the first 10 bytes from the cache on cd1. -Display SCSI sense -information if the command fails. +Display SCSI sense information if the command fails: .Bd -literal -offset indent -camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e - -o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8 +camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e + -i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1" .Ed .Pp Issue a WRITE BUFFER (0x3B) command to cd1. Write out 10 bytes of data, not including the (reserved) 4 byte header. -Print out sense information if -the command fails. -Be very careful with this command, improper use may -cause data corruption. +Print out sense information if the command fails. +Be very careful with this command, +improper use may cause data corruption: .Bd -literal -offset indent -camcontrol modepage da3 -m 1 -e -P 3 +camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e + -o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8 .Ed .Pp -Edit mode page 1 (the Read-Write Error Recover page) for da3, and save the -settings on the drive. +Edit mode page 1 (the Read-Write Error Recover page) for da3, +and save the settings on the drive. Mode page 1 contains a disk drive's auto read and -write reallocation settings, among other things. +write reallocation settings, among other things: +.Bd -literal -offset indent +camcontrol modepage da3 -m 1 -e -P 3 +.Ed +.Pp +Rescan all SCSI buses in the system for devices that have been added, +removed or changed: .Pp .Dl camcontrol rescan all .Pp -Rescan all SCSI buses in the system for devices that have been added, -removed or changed. +Rescan SCSI bus 0 for devices that have been added, removed or changed: .Pp .Dl camcontrol rescan 0 .Pp -Rescan SCSI bus 0 for devices that have been added, removed or changed. +Rescan SCSI bus 0, target 1, lun 0 to see if it has been added, removed, +or changed: .Pp .Dl camcontrol rescan 0:1:0 .Pp -Rescan SCSI bus 0, target 1, lun 0 to see if it has been added, removed, or -changed. +Set the number of concurrent transactions for da5 to 24: .Pp .Dl camcontrol tags da5 -N 24 .Pp -Set the number of concurrent transactions for da5 to 24. -.Bd -literal -offset indent -camcontrol negotiate -n da -u 4 -T disable -.Ed +Disable tagged queueing for da4: .Pp -Disable tagged queueing for da4. -.Bd -literal -offset indent -camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a -.Ed +.Dl camcontrol negotiate -n da -u 4 -T disable .Pp Negotiate a sync rate of 20MHz and an offset of 15 with da3. -Then send a -Test Unit Ready command to make the settings take effect. -.Bd -literal -offset indent -camcontrol smpcmd ses0 -v -r 4 "40 0 00 0" -R 1020 "s9 i1" -.Ed +Then send a Test Unit Ready command to make the settings take effect: .Pp -Send the SMP REPORT GENERAL command to ses0, and display the number of PHYs -it contains. -Display SMP errors if the command fails. -.Bd -literal -offset indent -camcontrol security ada0 -.Ed +.Dl camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a .Pp -Report security support and settings for ada0 -.Bd -literal -offset indent -camcontrol security ada0 -U user -s MyPass -.Ed +Send the SMP REPORT GENERAL command to ses0, +and display the number of PHYs it contains, +displaying SMP errors if the command fails: .Pp -Enable security on device ada0 with the password MyPass -.Bd -literal -offset indent -camcontrol security ada0 -U user -e MyPass -.Ed +.Dl camcontrol smpcmd ses0 -v -r 4 "40 0 00 0" -R 1020 "s9 i1" .Pp -Secure erase ada0 which has had security enabled with user password MyPass +Report security support and settings for ada0: .Pp -.Em WARNING! WARNING! WARNING! +.Dl camcontrol security ada0 +.Pp +Enable security on device ada0 with the password MyPass: +.Pp +.Dl camcontrol security ada0 -U user -s MyPass +.Pp +Secure erase the security enabled ada0 with user password MyPass. .Pp -This will +.Em WARNING ! WARNING ! WARNING ! +.Pp +The following command will .Em ERASE ALL data from the device, so backup your data before using! .Pp -This command can be used against an SSD drive to restoring it to -factory default write performance. -.Bd -literal -offset indent -camcontrol hpa ada0 -.Ed +This will restore a solid state drive +.Pq SSD +to factory default write performance: .Pp -Report HPA support and settings for ada0 (also reported via -identify). -.Bd -literal -offset indent -camcontrol hpa ada0 -s 10240 -.Ed +.Dl camcontrol security ada0 -U user -e MyPass .Pp -Enables HPA on ada0 setting the maximum reported sectors to 10240. +Report HPA support and settings for ada0 (also reported via identify): .Pp -.Em WARNING! WARNING! WARNING! +.Dl camcontrol hpa ada0 +.Pp +Enable HPA on ada0 setting the maximum reported sectors to 10240. +.Pp +.Em WARNING ! WARNING ! WARNING ! .Pp -This will +The following command will .Em PREVENT ACCESS -to all data on the device beyond this limit until HPA is disabled by setting -HPA to native max sectors of the device, which can only be done after a -power-on or hardware reset! +to all data on the device beyond this limit until HPA is disabled +by setting HPA to native max sectors of the device, +which can only be done after a power-on or hardware reset! .Pp .Em DO NOT -use this on a device which has an active filesystem! -.Bd -literal -offset indent -camcontrol persist da0 -v -i read_keys -.Ed +use this on a device which has an active filesystem: .Pp -This will read any persistent reservation keys registered with da0, and -display any errors encountered when sending the PERSISTENT RESERVE IN -.Tn SCSI -command. -.Bd -literal -offset indent -camcontrol persist da0 -v -o register -a -K 0x12345678 -.Ed +.Dl camcontrol hpa ada0 -s 10240 .Pp -This will register the persistent reservation key 0x12345678 with da0, -apply that registration to all ports on da0, and display any errors that -occur when sending the PERSISTENT RESERVE OUT command. -.Bd -literal -offset indent -camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac -.Ed +This will read any persistent reservation keys registered with da0, +and display any errors encountered when sending the +PERSISTENT RESERVE IN SCSI command: .Pp -This will reserve da0 for the exlusive use of the initiator issuing the -command. +.Dl camcontrol persist da0 -v -i read_keys +.Pp +Register the persistent reservation key 0x12345678 with da0, +apply that registration to all ports on da0, +and display any errors that +occur when sending the PERSISTENT RESERVE OUT command: +.Pp +.Dl camcontrol persist da0 -v -o register -a -K 0x12345678 +.Pp +Reserve da0 for the exclusive use of the initiator issuing the command. The scope of the reservation is the entire LUN. -Any errors sending the PERSISTENT RESERVE OUT command will be displayed. -.Bd -literal -offset indent -camcontrol persist da0 -v -i read_full -.Ed +Any errors sending the PERSISTENT RESERVE OUT command will be displayed: .Pp -This will display the full status of all reservations on da0 and print out -status if there are any errors. -.Bd -literal -offset indent -camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac -.Ed +.Dl camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac +.Pp +Display the full status of all reservations on da0 +and print out status if there are any errors: +.Pp +.Dl camcontrol persist da0 -v -i read_full .Pp This will release a reservation on da0 of the type ex_ac -(Exclusive Access). +.Pq Exclusive Access . The Reservation Key for this registration is 0x12345678. -Any errors that occur will be displayed. +Any errors that occur will be displayed: +.Pp +.Dl camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac +.Pp +Register the key 0x12345678 with da0, +specifying that it applies to the SAS initiators +with SAS addresses 0x1234567812345678 and 0x8765432187654321: .Bd -literal -offset indent camcontrol persist da0 -v -o register -K 0x12345678 -S \e -I sas,0x1234567812345678 -I sas,0x8765432187654321 .Ed .Pp -This will register the key 0x12345678 with da0, specifying that it applies -to the SAS initiators with SAS addresses 0x1234567812345678 and -0x8765432187654321. -.Bd -literal -offset indent -camcontrol persist da0 -v -o register_move -k 0x87654321 \e - -K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678 -.Ed -.Pp -This will move the registration from the current initiator, whose -Registration Key is 0x87654321, to the Fibre Channel initiator with the +Move the registration from the current initiator, +whose Registration Key is 0x87654321, +to the Fibre Channel initiator with the Fiber Channel World Wide Node Name 0x1234567812345678. A new registration key, 0x12345678, will be registered for the initiator -with the Fibre Channel World Wide Node Name 0x1234567812345678, and the -current initiator will be unregistered from the target. +with the Fibre Channel World Wide Node Name 0x1234567812345678, +and the current initiator will be unregistered from the target. The reservation will be moved to relative target port 2 on the target device. -The registration will persist across power losses. +The registration will persist across power losses: .Bd -literal -offset indent -camcontrol attrib sa0 -v -i attr_values -p 1 +camcontrol persist da0 -v -o register_move -k 0x87654321 \e + -K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678 .Ed .Pp -This will read and decode the attribute values from partition 1 on the tape -in tape drive sa0, and will display any -.Tn SCSI -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rz -P summary -.Ed +Read and decode the attribute values from partition 1 on the tape +in tape drive sa0, and will display any SCSI errors that result: .Pp -This will request the SMR zone list from disk da0, and print out a -summary of the zone parameters, and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rz -o reset -.Ed +.Dl camcontrol attrib sa0 -v -i attr_values -p 1 .Pp -This will request the list of SMR zones that should have their write -pointer reset from the disk da0, and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol zone da0 -v -c rwp -l 0x2c80000 -.Ed +Request the SMR zone list from disk da0, and print out a summary +of the zone parameters, and display any SCSI or ATA errors that result: .Pp -This will issue the Reset Write Pointer command to disk da0 for the zone -that starts at LBA 0x2c80000 and display any -.Tn SCSI -or -.Tn ATA -errors that result. -.Bd -literal -offset indent -camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s -.Ed +.Dl camcontrol zone da0 -v -c rz -P summary .Pp -Set the timer for the Idle_a power condition on drive -.Pa ada0 -to 60.1 seconds, enable that particular power condition, and save the timer -value and the enabled state of the power condition. -.Bd -literal -offset indent -camcontrol epc da4 -c goto -p Standby_z -H -.Ed +Request the list of SMR zones that should have their write pointer reset +from the disk da0, and display any SCSI or ATA errors that result: +.Pp +.Dl camcontrol zone da0 -v -c rz -o reset +.Pp +Issue the Reset Write Pointer command to disk da0 for the zone that +starts at LBA 0x2c80000 and display any SCSI or ATA errors that result: +.Pp +.Dl camcontrol zone da0 -v -c rwp -l 0x2c80000 +.Pp +Set the timer for the Idle_a power condition on drive ada0 to +60.1 seconds, enable that particular power condition, +and save the timer value and the enabled state of the power condition: +.Pp +.Dl camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s .Pp -Tell drive -.Pa da4 -to go to the Standby_z power state (which is -the drive's lowest power state) and hold in that state until it is -explicitly released by another +Tell drive da4 to go to the Standby_z power state +.Pq the drive's lowest power state +and hold in that state until it is explicitly released by another .Cm goto -command. -.Bd -literal -offset indent -camcontrol epc da2 -c status -P -.Ed +command: +.Pp +.Dl camcontrol epc da4 -c goto -p Standby_z -H .Pp -Report only the power state of -drive -.Pa da2 . +Report only the power state of drive da2. Some drives will power up in response to the commands sent by the .Pa status subcommand, and the .Fl P option causes .Nm -to only send the -.Tn ATA -CHECK POWER MODE command, which should not trigger a change in the drive's -power state. -.Bd -literal -offset indent -camcontrol epc ada0 -c list -.Ed +to only send the ATA CHECK POWER MODE command, +which should not trigger a change in the drive's power state: +.Pp +.Dl camcontrol epc da2 -c status -P .Pp -Display the ATA Power Conditions log (Log Address 0x08) for -drive -.Pa ada0 . +Display the ATA Power Conditions log (Log Address 0x08) for drive ada0: +.Pp +.Dl camcontrol epc ada0 -c list +.Pp +Set the timestamp of drive sa0 using a +.Xr strptime 3 +format string followed by a time string +that was created using this format string: .Bd -literal -offset indent camcontrol timestamp sa0 -s -f "%a, %d %b %Y %T %z" \e -T "Wed, 26 Oct 2016 21:43:57 -0600" .Ed -.Pp -Set the timestamp of drive -.Pa sa0 -using a -.Xr strptime 3 -format string followed by a time string -that was created using this format string. .Sh SEE ALSO .Xr cam 3 , .Xr cam_cdbparse 3 , From nobody Tue Dec 23 13:58:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbGnv5FYYz6LS7X for ; Tue, 23 Dec 2025 13:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbGnv4QZpz4G4f for ; Tue, 23 Dec 2025 13:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766498339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ic7sOSRzaOgRmFrv2FHmR5OxX1Hc45vx6m+6cvhB7k=; b=cUzs16capk2ApYAxQIbTW5/I/F05FxGkhFVAFNgUW9a0XKv617nncES8J0wW8DxK/1lQ6N dIOog004ykaZoRil90oI2fafEyt0qfnNfy23YX16Xe0S7xpZbul/FHUfbw+eq/S5sqMAdd 6sB61gOA0irwpbjyB2Yw+wztnK/YmvX6xGfb/T0PxpGj9JO0VOdOfjfSizU6ZN6x4/ftW6 kWOQDXZRDks7QjaxYXqOiHe6kOr3Jhl+wUBUqYotMOgznGhxmyoWj9nYDerFTs1/sgOLOv cnUzAmgsF+atp1dyvwD5ARiGQtW1cR1CpCybGsGBNuPStHTzgnterAGBLDh1Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766498339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ic7sOSRzaOgRmFrv2FHmR5OxX1Hc45vx6m+6cvhB7k=; b=EGBzWTJuV/3ojI8Mek2MNBUhFfDM1/2y2uwS1RZ/xIqO5YvBp/xjLoIiXxIzanEyvW+dYb SNj9N1c/vbQMwPESyrdWQr7VWl0t+KT9kt3hx3cGtMURRJ7JXSyPu7hnPz6BXda+2Obcqx UcJbcSMzkAqGIwqLc1dJ7F7Qo3sQBs3u0zwnKp8D9KcgW4YQs0mamDrot6lbf87QUPJDus 5NIJnpaAWSdXWlY0shZjCFSkQLd8fOMCxGOrdxJKb+Gq0zCDRZ4G+YoEOQtGouZ68qknai nm1BQx5LcDn/iQt5/qIbNgaFkQNbXmtjvFIw6vFxJg3Xd/tJdbeii4rXIl3QDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766498339; a=rsa-sha256; cv=none; b=u7TGuIRJajoiyn8tdSJaNxqCEy1y0hebGN+/EPnSaSpqUL/jsyzIs/7MIMdY06Uy/ADxIm 3QzH8OkFsQWozO+p5bo3EOOnwVpgoWZfY9Zj07hquhs0pXYsFBRsl3UOYEwSIQxFT0FsrE 5Z3Z2zKhdhRks74zYMNka4XBx6hsbQQ2DuMvIFbTNHByK9pm4FBnTKuDi3/6z+e/QGIMsz f8gdVzcPrfF209tI54wYRYug7C/lJpKWPUWo1x/k3UphXtVOneDqxSQUgHg1kmsiiDsIuZ kBz4Supf7/ZzTez5rmDB1eDrM5DjXOV1CtSm2P009M6GA60MaFt9SpaXAX8loA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbGnv3zF4z1DJJ for ; Tue, 23 Dec 2025 13:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37958 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 13:58:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 03752041e41b - main - cdce.4: Minor polish List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03752041e41b57af622f3649929789575a48258e Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 13:58:59 +0000 Message-Id: <694aa023.37958.4ee1039@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=03752041e41b57af622f3649929789575a48258e commit 03752041e41b57af622f3649929789575a48258e Author: Alexander Ziaee AuthorDate: 2025-12-23 13:52:13 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 13:54:21 +0000 cdce.4: Minor polish + Tag spdx license identifier + Fix "e.g.,"s to quiet linter + Remove useless Nd quoting + Put example in EXAMPLES MFC after: 3 days --- share/man/man4/cdce.4 | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 8c5dbb36d197..266d87bca079 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2004 Daniel Hartmeier .\" All rights reserved. .\" @@ -27,12 +30,12 @@ .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" -.Dd May 26, 2025 +.Dd December 23, 2025 .Dt CDCE 4 .Os .Sh NAME .Nm cdce -.Nd "USB Communication Device Class Ethernet (CDC ECM/NCM) driver" +.Nd USB Communication Device Class Ethernet (ECM/NCM) driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -46,7 +49,7 @@ kernel configuration file: .Cd "device cdce" .Ed .Pp -Mobile Devices (eg. Huawei E3372, E5573 and others) +Mobile Devices (e.g., Huawei E3372, E5573 and others) may need additionally the u3g command port: .Bd -ragged -offset indent .Cd "device ucom" @@ -83,17 +86,6 @@ received and transmitted over separate USB bulk transfer endpoints. The .Nm driver does not support different media types or options. -.Pp -Mobile -.Nm -Network Devices may need a connect command sequence via u3g -serial command port before they activate the NCM/ECM/ACM network -interface. -For example: -.Dl echo 'AT^NDISUP=1,1,"internet"' > /dev/cuaU[0].0 -where -.Dq internet -is your providers apn name. .Sh HARDWARE The .Nm @@ -113,8 +105,21 @@ Sharp Zaurus PDA .It Terayon TJ-715 DOCSIS Cable Modem .It -Huawei 3G/4G LTE (eg. E3372, E5573) and other mobile network devices +Huawei 3G/4G LTE (e.g., E3372, E5573) and other mobile network devices .El +.Sh EXAMPLES +Mobile +.Nm +Network Devices may need a connect command sequence via the +.Xr u3g 4 +serial command port before activating the NCM/ECM/ACM network interface. +For example: +.Pp +.Dl echo 'AT^NDISUP=1,1,"internet"' > /dev/cuaU[0].0 +.Pp +Wwhere +.Dq internet +is your providers apn name. .Sh DIAGNOSTICS .Bl -diag .It "cdce%d: no union descriptor" From nobody Tue Dec 23 13:59:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbGnw6sl1z6LSHD for ; Tue, 23 Dec 2025 13:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbGnw4y8Hz4G2N for ; Tue, 23 Dec 2025 13:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766498340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9pbmCBuU7SQ6E7T0vcQWrt9F+zBHTe92bcfBLhZHQw=; b=t2WjRBji2Nh1j+xNCoOfv9AAQQe37uCJQSKtaz9EUXUiFYygUl9U3r+97KmzrL8LMO4c1w 8C6xifxT4JVKMC32g8VG3S9c7xtS2A0aYtP1q0QWuRxPMgmsfKfigPkq7P2xvqMUb2an/+ XSKJzMD55NBQrZV4/yus2Gx44hSYl/SKjVutR231ZbVj8r/yqjyIphvRn9G+fCJvFe9siK MdSxKIcKJZhCl+g1Y1OBN5i1oBSiGnm6OVi7QDdV3Erg+52pTiqZoY34RVCiCT/pqLcnWV J3H1yxrvJpeshiZJCI0p5FmSaw0sDZjXoBMybKm6jiKJuqk6p9MmyPY/F2kcEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766498340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9pbmCBuU7SQ6E7T0vcQWrt9F+zBHTe92bcfBLhZHQw=; b=XVAOfz/INEeszIZd12ASzkLydJO55DSy08BwVxEzQ1Xxd6NqKFxc/SG9mvrXRV7UJb2b68 EGbVdq5ozyMlHgZSm5oEFtvV4iQUIV0p9DELFtMgr6VhvD2Fpnguw4XE8mzVN8lOYLTZ88 MthFDBb0KnZHtmyG4RJSR8CeaboExIj2X7pGI9jilK8hWbct9Z1QgC6dN2xgBEK5/mTMOe glTMok8I9+2Dyf7MzwJ6Zy7j78+lHJDz4tOf/l8u7LKNQJoH7NzzL9iPgZFI7JyJK2Bvdz CT57Tq+4vUbLPwaYigvo2LzgQWZKI3pVRO6GZr1PZC7W5bDKkRYed3EZdkQ82Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766498340; a=rsa-sha256; cv=none; b=b/f2CuaosTp0vH7d+32CfiHjAvMb4UzCpSs44OcxQ8xE1QRMlTvdg09pdZkQBwbiO+tCqv SeXuMCDiCXTofbVXMWMSEyVGBqpZRf/x9AQ16xK3bpLyzAYLoRk8NPxVFOjDcaZvOH4Mbv RjsLGCscR0Tp0ZDrlcWqM4YgOASFmKKlWahMvmP+Hm1Zdx/XK6HU/RIZhIMvKEVDe/1hwY 0uF748+/oCZB2vygXTyP8kV3tPeymgPyQ2rr73bAQskrJUCwh7mu2XeuxShJnQPNTnI08N nkB8GOIEHyEqSvNdWPfVkD8qkvdA7vNWoe2o3rNwncqLnG7zjfRwVSE4/VcNZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbGnw4Kfvz1DJK for ; Tue, 23 Dec 2025 13:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39d4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 13:59:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: f7245a27e86c - main - cdce.4: Add RTL8153 to HARDWARE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7245a27e86c4c0012c8fb32c11bc4fdfbe64b62 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 13:59:00 +0000 Message-Id: <694aa024.39d4d.785cdcd6@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f7245a27e86c4c0012c8fb32c11bc4fdfbe64b62 commit f7245a27e86c4c0012c8fb32c11bc4fdfbe64b62 Author: Alexander Ziaee AuthorDate: 2025-12-23 13:55:57 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 13:55:57 +0000 cdce.4: Add RTL8153 to HARDWARE Fixes: 1b1fb628a1af (Quirk Realtek RTL8153 to config#1) --- share/man/man4/cdce.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 266d87bca079..3f1d9200c7f2 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -99,7 +99,9 @@ Android USB tethering .It iPhone USB tethering .It -Prolific PL-2501 Host-to-Host Bridge Controller +Realtek RTL8153 USB 3.0 to Gigabit Ethernet controller +.It +Prolific PL-2501 Host-to-Host Bridge controller .It Sharp Zaurus PDA .It From nobody Tue Dec 23 14:12:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbH506nmmz6LTw9 for ; Tue, 23 Dec 2025 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbH504FHfz4Hn8 for ; Tue, 23 Dec 2025 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766499124; h=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=weGbsH4n02w4qM9V08NsGDcrmCCOmNB/dxsT4g77L4U=; b=vcYCauXFkBAZP/h3ZGY1YoqcsmHkLd9Hx/5Y+Mq0zRCZECyEn/t27XHBkGi1IkundTFdWi 0oZUYxhnJ+pXMyYwr7MafFbEPElOZk0TQUOiq/TyAzaRLgC3x3a71cQ2c0gul4tJNDew9u XAGvNVuTyraq9NAydO1nHek3kozKNxsulGAJfN9MHz3+5fm0aED5jITSrbqa4axn/GV+du EsaR8Bfff6MAtuuyW6BCyCL/CALu4v089XUt5jEx9IVC6c/8BBaAsSjrFeDN3qSmwMmWuN NZMi7p/f12scl7GdhvsgjoC1HHzMks0PH1Pl6+RjmXbxkxJjXdYkhdog2HIu7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766499124; h=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=weGbsH4n02w4qM9V08NsGDcrmCCOmNB/dxsT4g77L4U=; b=SplQST7qrEtsg53bAQBJu3cc8XZeo9neQtW1CdcuqzEjYTBvYPyGSlyqhzH+tdKnuO94xa /uFJ49+kEPOJDxJeNwlG1Hn7cv5eLUt+SzC1BiT8jDKFE835H8WLzRBuqJQiowtvGEAY2X fpy9VcQbZuHkSTPqWZwSYoI1sUh7CJW6PzkfHCEbQWN4OLH217ENxTLtPnABxrA5VdJsd5 BCFXxgdJ83ayQAJYZA7jKR6PPzDWuxBI2+hkpDRPUywGC4+xWkpUuFoSP78m1qJdKVfUNg 8WSIBhiNr5n7RJFaxDTwOMpPc2+jzNpRzx3xFcQea2FnXsOXiHM0G55yIR4yCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766499124; a=rsa-sha256; cv=none; b=KiQ2za1uHDR4CLHfGA7iUZA3cXQl3wJ0Q+30cbd7tMEgDMdXA/tLYwAnXYIaAlqiNOHOCv ynD+ty8mwU557x9+J2uuA3TCGU11ACFfapopYS/VHUKuZNC9RryP6cqtcAjnzuYCZymIzi Y3qrdN+ewnHMNsQLiC3APSOiw+R2lbQ+M8cIBdizrWtajna5i6PFv0RMJsts/THTnYzYvZ vRd9QAci3ncDmUt1SAWWKTq031drhjrR6xL3Thc0PPbBS6vrzP5Gqaizb+lrKg/Mep4eLi qpfL9sA1lA8j4ip0RjuZvW9RG6ncfZcWAr58CmGt36Y850wCgeCxou+jbVFRdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbH503qb7z1F1v for ; Tue, 23 Dec 2025 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a537 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 14:12:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: =?utf-8?Q?Pawe=C5=82?= Krawczyk From: Alexander Ziaee Subject: git: c6cddb8a5b0e - stable/14 - at cron file is now in /etc/cron.d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6cddb8a5b0ea73a0d545feed59dfe62aa568344 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 14:12:04 +0000 Message-Id: <694aa334.3a537.7696edc5@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c6cddb8a5b0ea73a0d545feed59dfe62aa568344 commit c6cddb8a5b0ea73a0d545feed59dfe62aa568344 Author: Paweł Krawczyk AuthorDate: 2024-05-10 04:21:18 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 14:11:30 +0000 at cron file is now in /etc/cron.d PR: 243380 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1106 (cherry picked from commit 783baf00128f6cf6fc08404eaad6a11b29d4025d) --- libexec/atrun/atrun.man | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man index 1f49ad9fbb37..766953ef015d 100644 --- a/libexec/atrun/atrun.man +++ b/libexec/atrun/atrun.man @@ -16,7 +16,7 @@ runs jobs queued by The system .Xr crontab 5 file -.Pa /etc/crontab +.Pa /etc/cron.d/at must contain the line .Bd -literal */5 * * * * root /usr/libexec/atrun From nobody Tue Dec 23 14:13:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbH7811jFz6LTwJ for ; Tue, 23 Dec 2025 14:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbH780FWRz4JfQ for ; Tue, 23 Dec 2025 14:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766499236; h=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=2Qc+7fun8CrHvFn8Tj5BgdHZ4UsJk3fOYZegGsKuQ0g=; b=swPkqeQUYAKiUtYBcvj7AFTU6Hv/qxlxwhAvedbgmlFgJpVZk5NYdrC3a7PuAvqkV1yQO3 FKt0V5Wx/P2vFiKYnto3rJQWgf0r1s8qW6u9WPlyxaAYoIk8dKJBqraZsSP1PaN2CWJCdO 7yoXpjzIUEQGeL3ToEsUpA5mxLVA1K3Ot3cDXAiNJUy97RBg2Pm6kUzRIOhvx08+xbrl6S 5PqSUAWrDWl8oYZ2Wa+oLVoUtIZ0Ns0TWvlB+dhziw/Nb/WtCDWhh4HkF/uNNhRe5cP2jU JpStt+N79YaWKfjT6zFrZ5rtB8+8WR1JY+guDoTbnDH9gIK+6H29l605mCyrXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766499236; h=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=2Qc+7fun8CrHvFn8Tj5BgdHZ4UsJk3fOYZegGsKuQ0g=; b=jBUza4rZZhYQZ5Sre7EHcd+nVgWmADIewQMFQP7crTrn4YhhB2/WlvB0ZsJW5Z35JxTFBl 6RDvgKavtaPTVMZMFz/IVQKGjJhWvEVNeX1su0zZtxwM9pRys4zv7fiXSs/7kH6EabUEdf 5OZjGLA7z/pj7+bmwQo9NBrcIhU20s6WdhfG66UUW4PLq8yq6PyVWw+ZN9hJernR5s2ldo N1/lvOJduFhFVIABmIkS685K9m8OAsU1ivYwMFkzLldN3Wx5AX8B58gXGS12Y4KffcwvbT TGz8yW5dwtf7q0IPc7DD9MKAm9VCdN/s426eahGH/zRZBr8XuF+2MiN/hDcwIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766499236; a=rsa-sha256; cv=none; b=xVQdnJ8QjPWFQT2pFIENlDNnfkMsDJMFuMJNmO/NoFAmqUkW1XD7kmRqkXZ+mQQHiqpioA NCp2pOU65qR1O3gu4VdApoOfv2z9XXzQiNaWjAkAX+X1zsLasRbuoUL+pGRM9lm/oTaq16 lHm/mpIMmEw1ZlDUbBzBQGp0jqqi4goiZykuBeWIVaxyTJSEeZ43JnIQ6qTSb071q2a8Py jw81xQyccpWRnaMmgw8MS2ZtDYjUGY1z4/ysZG39g1Bxb8IpOCA8Eo87o8KcRn5kfJ4XoW 3tHOeoDARd1phG0/fjP/C/B9nn4kY21WIIzGdjr7fM9Ijq50w2rp6vhk9Xq1QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbH776tNKz1F4J for ; Tue, 23 Dec 2025 14:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bcde by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 14:13:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: =?utf-8?Q?Pawe=C5=82?= Krawczyk From: Alexander Ziaee Subject: git: 7eb5a5b111e9 - stable/13 - at cron file is now in /etc/cron.d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/13 X-Git-Reftype: branch X-Git-Commit: 7eb5a5b111e90c374bec1166b16d52b367d3ec03 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 14:13:55 +0000 Message-Id: <694aa3a3.3bcde.422968d9@gitrepo.freebsd.org> The branch stable/13 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb5a5b111e90c374bec1166b16d52b367d3ec03 commit 7eb5a5b111e90c374bec1166b16d52b367d3ec03 Author: Paweł Krawczyk AuthorDate: 2024-05-10 04:21:18 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 14:13:25 +0000 at cron file is now in /etc/cron.d PR: 243380 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1106 (cherry picked from commit 783baf00128f6cf6fc08404eaad6a11b29d4025d) --- libexec/atrun/atrun.man | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man index 1f49ad9fbb37..766953ef015d 100644 --- a/libexec/atrun/atrun.man +++ b/libexec/atrun/atrun.man @@ -16,7 +16,7 @@ runs jobs queued by The system .Xr crontab 5 file -.Pa /etc/crontab +.Pa /etc/cron.d/at must contain the line .Bd -literal */5 * * * * root /usr/libexec/atrun From nobody Tue Dec 23 14:40:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbHk81YXFz6LWgg for ; Tue, 23 Dec 2025 14:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbHk80sw8z4Mt8 for ; Tue, 23 Dec 2025 14:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766500848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+eitQ2GZSiUFqYRp6kUmZFCbragWwTGnLSp/5nhDu28=; b=lwq/1yjLMm1gf2wTdGMrKs8MO5A8rJoGfUYHTvqL26mAnJvq154xjmvy/0p+vYoC+bgCS/ apm6dm+omGbd6jI242kwcG3369eIvcMVLxrjQlURQo6YEJl5qEys2mQUq0EjZnHOuhdyEi qYEgDAZzbeMu1QW2EGpzM1WULH7hi+HSo570Y028rGWXLO0yaidIxALXmOKctKORzla9UF ac6OJ8tvrX+VJKtI790x8raxx8Y+3bZNCfx9fEB9PlUJbwz/9PXzWxOIq+WSthiCMkDbTy HXsMAOxY01nYkOe8If4FLoxsEYrb/LvP4QkEe2cFM2mkwNbj0eMy50SNgSfmzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766500848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+eitQ2GZSiUFqYRp6kUmZFCbragWwTGnLSp/5nhDu28=; b=APpI9qUZWeJQrAD0W5cTwd6pur8zAXIzUS5cVRPYquVsiHufkqvsr/5pi5EBpTsGb38SB1 Xa8a5sns2VQmy3FbVGSDVwRhsshgeGXjRMpUuhC974+XjIdyXn1KxqKgZs4LLQIqUgjAiQ aBJHvXOO+uLguW5wIJkVRbQBz1ZAMqZ4RN8k5+mN4q6KRthvOTzB6k31rtCwBR7vN5V4IJ i3akIlf+LE788awDArDwF9Xq993TRSUS7pqF88UY+DjmJ5TEAG3vpXoPgbFJyRLstqEcjK 0fTq2uhUvNRA0lu8DjGMlWTSXOZtyMBK1d9tkrmC+3O4isvhXJfxvgbq92J0RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766500848; a=rsa-sha256; cv=none; b=CBySAw6AtbfwH/W/OXKOXvtRAOcF3CRsL7w4/cEkwO33UJ+QubPKS4Qa0NewQ5lI+GHzod oX8hqZ1jDWDFLJTDuXttTwd22Gd4vyrtHY9dI8cDRD0NZ7m5PEq15lHFUJGYHKmZsQk/td VNr5IRxxm3KUjuHiRrsr8NiqG4wEXHW4ou7S3V8Q/VgEZpo+TEq77IWW435145pp55DYsX SxVMoJZrZXvprx68VPYyMgFwIZXwlkA32XW/selcb1ITBsniNpBMBLcba8LhgWE7soBW07 cFEWkcpjxfop4WN8ckTBNm7fmnXVZuzHM962Zo1Pst6T9rhvrzoGf9fdil0GxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbHk76yP3z1FTL for ; Tue, 23 Dec 2025 14:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e977 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 14:40:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 97fa62708f67 - main - udl.4: Consolidate HARDWARE and add HISTORY List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97fa62708f67ce189bde22c98d9102da026b448c Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 14:40:47 +0000 Message-Id: <694aa9ef.3e977.186ee0b2@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=97fa62708f67ce189bde22c98d9102da026b448c commit 97fa62708f67ce189bde22c98d9102da026b448c Author: Alexander Ziaee AuthorDate: 2025-12-23 14:35:37 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 14:40:31 +0000 udl.4: Consolidate HARDWARE and add HISTORY Some of the information needed for the HARDWARE section was the entire DESCRIPTION section, so merge the two. While here, add the HISTORY of this driver, add "driver" to the document description matching other drivers, and tag the SPDX license identifier for mechanical parsing. MFC after: 3 days --- share/man/man4/udl.4 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/share/man/man4/udl.4 b/share/man/man4/udl.4 index b2cfeba2489c..c9a1a1c40045 100644 --- a/share/man/man4/udl.4 +++ b/share/man/man4/udl.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: ISC +.\" .\" $OpenBSD: udl.4,v 1.20 2012/09/18 17:11:41 jasper Exp $ .\" .\" Copyright (c) 2009 Marcus Glocker @@ -14,12 +17,12 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd September 9, 2023 +.Dd December 23, 2025 .Dt UDL 4 .Os .Sh NAME .Nm udl -.Nd DisplayLink DL-120 / DL-160 USB display devices +.Nd DisplayLink DL-120 / DL-160 USB display device driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -35,13 +38,11 @@ module at boot time, place the following line in .Bd -literal -offset indent udl_load="YES" .Ed -.Sh DESCRIPTION +.Sh HARDWARE The .Nm -driver supports USB display devices based on the DisplayLink DL-120 / DL-160 -graphic chip. -.Sh HARDWARE -The following devices should work: +driver supports USB display devices +based on the DisplayLink DL-120 / DL-160 graphic chip, including: .Pp .Bl -tag -width Ds -offset indent -compact .It Century Corp. Japan Plus One LCD-8000U @@ -66,3 +67,10 @@ The following devices should work: .El .Sh SEE ALSO .Xr usb 4 +.Sh HISTORY +The +.Nm +driver appeared in +.Ox 4.6 +and +.Fx 11.0 . From nobody Tue Dec 23 14:59:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbJ7L4Rvgz6LY19 for ; Tue, 23 Dec 2025 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbJ7L3tGTz4Pn5 for ; Tue, 23 Dec 2025 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766501950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8WnJLP5oL1d9/SgtsyAZyQx0N7chdQhDeEZFBkx1a04=; b=t8ZWvxyF5eVWrAv7Os78RLxAvrIH1socehN86PGDtx3BHS4sBO2GzkcUwM7x4nNsNEXGDW 2KgvRn4JoHu+Uyj8yjO2aSuZjHNzvP9FJkog0hZ5Cl8+fU/Egz4QuMwbt1i1HK1gi/nv16 +JZ7iRIMpRLVuCMiVMCYykuvcpZViviWSYatMWf43x9pzQm+fJDhEyJEcQXbGV56414ehp 4lfqLNULDu7ziaDXJpFuW5SqOFNmda2/YtUmEdDQ5/uP2JXY1HUmF15TFrzwgVhUlvqhYm 3k8PHaAIbpUqWNO0ROdtyO6FzFOy71ejLRh3m2xBtaaJ+M6lDvJ0Nyq+3o0T4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766501950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8WnJLP5oL1d9/SgtsyAZyQx0N7chdQhDeEZFBkx1a04=; b=K/glITN1GXn68De0NPvjmKBn3iQlsDxfqIjh4QriD4sqdCeIAOu/V213IXNjVOfKjxySGa du2zQ69vGUK0lmAMckMI3tpOm8NPtckPJEs8bp++dEPQ/0oskubZLbfzVrHOzRM7VHXkRl CvTeihUJF+nP9gEUOE9CZ9ybHQ7YhYKdo4cVRqk0xRJi7Zuvr2H9/PMSDu+tqZQoUz+yGq ZMW+A8Wo9+ItT9hsSqBgwXTwFt1MTmo2Xmt/ovrzVKcsXBWGVHPEpPTwxgYZPEVigoe82S q8OxKBUSdm4zjAjkqko7blI83KOBqiBw0MqlAFMYhGThnEkcF1MZFP+7C0M5qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766501950; a=rsa-sha256; cv=none; b=I46RwBkmcWYsuE8AdUU0jM1bLsGNXgpzMUoXS891GLl2NuimDon6q4HDQxkBE4Es42AaO9 Pv+2/bYoDNIYn4l4vUhvD3ojA4687d9dagdkGU+OxDRWroqyo7Rey9HIi77NC7mqOHC+Kx 4JzUEYB7iVrv14AKJI2qFJGl/dZ6+QfWxDhxY6W3QXfzKrA1fOOyr+Bit9I4d7P4G3UQLp B0b2/HS79bn7v89tBhst3spb1k+b8TWbQac1NjD6O7v7O3d5qsgISdj1z8njTY/qpylqly 4RsGnBOphY33IGcCgz0YN6QmoVYhE3Ugjl6GMjfDLu/4ZRJL6cK1pD8SBgerJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbJ7L39j1z1FmL for ; Tue, 23 Dec 2025 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e6d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 14:59:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 3c83b5d340f6 - main - udl.4: Tweak HARDWARE for hardware release note List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c83b5d340f641259ea24e8af623e340eb8a21cc Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 14:59:10 +0000 Message-Id: <694aae3e.3e6d5.23d416f0@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3c83b5d340f641259ea24e8af623e340eb8a21cc commit 3c83b5d340f641259ea24e8af623e340eb8a21cc Author: Alexander Ziaee AuthorDate: 2025-12-23 14:56:09 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-23 14:56:09 +0000 udl.4: Tweak HARDWARE for hardware release note Fixes: 97fa62708f67 (udl.4: Consolidate HARDWARE and add HISTORY) --- share/man/man4/udl.4 | 61 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/share/man/man4/udl.4 b/share/man/man4/udl.4 index c9a1a1c40045..eab17302d5a4 100644 --- a/share/man/man4/udl.4 +++ b/share/man/man4/udl.4 @@ -42,28 +42,47 @@ udl_load="YES" The .Nm driver supports USB display devices -based on the DisplayLink DL-120 / DL-160 graphic chip, including: +based on the DisplayLink DL-120 and DL-160 graphic chips, including: .Pp -.Bl -tag -width Ds -offset indent -compact -.It Century Corp. Japan Plus One LCD-8000U -.It Century Corp. Japan Plus One LCD-4300U -.It DisplayLink USB to DVI -.It ForwardVideo EasyCAP008 USB to DVI -.It HP USB 2.0 Docking Station (FQ834) -.It HP USB Graphics Adapter (NL571) -.It IOGEAR USB 2.0 External DVI (GUC2020) -.It Koenig CMP-USBVGA10 and CMP-USBVGA11 -.It Lenovo 45K5296 USB to DVI -.It Lenovo ThinkVision LT1421 -.It Lilliput UM-70 -.It Nanovision MiMo UM-710 and UM-740 -.It Rextron VCUD60 USB to DVI -.It Samsung LD220 -.It StarTech CONV-USB2DVI -.It Sunweit USB to DVI -.It Unitek Y-2240 USB to DVI -.It VideoHome NBdock1920 -.It i-tec USB 2.0 Docking Station (USBDVIDOCK) +.Bl -bullet -compact +.It +Century Corp. Japan Plus One LCD-8000U +.It +Century Corp. Japan Plus One LCD-4300U +.It +DisplayLink USB to DVI +.It +ForwardVideo EasyCAP008 USB to DVI +.It +HP USB 2.0 Docking Station (FQ834) +.It +HP USB Graphics Adapter (NL571) +.It +IOGEAR USB 2.0 External DVI (GUC2020) +.It +Koenig CMP-USBVGA10 and CMP-USBVGA11 +.It +Lenovo 45K5296 USB to DVI +.It +Lenovo ThinkVision LT1421 +.It +Lilliput UM-70 +.It +Nanovision MiMo UM-710 and UM-740 +.It +Rextron VCUD60 USB to DVI +.It +Samsung LD220 +.It +StarTech CONV-USB2DVI +.It +Sunweit USB to DVI +.It +Unitek Y-2240 USB to DVI +.It +VideoHome NBdock1920 +.It +i-tec USB 2.0 Docking Station (USBDVIDOCK) .El .Sh SEE ALSO .Xr usb 4 From nobody Tue Dec 23 17:04:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbLw108t8z6Ll40 for ; Tue, 23 Dec 2025 17:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbLw06fHdz3TJN for ; Tue, 23 Dec 2025 17:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766509472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nnHrTrNwGPREEZOHSwQb3hnu+rBrH/LE2kFq9BUgSSg=; b=crHG0wUk5neJnN3hTc9X5G7MXhpKjvqICjAw9MBYb+ooAzalDk9A3dyJ/tS6OOtfG8l/JP Wiyskk7F12qZNCRZR0ws2qi2X4vbEFJCa0N8JSdC4DwQFo9OeH3qUHYTehpME5Gk4aeNIb 1ODTxo2o66LphJCDCRUP9yQ227AaTK3ly5EL+mXcgQzzf+9FfyHb62yCcXzsVp/lySFG+0 m6HHsDA1T2KByloeQN6Bq1HlxnJOnguPttLAjKnsK6kFTo9USm1twed1JRlXUzfd2S1jcE 3AqzTqzAbJvihfRAcFHI865y1/03m/VGU6kgB9qZ+DEubx9cxLb/ChFM8zPGGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766509472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nnHrTrNwGPREEZOHSwQb3hnu+rBrH/LE2kFq9BUgSSg=; b=DnHpYoCEuXIUew42n2wZ0k1sc1QjU1Kd+GT16i0e0LY5Gy6rlyXJT7PIC1L1L8tEXnTTyI VMxXDpxZpBLagrJtEOnAXdDpOxEeOhwUSq+lnP48sI4DiSyAHoWvGIPHyv0/zJo/RpQskx lijMW+tIqRzP3N8Oi//7IaF1NEi0NQXP8XvytkT+iNoCRHXGuofn/BE3FIAvFsnHOLF0QY wiFiMGOrKoJJ1UBiMf/8F+YnKGg5HYRr9C7K2jK2T2SQH9YdBtcm51ogLSW+VFlLaXCf4J WqE34xuEF/qTCkDCh9rLi6JYucqE44V70ixU4xJ/X5VzF+k/RT7Wl44CMZV2mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766509472; a=rsa-sha256; cv=none; b=PbR7FSBcuJECbW3U9G3jFzeMsvMh8tSGgcT1OVMC4yIv1TNzbH/cLsUDud++PGEmSkImZo PYLaBUbxvM7v5YkPWuOOcEm57JV+hbI+2ZsIjc2CYPKwL5BHfpVSx+LD8XAh87lm+6rTFd /el8Fp/2+aMUIXou6feqEYVqhI5UqG0lqeayPb/CesKePBm3ln8xCmPhURw0rSWgFGznqz 6RmAuTNxG5IG2Swsu7pSFIU7arbx+BcCAaunlgEZPv0TUmEcJQVup/2/WZe7SCF31x6vA9 v5/D7QoCY8spDqKXMM5qVwh2dLGqmsjhLUsOpR8/k2SivMKBR/p0hrG+uCL+uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbLw065cNz1K7D for ; Tue, 23 Dec 2025 17:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2477d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 17:04:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: a7e0f6a3dc5f - main - Specialize the REALTEK RTL8153 quirk to just rev=0x31fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7e0f6a3dc5f3c4d11066a4b6529bc8cb868694a Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 17:04:32 +0000 Message-Id: <694acba0.2477d.6d561ba4@gitrepo.freebsd.org> The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=a7e0f6a3dc5f3c4d11066a4b6529bc8cb868694a commit a7e0f6a3dc5f3c4d11066a4b6529bc8cb868694a Author: Poul-Henning Kamp AuthorDate: 2025-12-23 17:04:10 +0000 Commit: Poul-Henning Kamp CommitDate: 2025-12-23 17:04:10 +0000 Specialize the REALTEK RTL8153 quirk to just rev=0x31fd --- sys/dev/usb/quirk/usb_quirk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index cd48d6d1d364..04441b2a344b 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -574,7 +574,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { /* This works much better with if_cdce than if_ure */ USB_QUIRK(LENOVO, TBT3LAN, UQ_CFG_INDEX_1), - USB_QUIRK(REALTEK, RTL8153, UQ_CFG_INDEX_1), + USB_QUIRK_REV(REALTEK, RTL8153, 0x31fd, 0x31fd, UQ_CFG_INDEX_1), }; #undef USB_QUIRK_VO #undef USB_QUIRK_REV From nobody Tue Dec 23 17:52:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbMzq6mPGz6LpMk for ; Tue, 23 Dec 2025 17:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbMzq5rClz3ZkL for ; Tue, 23 Dec 2025 17:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766512375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/SrEz6Aw1iW6DZRAbKNnYuE2hD/n/gjA0Xve+DJNKw=; b=SpQX/Rog/4VlXIM13cX3wcpMd7cI4SVWmxrLAsX60jOrZLl9nOHlieNFBrnmZO4QiJNk0I 09LiPEnDyKNQF2tpYJ3XRLvFUp/0dft42uJ324+NFvRqnZv2YNUbVJACWQG8ap7OKbdoFp v9d4lnE5ygNNt1AtvzeeKUe8oSJLWDp7OFfTkHMqOCNI9zj8+Bzfuw9owhB7+czymdkMCm 3EucpBynaPQfQPu2TpR2UWhGA2XOyPrJEsSHwwvq+gcFHBM5Boe0e/YG8mH+6djgakumSS ntvRCDQGBMwmIljTr6T9mGZzTwGb/TYa1TtMu/UmBMrR+tfLNL6OpvZbeDIfGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766512375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/SrEz6Aw1iW6DZRAbKNnYuE2hD/n/gjA0Xve+DJNKw=; b=tYDFCgjP8J/BBwxPmmf2m31sBj9I+TVGhaCZ2AHrNTzKwxkBbJ5iTbBDAJoXYG+B//VtxU teysmY+AGcvTyEyZW+wKR3P2mEWeT9iLvIsFthkvQiz2mk5eBtpXIsZUj0OvhI560ers0A L7gkBsTSD4flpoNdBkuYl4PacbS8K+lwJyBZPtKHP9uqTfrA3mf2TuugoqmxgTHvV73rRm E4Xitcwi25d7VaTbQjycWZNrCCMuVF/yRp8nMK3azHMKttwatwsWNxOEAKvuZvzJAquSKX yu7+Z79XHDzX3A+tQ4oLA9tAFQ71viDfqye090MT9gOUCAvlmtXyUg/yuNoXaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766512375; a=rsa-sha256; cv=none; b=p7qqD7FiNjkk11bl9FsYz2PsREYMcPjsVCD2NlWeah56p/jSXflzzfhUOZ7lS5C5+zR6nD j9gzcevDU93SoeG4LTCBpILzIrGQsSusWr+uXgXE6Qhfv2b351RwAYp/vqqtVEAW/YCmuL hGz6oFRo5qa+Xwhx/+xBSbVNwD3B1xAfQkpg5ELq84SDl/aIM02PTXcvNqE5s4zO9YGho1 u32gI4x7zNYghNXNHjE01zJ0aZBHZmgQfKjAsvSgieM65WTPVehXbIAXRszykyWhNi0YQM R29+x/Iy/TK632+LApiH1SHj13afQQJcvVwFrGeLhH6jJgqpYQ1GRVk0Ug1aAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbMzq5PHkz1Ljh for ; Tue, 23 Dec 2025 17:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3129d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 17:52:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1aea5b0ba76a - main - nvme: make the interface standard file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1aea5b0ba76a30cc9753fbc860c0f35a980b756b Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 17:52:55 +0000 Message-Id: <694ad6f7.3129d.4b8eaff6@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1aea5b0ba76a30cc9753fbc860c0f35a980b756b commit 1aea5b0ba76a30cc9753fbc860c0f35a980b756b Author: Gleb Smirnoff AuthorDate: 2025-12-23 17:51:25 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-23 17:51:25 +0000 nvme: make the interface standard file This makes nvme.ko and nvd.ko loadable. Fixes: aed44717a1606e4c5c79f7c8831de49cba64d7e6 --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index d41e3ccc23be..474f337e569a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2582,7 +2582,7 @@ dev/nvme/nvme_sim.c optional nvme scbus dev/nvme/nvme_sysctl.c optional nvme dev/nvme/nvme_test.c optional nvme dev/nvme/nvme_util.c optional nvme | scbus -dev/nvme/nvme_if.m optional nvme +dev/nvme/nvme_if.m standard dev/nvmem/nvmem.c optional nvmem fdt dev/nvmem/nvmem_if.m optional nvmem dev/nvmf/controller/ctl_frontend_nvmf.c optional nvmft From nobody Tue Dec 23 18:35:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbNxM38cfz6K8Xj for ; Tue, 23 Dec 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbNxM2ZkQz3j1J for ; Tue, 23 Dec 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766514951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PjgtP2mRJ65sTB/OCPf1C561z+Tb5Llddyo3N7E+Mg=; b=KVPdOF/JeqLOhlasmOx8zx0hiDuhCriBreGkrek7pujebG/nFMJSf5+t+bLaDE4VTN4cbP lKdX6mgX3LBc2JziWKJRqQlLk8GIu7DcoDr99KVai0eGFMYwCbMatCY4wnVOBC1uEQLphA qE8ZNIdb2tQV63FgYt65B/VSvTsByo0LFXCgSknhfAxf3w83SF1rNlKoOVDEnPHjCtKQGv N3TYOQcntoDeDUFHV32RcF/Ig2BTCkkW+Bs5ycsqDmA9wKS1A64ouBPsFbdnxLzUSQllpm Tg4njQNWFNa0BvMoEPrVuV7ARXZV8yu/7iVX5QVwoQnfwrZ6ukTqjNM4yTKDIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766514951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PjgtP2mRJ65sTB/OCPf1C561z+Tb5Llddyo3N7E+Mg=; b=NvK7wtlBvEqNsExqeHJe/VodGPHj31qGljPX8lJ6/bcDY1OMA3DPOKsBz/NSD7SEEY6Lof u/rZX+G3sXwtR+Ogf/uYrr1RMFZ5jLyg/XqfHYBcXD0XLgWHFM96gKV71vdYxlpK89S5Uh 0pknJn1TT1OaZSmUxRqgshW60vB7vOSvimdqCjTnqzP2mQ0gOJgVhpU4M3hkXuDPoy2oZH l0a8MUATKGu+SQUo+eNUGWzic2KaCC8y1CMQ9OzEoqJoL0lpZCxJInszEUx4POndk4qtHC 0X+o4u6r0Ew1kGu6T/TWCK7cR9ZyOsUT7n/FhP4uKDG+K0fQ/zs6tRCPl5gDSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766514951; a=rsa-sha256; cv=none; b=r+GFRIEBjo8mOMRKKSiBaO0L+ETx0gpQGcuOG1EhUiN5B0QcI3WvkNMBhNsNjXEfhS2fli vppVl2VcmMZWhcOYukLAvp5WVYw8X8zctQU9/LtHt1GUBQGpT3X5e3NmktNKrpzX7u+RE1 3dhdL6Dq9UDSxH464bjUXZ3Yfyto+6FZeTNgLX7NWOPCkMLsZQPhwSWp1GEIfn+nVxFLCo Zr5HiW+LDjf9RIakNI6EtumcLQ0mkfnlHSIQQ92Fzv4TN1oYhnK/A+W3ZBaHC/gEe21Sa3 SI9Kx3XCZ9pEJrXQdx7bIbAY2inWg7sjZTP4qxeIl5px9Tryec8VXhTJV8uyoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbNxM1zYxz1McK for ; Tue, 23 Dec 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 320f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 18:35:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 1e8c2cb328bb - main - vnode_pager: use ptoa(), atop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e8c2cb328bbb2d685acbcd269db32ad3ec45f26 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 18:35:51 +0000 Message-Id: <694ae107.320f6.34c15e01@gitrepo.freebsd.org> The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1e8c2cb328bbb2d685acbcd269db32ad3ec45f26 commit 1e8c2cb328bbb2d685acbcd269db32ad3ec45f26 Author: Doug Moore AuthorDate: 2025-12-23 18:34:20 +0000 Commit: Doug Moore CommitDate: 2025-12-23 18:34:20 +0000 vnode_pager: use ptoa(), atop() In vnode_pager.c, use ptoa() or atop() instead of arithmetic with PAGE_SIZE or PAGE_SHIFT. Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D49330 --- sys/vm/vnode_pager.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 9693cb15f80d..040b4037df15 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -388,7 +388,7 @@ vnode_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, return FALSE; bsize = vp->v_mount->mnt_stat.f_iosize; - pagesperblock = bsize / PAGE_SIZE; + pagesperblock = atop(bsize); blocksperpage = 0; if (pagesperblock > 0) { reqblock = pindex / pagesperblock; @@ -645,8 +645,8 @@ vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, *rtaddress += voffset / DEV_BSIZE; if (run) { *run += 1; - *run *= bsize / PAGE_SIZE; - *run -= voffset / PAGE_SIZE; + *run *= atop(bsize); + *run -= atop(voffset); } } @@ -909,7 +909,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, object = vp->v_object; foff = IDX_TO_OFF(m[0]->pindex); bsize = vp->v_mount->mnt_stat.f_iosize; - pagesperblock = bsize / PAGE_SIZE; + pagesperblock = atop(bsize); KASSERT(foff < object->un_pager.vnp.vnp_size, ("%s: page %p offset beyond vp %p size", __func__, m[0], vp)); @@ -991,7 +991,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, bp->b_blkno += (foff % bsize) / DEV_BSIZE; /* Recalculate blocks available after/before to pages. */ - poff = (foff % bsize) / PAGE_SIZE; + poff = atop(foff % bsize); before *= pagesperblock; before += poff; after *= pagesperblock; @@ -1172,14 +1172,14 @@ vnode_pager_generic_getpages_done(struct buf *bp) runningbufwakeup(bp); - if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { + if (error == 0 && bp->b_bcount != ptoa(bp->b_npages)) { if (!buf_mapped(bp)) { bp->b_data = bp->b_kvabase; pmap_qenter((vm_offset_t)bp->b_data, bp->b_pages, bp->b_npages); } bzero(bp->b_data + bp->b_bcount, - PAGE_SIZE * bp->b_npages - bp->b_bcount); + ptoa(bp->b_npages) - bp->b_bcount); } if (buf_mapped(bp)) { pmap_qremove((vm_offset_t)bp->b_data, bp->b_npages); @@ -1258,7 +1258,7 @@ vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, { int rtval __diagused; struct vnode *vp; - int bytes = count * PAGE_SIZE; + int bytes = ptoa(count); /* * Force synchronous operation if we are extremely low on memory @@ -1329,7 +1329,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, static int curfail; object = vp->v_object; - count = bytecount / PAGE_SIZE; + count = atop(bytecount); for (i = 0; i < count; i++) rtvals[i] = VM_PAGER_ERROR; @@ -1342,7 +1342,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, return (VM_PAGER_BAD); } - maxsize = count * PAGE_SIZE; + maxsize = ptoa(count); ncount = count; poffset = IDX_TO_OFF(ma[0]->pindex); From nobody Tue Dec 23 18:47:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbPC908gbz6K9FL for ; Tue, 23 Dec 2025 18:47:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbPC82pqPz3lDB for ; Tue, 23 Dec 2025 18:47:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-34c2f52585fso4502874a91.1 for ; Tue, 23 Dec 2025 10:47:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1766515661; x=1767120461; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=2CLX/jOyvm/01FjD2p8Av9GqFJv7RzE9ZiNqmmNpQ/I=; b=wZixOPD0NU+WVN3e5p3txwV6V2iO8VY6WP5yI1UpBXm6D1g0cYT2qpla+o0FX2NWfg J7Hd7smk9ylvRYNVzbDGoA1f1XxUdQp7SE1v7XEAhdhD1R8R5N+e1cQuJ77YprCI+EAk dN8GIsFE3Plp5+FtrwjWYCFAfWMxVIvHJhBzM14oZagk+0rdahL5elUlTDewhGf+G74b k7sGnqv56rf8zbATa1AvmmZ/YnZDRRCXPUCZ1gy2WmUYdgY6i7ORmsIOxrRDvE8aZOjC wkUc9+FV/VHeXLt54Wpl51k0OdMyU+ijmVO0RoYsVvOBj7WbIUKEHU65fyjJx3R9Kdy4 q4dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766515661; x=1767120461; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2CLX/jOyvm/01FjD2p8Av9GqFJv7RzE9ZiNqmmNpQ/I=; b=WicZph+wqW/ljELW8zMouCBI+dSl8y15LBPsRzsfwfq9uPXgUb18oEf3AJdtWv/o09 mkkG8lhGjq/0eSM1gbM3mYtDdVzDkAlkHZd5mVD/DtZ4UjDKf94zd8EACRjO+bhS4YDm IoWfp3XCi/Hu4V7ztrJojGoZTLNeqhI3hNeviH7QSYpGCTVlIs1AVLE0YpD29WvUcNy+ sLNq3k4EAdEwQkM/Hd8XqUm5n5m6mUD2/k0xmqZKNSjotOqiLHBW061ccup0AuTzgesb yxqacmrBcY9SghpETKE0nYosiUMegOEHpjTg8iAm4rkLyLKzxcyOINmaCGVdhfE0a6kN RrBw== X-Forwarded-Encrypted: i=1; AJvYcCVVA03wlPF+rAwH6BJeGJRBomQQsIqXxsr3zKUwBm91yF6CDq4VhDAVnjVqkczOWdDBYZLUy6614KaWrLT4lGlLic08@freebsd.org X-Gm-Message-State: AOJu0Yy19xqW9psKw6Qlmv7PUvfGAksSs6p/c1nZZ/s7Ld5yZDN1eUos clBZ0NzlIw8+qIDzNLY+eX7QcwenpoKIeISshB0v/kCzYgHLMhEDNs7vLNVi8g6Bs+yOnANTa36 QW0fMIkqG7zkyDx3135F66luEJkmxA/kNt50q77i7IA== X-Gm-Gg: AY/fxX6rmBjMhxIuBuu+lrXn0G6B1Xmon1ezIpzn2/7toqRlivvdq5qe0cdxrjMm07W u1pygjbAsmV/rQRO2aqjvgN/N5B98O11rq0TuyfdIz8SBcckR079S4o5fyR+3Y9MILkPFuDhbZE VfTCuVg8fMa9bJPvl7YTu3pMTmchtlZhZWX0lFRfOwEi81pZHl5g6DAsqr440bBs48gWj1tg+0Y V2OuvX7sgUjoVWGYAWJd5OGRoKNcLAkFZwUzDjubhea6wdb5VNcW559/HoTC7KbG0C+YigJ X-Google-Smtp-Source: AGHT+IGK/pGo2cQSZaNYb0BJe/Wqsuh9MZpC5ASOg9xH4WM0Rr0wPkmGeRPg99U7GhSjpaU1UU1oGkWJe6mryXdh2Pg= X-Received: by 2002:a17:90b:2d4c:b0:341:194:5e7c with SMTP id 98e67ed59e1d1-34e921b73a6mr11985185a91.24.1766515660982; Tue, 23 Dec 2025 10:47:40 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <694ad6f7.3129d.4b8eaff6@gitrepo.freebsd.org> In-Reply-To: <694ad6f7.3129d.4b8eaff6@gitrepo.freebsd.org> From: Warner Losh Date: Tue, 23 Dec 2025 11:47:28 -0700 X-Gm-Features: AQt7F2ptbaz9ATlWq07gds4Xf0r1tqPvAGXd9LHIPXT1HH4TXWMRZD7aLEZImwo Message-ID: Subject: Re: git: 1aea5b0ba76a - main - nvme: make the interface standard file To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007699630646a2fa5b" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dbPC82pqPz3lDB --0000000000007699630646a2fa5b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks Gleb! This is the right fix. Warner On Tue, Dec 23, 2025 at 10:52=E2=80=AFAM Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D1aea5b0ba76a30cc9753fbc860c0f35= a980b756b > > commit 1aea5b0ba76a30cc9753fbc860c0f35a980b756b > Author: Gleb Smirnoff > AuthorDate: 2025-12-23 17:51:25 +0000 > Commit: Gleb Smirnoff > CommitDate: 2025-12-23 17:51:25 +0000 > > nvme: make the interface standard file > > This makes nvme.ko and nvd.ko loadable. > > Fixes: aed44717a1606e4c5c79f7c8831de49cba64d7e6 > --- > sys/conf/files | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/conf/files b/sys/conf/files > index d41e3ccc23be..474f337e569a 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -2582,7 +2582,7 @@ dev/nvme/nvme_sim.c optional nvme scb= us > dev/nvme/nvme_sysctl.c optional nvme > dev/nvme/nvme_test.c optional nvme > dev/nvme/nvme_util.c optional nvme | scbus > -dev/nvme/nvme_if.m optional nvme > +dev/nvme/nvme_if.m standard > dev/nvmem/nvmem.c optional nvmem fdt > dev/nvmem/nvmem_if.m optional nvmem > dev/nvmf/controller/ctl_frontend_nvmf.c optional nvmft > > --0000000000007699630646a2fa5b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks Gleb! This is the right fix.

War= ner

On Tue, Dec 23, 2025 at 10:52=E2=80=AFAM Gle= b Smirnoff <glebius@freebsd.org> wrote:
Th= e branch main has been updated by glebius:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D1aea5b0ba76a30cc9753fbc860c0f35a980b756b
commit 1aea5b0ba76a30cc9753fbc860c0f35a980b756b
Author:=C2=A0 =C2=A0 =C2=A0Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2025-12-23 17:51:25 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2025-12-23 17:51:25 +0000

=C2=A0 =C2=A0 nvme: make the interface standard file

=C2=A0 =C2=A0 This makes nvme.ko and nvd.ko loadable.

=C2=A0 =C2=A0 Fixes:=C2=A0 aed44717a1606e4c5c79f7c8831de49cba64d7e6
---
=C2=A0sys/conf/files | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/conf/files b/sys/conf/files
index d41e3ccc23be..474f337e569a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2582,7 +2582,7 @@ dev/nvme/nvme_sim.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0optional nvme scbus
=C2=A0dev/nvme/nvme_sysctl.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0optional nvme=
=C2=A0dev/nvme/nvme_test.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0optional= nvme
=C2=A0dev/nvme/nvme_util.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0optional= nvme | scbus
-dev/nvme/nvme_if.m=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0optional= nvme
+dev/nvme/nvme_if.m=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0standard=
=C2=A0dev/nvmem/nvmem.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opt= ional nvmem fdt
=C2=A0dev/nvmem/nvmem_if.m=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0optional= nvmem
=C2=A0dev/nvmf/controller/ctl_frontend_nvmf.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 optional nvmft

--0000000000007699630646a2fa5b-- From nobody Tue Dec 23 19:13:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbPmF1B4dz6KCMg for ; Tue, 23 Dec 2025 19: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbPmF0bH0z3r11 for ; Tue, 23 Dec 2025 19: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=1766517181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWJyRe4U6zir6MWvqg4SS+IEqWdIGY57rimOYJDxVvI=; b=sn03VDTsrwn5oynwAO+cLVetXdJtRaOFb4/JZVVTMyA+XNHMhHj/kxc7BaQMC1uYWBgxya xsUGAAESm7uUQBUk2c5l7c4HPcdjQM9Gfh5k/C+Ocw5wZJEUE/GQXkejCWmpVkbssstVpp eyxg+RzZXkFbB8DLl7r1f027yqWnaogB30HRi5MmBt4kGbnF6vBzAVh/LZnQ+9WRFCMqcZ 1w+nYuryTkhqmMeYCjSTsFXIHtRm5yiumrJarCYbAxSvuL7AnVopk87A7ndh/pKX/gbMlK 0AKWWc/eDSk35Zwt0OpAKh3JrNF5lYHFUW4k7j2Ot2pD0et3XLeHOrEhZGxdHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766517181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWJyRe4U6zir6MWvqg4SS+IEqWdIGY57rimOYJDxVvI=; b=iNmHjfKod2/ffL5rochY2UEea8Z9GaS7hfdXWAcX6RRL6YLvBHzQyzbNwa7kOPhEdhalZL EKSHEriN1g79CuAxpUO3yO2VLHOm0CUSCfRT2G/CAG+FZSeRcHEkAcMqqIzQxNu+0G0vnD 9/3lLoJT5FwhqwXvXV+H72dNEZHeCEsRI+/9nmx4zN6Jhq3FO32UBpVpyIbWOtI2Cd9cWc 97OzCCgRKkrW8M90N1z3+BWHbyLafNbieWlrwLdgtb7BtQlTpPgTA3dgqaNFPpV/Q7VrjX YgHgRkIUvmtxXx9Q4MYsnFv1SHNDq80iGHm2iiZQdly88LJ5JDbD1BI4CeF9tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766517181; a=rsa-sha256; cv=none; b=HY6u8NJuYveH/RorxCi0CBj+HnowCrLCyPFidNsvdyUBciKXYLjFkc5DZnjo6Bt7S9c49u bNgZLao+z5pfj7ySKsampP2Zu6pcFLnd5r+qoZDyQV6zVbF63enc8jAF64yo7ADkD3rJVH UDerkO5SbyPaP7hOcKptfgjlC5Ym5RT+nz41uMz+4UX7aA5o00QrqSHt0KlquyFA9oFU75 H1prhG8hq/WXVW5JOJYrTa5J4q0bqMW8XBljrROzPudqj9qA1flVTR1PsGNDWqA95aY1iM o5Fzp6zkprMOQz+ckjqFYyTAaN7oabS2WffF27uHDOMR/pSmqiUi24dRKm0fxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbPmD72rqz1Nbb for ; Tue, 23 Dec 2025 19:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ddb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 19:13:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 5819f8b285fc - main - bhyve.8: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5819f8b285fc55a75e5dea56ffe73b376525150c Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 19:13:00 +0000 Message-Id: <694ae9bc.37ddb.4c0cb35f@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=5819f8b285fc55a75e5dea56ffe73b376525150c commit 5819f8b285fc55a75e5dea56ffe73b376525150c Author: Michael Osipov AuthorDate: 2025-12-21 16:41:41 +0000 Commit: Michael Osipov CommitDate: 2025-12-23 19:12:44 +0000 bhyve.8: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54332 --- usr.sbin/bhyve/bhyve.8 | 67 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 7be1f7447adc..aafa4b81a076 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 17, 2025 +.Dd December 23, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -224,7 +224,7 @@ This specification only works when loaded with UEFI mode for VNC. When using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), this option isn't needed. When using a VNC client that doesn't support QEMU Extended Key Event Message -(e.g. tightVNC), the layout defaults to the US keyboard unless specified +(e.g. TightVNC), the layout defaults to the US keyboard unless specified otherwise. .It Fl l Cm help Print a list of supported LPC devices. @@ -280,7 +280,6 @@ mode. In this mode, a guest reboot does not cause the bhyve process to exit. Instead, bhyve will restart the VM. Once the bhyve process exits or is killed, the VM will be destroyed automatically. -The underlying virtual machine is automatically destroyed when the bhyve process exits. .Pp .It Fl n Ar id Ns Cm \&, Ns Ar size Ns Cm \&, Ns Ar cpus Ns Op Cm \&, Ns Ar domain_policy Configure guest NUMA domains. @@ -494,7 +493,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a TPM module, a fwcfg type, and the debug/test device. +optionally, a TPM module, a fw_cfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -653,10 +652,10 @@ Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Ss SCSI device backends @@ -675,10 +674,10 @@ are: Initiator ID to use when sending requests to specified CTL port. The default value is 0. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or not support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Ss 9P device backends @@ -708,10 +707,11 @@ Use the host TTY device for serial port I/O. .It Ar tcp=ip:port Use the TCP server for serial port I/O. Configuring this option will start a TCP server that waits for connections. -Only one connection is allowed at any time. Other connection try to connect -to TCP server will be disconnected immediately. Note that this feature -allows unprivileged users to access the guest console, so ensure that -access is appropriately restricted. +Only one connection is allowed at any time. +The TCP server will immediately close new connections while an existing +connection is active. +Note that this feature allows unprivileged users to access the guest console, +so ensure that access is appropriately restricted. .El .Ss TPM device backends .Bl -bullet @@ -770,10 +770,10 @@ is provided, that file is also mapped in the boot firmware guest address space, and any modifications the guest makes will be saved to that file. .Pp -Fwcfg types: +fw_cfg types: .Bl -tag -width 10n .It Ar fwcfg -The fwcfg interface is used to pass information such as the CPU count +The fw_cfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware. Supported values are .Ql bhyve @@ -788,13 +788,13 @@ is used, bhyve's fwctl interface is used. It currently reports only the CPU count to the guest firmware. The .Ql qemu -option uses QEMU's fwcfg interface. +option uses QEMU's fw_cfg interface. This interface is widely used and allows user-defined information to be passed to the guest. It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest. Some operating systems such as Fedora CoreOS can be configured by -qemu's fwcfg interface as well. +QEMU's fw_cfg interface as well. .El .Ss Pass-through device backends .Sm off @@ -830,10 +830,10 @@ as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -841,7 +841,7 @@ Guest memory must be wired using the .Fl S option when a pass-through device is configured. .Pp -The host device must have been reserved at boot-time using the +The host device must have been reserved at boot time using the .Va pptdevs loader variable as described in .Xr vmm 4 . @@ -937,7 +937,7 @@ standard PCI devices with BAR addressing, but may also implicitly decode legacy VGA I/O space .Pq Ad 0x3c0-3df and memory space -.Pq 64KB at Ad 0xA0000 . +.Pq 64 KiB at Ad 0xA0000 . The default .Cm io option should be used for guests that attempt to issue BIOS calls which result @@ -1022,7 +1022,7 @@ Serial number with maximum 20 characters. .It Cm eui64 IEEE Extended Unique Identifier (8 byte value). .It Cm dsm -DataSet Management support. +Dataset Management support. Supported values are: .Cm auto , enable , and @@ -1044,14 +1044,15 @@ Configuration options are defined as follows: .Bl -tag -width 10n .It Cm nmrr Nominal Media Rotation Rate, known as RPM. -Value 1 will indicate device as Solid State Disk. -Default value is 0, not report. +A value of 1 indicates that the device is a solid state drive, i.e., +non-rotational. +Default value is 0. .It Cm ser -Serial Number with maximum 20 characters. +Serial number with maximum 20 characters. .It Cm rev -Revision Number with maximum 8 characters. +Revision number with maximum 8 characters. .It Cm model -Model Number with maximum 40 characters. +Model number with maximum 40 characters. .El .Ss HD Audio device backends .Bl -bullet @@ -1177,7 +1178,7 @@ or a similar boot loader before can be run. Otherwise, the boot loader is not needed. .Pp -To run a virtual machine with 1GB of memory, two virtual CPUs, a virtio +To run a virtual machine with 1 GiB of memory, two virtual CPUs, a virtio block device backed by the .Pa /my/image filesystem image, and a serial port for the console: @@ -1188,11 +1189,11 @@ bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ .Pp To do the same on arm64: .Bd -literal -offset indent -.Ed bhyve -c 2 -s 0,hostbridge -s 1,virtio-blk,/my/image -o console=stdio \\ -o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin -m 1G vm1 +.Ed .Pp -Run a 24GB single-CPU virtual machine with three network ports, one of which +Run a 24 GiB single-CPU virtual machine with three network ports, one of which has a MAC address specified: .Bd -literal -offset indent bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ @@ -1202,7 +1203,7 @@ bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ -H -P -m 24G bigvm .Ed .Pp -Run an 8GB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI +Run an 8 GiB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI CD-ROM, a single virtio network port, an AMD hostbridge, and the console port connected to an .Xr nmdm 4 From nobody Tue Dec 23 21:04:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbSFC6RsWz6KrpW for ; Tue, 23 Dec 2025 21:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbSFC49dkz3C7t for ; Tue, 23 Dec 2025 21:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766523887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YAI8CV1xruvf6kt4z2gHzgK6VgurQ17Fq+GWF41R5pA=; b=RZFjKlizcEj8aIqzxh2Rpve/MkF3ACKJZA2xGV8XRZQ1jMt/vnEtAqHTS7aAzCN/4wvyzF O+A5eJM0n5aV7tjIYewvKdFV6L+vS9+WTgZEIXdd87NRtGegp4v6IYF+rye8zfYH7xjQTO jo31gz8FUVVmlX0ZRXTnHM9XLPaCa8tP8WB4L5DYkIVbQszPo90L2IcJJFwkyfIdw7Kmke R3JYaao395rqfO9ONV6P8dAI3K3Ucct1MlC1zsA0EDO44+bWJJPZgZx1BppYPFx0MuF7RS gulYzsgol87c26lFudZwX6qlQHYUwEbKylU9oTzHOWDcDhYL5nUheaq1nXdcmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766523887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YAI8CV1xruvf6kt4z2gHzgK6VgurQ17Fq+GWF41R5pA=; b=ZtrvUkv47p7GhiNif0xw4XOIiW+K5YX9VFexVGbarT29pSeB6PceM8qYf4vfIFDS0/N/NE alRjszrj+G6wgII4q89fV31ogLXC4QUfNzOmkfDQbvfB9VGT1yQsrJ/sinU2yTMotIc2yK 7ETp8IBLmFlIHtiIDHeQahzkV8BxSEcG1+a1ViyrJB8iEOgiLpDGrKQ0+EW2Y+FuH9k/Px xfHNtMMddLQLoFjtWKjJJRuIzDFiE0hjTa3YJBZ44RMHawTHCmt4zOMzEU9F+mDfHlPtVq ZkfCaStuBVRH+8NSJzFqjR+bmjXlTazPOsG/G4Hp6pIb2eMhY7JQ05HyoE6ntg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766523887; a=rsa-sha256; cv=none; b=VaBeCceSAuhXr9ydLMSJyDQJu36ndz1BPRQ5XZc2cbUk7Micx4axWX2qjCXiEtZ0DEKISu baW+tiLQKtSNVA9hI1xdn/p6IivvxIYBd9iEMOSYafgGvfk+V5Ge5SoxcHWxCAV5TB7tso 6hxfdjNUIpFJBVEXJyqVYiNX66a2+A+ikRrkYlW8j3rwxxkrsjjVqWL+H8PM42ZhqYYFo4 XDrh4yWZRX0N8RYLU/6BS0mlkJXvayVOjjGj6ID+zfvdR7F/MN47owBrz7DYucl1IqXUhR PuHmVGRTkuCmF6eISKeTgkoywWL53jzNWLZAjsiuDLEIjMmsFAegN8Tb+6tfJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbSFC2q5gz1Qvw for ; Tue, 23 Dec 2025 21:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4403e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 21:04:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d5a11cd0137d3ad70f6b06e063ea91a776d510a Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 21:04:47 +0000 Message-Id: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5a11cd0137d3ad70f6b06e063ea91a776d510a commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a Author: Dimitry Andric AuthorDate: 2025-06-18 10:06:25 +0000 Commit: Dimitry Andric CommitDate: 2025-12-23 21:01:40 +0000 src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, this also comes at the cost of some performance, since the dynamic libraries are quite large, and contain lots of long symbols (mangled C++ identifiers). Add a WITH_LLVM_LINK_STATIC_LIBRARIES build knob that can be used to go back to the previous behavior: libllvm, libclang and liblldb are built as internal static libraries, i.e. only available during buildworld, and fully linked into the various executables such as clang, lld, etc. PR: 287447 Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50956 --- lib/clang/libclang/Makefile | 8 ++++---- lib/clang/liblldb/Makefile | 13 ++++++++++++- lib/clang/libllvm/Makefile | 9 ++++----- share/man/man5/src.conf.5 | 9 ++++++++- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 11 ++++++++--- tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES | 6 ++++++ usr.bin/clang/Makefile.inc | 2 +- usr.bin/clang/clang.prog.mk | 2 +- usr.bin/clang/lld/Makefile | 2 +- usr.bin/clang/lldb-server/Makefile | 5 +++++ usr.bin/clang/lldb/Makefile | 5 +++++ usr.bin/clang/llvm.prog.mk | 5 +++++ 13 files changed, 61 insertions(+), 17 deletions(-) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 7eb2c99b25c8..56f6fd374fe5 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,8 +1,8 @@ -.include +.include .include "../clang.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= clang INTERNALLIB= .else @@ -872,7 +872,7 @@ SRCS+= ${SRCS_ALL:O} LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index a3ff8e367864..aa9e90b2f6f2 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,10 +1,16 @@ -.include +.include .include "../lldb.pre.mk" +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library when explicitly requested. +LIB= lldb +INTERNALLIB= +.else PACKAGE= lldb SHLIB_CXX= lldb SHLIB_MAJOR= 19 PRIVATELIB= +.endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -753,8 +759,13 @@ SRCS+= Version/Version.cpp LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index a4e9c628d99e..05128550827a 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,8 +1,8 @@ -.include +.include .include "../llvm.pre.mk" -.if defined(TOOLS_PREFIX) -# Build static library during cross-tools stage +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +# Build static library during cross-tools stage, or when explicitly requested. LIB= llvm INTERNALLIB= .else @@ -14,6 +14,7 @@ PRIVATELIB= # Work around "relocation R_PPC_GOT16 out of range" errors PICFLAG= -fPIC .endif +CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB .endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors @@ -48,8 +49,6 @@ CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ CFLAGS+= -DBLAKE3_USE_NEON=0 .endif -CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB - SRCDIR= llvm/lib # Explanation of different SRCS variants below: diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index c56a13652a84..1d55ab074a45 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd December 15, 2025 +.Dd December 21, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -999,6 +999,13 @@ Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. .It Va WITH_LLVM_FULL_DEBUGINFO Generate full debug information for LLVM libraries and tools, which uses more disk space and build resources, but allows for easier debugging. +.It Va WITH_LLVM_LINK_STATIC_LIBRARIES +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. .It Va WITHOUT_LLVM_TARGET_AARCH64 Do not build LLVM target support for AArch64. The diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 4109edc90f2f..0d806702417f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -213,6 +213,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_FULL_DEBUGINFO \ + LLVM_LINK_STATIC_LIBRARIES \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0551074f0bce..f86e9d0dc192 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -892,12 +892,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no +.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif .if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} == no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3868,10 +3870,13 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif +.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +OLD_LIBS+=usr/lib/libprivatelldb.so.19 +.endif + .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/bin/lldb-server -OLD_LIBS+=usr/lib/libprivatelldb.so.19 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif diff --git a/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES new file mode 100644 index 000000000000..7860ee862b1d --- /dev/null +++ b/tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES @@ -0,0 +1,6 @@ +Link LLVM libraries (libllvm, libclang, liblldb) statically into each of +the binaries that use them. + +This means that binaries linked against these libraries, such as clang, +ld.lld and lldb will be much larger and position dependent, but will +start more quickly. diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 1e9998061cf6..7ce07e2eac1d 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,6 +1,6 @@ .include -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" MK_PIE:= no # Explicit libXXX.a references .endif diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 3baf3d0baf0f..e35425b0d280 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -18,7 +18,7 @@ LIBADD+= z LIBADD+= zstd .endif -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index cbad6f2b3fcd..588dc5a198fc 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -81,7 +81,7 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm -.if defined(TOOLS_PREFIX) +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" LIBPRIV= LIBEXT= a .else diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 5042fa1fdf04..da4d83445050 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -22,8 +22,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 452bfd23bfa2..880d4de1c8fc 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -15,8 +15,13 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) || ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif .for lib in ${LIBDEPS} DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index c369fe8d5944..00f319a246fb 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -14,8 +14,13 @@ LIBPRIV= LIBEXT= a .else LIBDEPS+= llvm +.if ${MK_LLVM_LINK_STATIC_LIBRARIES} == "yes" +LIBPRIV= +LIBEXT= a +.else LIBPRIV= private LIBEXT= so +.endif LIBADD+= z LIBADD+= zstd .endif From nobody Tue Dec 23 21:08:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbSKY0xqCz6KsJv; Tue, 23 Dec 2025 21:08:33 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbSKY0Dt2z3DgW; Tue, 23 Dec 2025 21:08:33 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766524113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BU/2Dq+u4eHw4kl9IGSLb2bUMne1GjY5Kg6pJNEHp1I=; b=EvOMyw3zjgjymuUR80Jl2im37VYbbpp1qrpIV4ItnDSSNpAM1m9meH+COub/UEc+50vQA4 jn9I3V4mnNNFiRnlFK9MX8P+8iwIkrF28Om+3IiLMUaor66FYfBWAS7KmZN3Ca4c7GpbFn O13rwQBwxXevA2n5rpkT8HacjWlOVUHAhjU3zAl/Hqv1IxG7WlXbE/VhEGmyhue1sUSVX8 t5wvyeyeBZ4zjwkLsLCe4lL5b+yanHR1KbtoYzsafNvHEt+uvmWIG4PJC1KTb3AmtaWfUr f5QsA4fn8FZOd+i3jfnrxsDGh1B0bmExRZe2M4KU4I20DTQkC18c2gsZkhNc9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766524113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BU/2Dq+u4eHw4kl9IGSLb2bUMne1GjY5Kg6pJNEHp1I=; b=Pe5SgPpoWL1wIEurFSD7hpEZWH9Xe2keWU6p7FVeGss4XmDBtxfvZOyoKdT1U6/xWo2+NU 1hc0TptMFvmG51meHysdbSCiHH77rMgmBB62EhOZRyTudu7WvdL0+ITAkOW9SHuCcTVM/V kTdwEdUFEUa4+8DYfPQm9hAwDBHykZMepi/tOND9bMCEUk6U9PRIxI6M6IuTWsrKpeFlRu OUxvHde1e5wJr0UCmdp9153w9ByNX1Vmi/PaQEQIu/v5r2dUmlTnZ0+YKy/XyPADsn9Phb nDvwfxzlgVb6y5xDKX4ZifjMKce5yRUnfJew7Ffqp1plwV7wpgrq48K1ZfJBRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766524113; a=rsa-sha256; cv=none; b=wdr9QYbl6H1VbA80DRUMKcphtpduj8Au6Lo/F70ElzdgWs3hSpVL92pOf6q8eCuB5UOWJJ ua1NKDCm/3cWVxOXjeYGIX7vro0MgdkhZCwmcgfT+2A3Zx3zCCHOVkNcEQoMrVT9neWbNX jLLHZs5hn2iHJzD3DbV+TgYYSwCovRI4klRha55cp3f2iuFXfgSNMvpXGZyZwziyJtKL5m qMiJ5iN6/XwVJh4t5xPlVCNiDxl2y6YZidF5bsTSXEu8a8i6XEQgxukFcI5pvAQ4ny6jkQ yQXH15G/pSFSaBjtPYVQb19t1+DiPmQHRI0HIAcOSKrqbBcYcHkTCObOxKPMow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dbSKX5zb8zpQ0; Tue, 23 Dec 2025 21:08:32 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 873424C06C; Tue, 23 Dec 2025 22:08:31 +0100 (CET) From: Dimitry Andric Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Date: Tue, 23 Dec 2025 22:08:31 +0100 References: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" In-Reply-To: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> Message-Id: <34E6C2B9-EAB0-46EC-BB1C-6C0B3BB43083@FreeBSD.org> X-Mailer: Apple Mail (2.3826.700.81.1.4) On 23 Dec 2025, at 22:04, Dimitry Andric wrote: >=20 > The branch main has been updated by dim: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8d5a11cd0137d3ad70f6b06e063ea91a= 776d510a >=20 > commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a > Author: Dimitry Andric > AuthorDate: 2025-06-18 10:06:25 +0000 > Commit: Dimitry Andric > CommitDate: 2025-12-23 21:01:40 +0000 >=20 > src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob >=20 > In commit 2e47f35be5dc libllvm, libclang and liblldb were converted = into > private shared libraries. This allowed clang, lld, lldb, and other = llvm > tools to be linked against these shared libraries, which makes them > smaller and avoids duplication. >=20 > However, this also comes at the cost of some performance, since the > dynamic libraries are quite large, and contain lots of long symbols > (mangled C++ identifiers). >=20 > Add a WITH_LLVM_LINK_STATIC_LIBRARIES build knob that can be used = to go > back to the previous behavior: libllvm, libclang and liblldb are = built > as internal static libraries, i.e. only available during = buildworld, and > fully linked into the various executables such as clang, lld, etc. >=20 > PR: 287447 > Reviewed by: emaste > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D50956 NOTE: toggling this option requires a full clean build, at least until https://reviews.freebsd.org/D52011 lands. -Dimitry From nobody Wed Dec 24 00:42:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbY421mMNz6LB5h for ; Wed, 24 Dec 2025 00:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY4214vMz3ZCy for ; Wed, 24 Dec 2025 00:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV1uJSvIU48Cu33x7SRvrPYtfn8mMG2zGb2640g03m8=; b=UkbPyDFoOUEl/OJtPtVVxUS7dv5QfGxHkRhfenyaKhfSI4OO4aHrvSU/S6ftUcqRV//mP8 SyMcElsyXzyR+SoV7nPmLwWn0/+llHn65uNbdMfBOwR7OgBYonBpAVyaRLs5m1+BtAztkn e5qxz0cVXPZH29jNwfzl1W3I7o1LjlrZUokDJrLKbXfGFRp7yfk8tQSCOqTwPQDoBiGBjE /FqBVBbMbj/XxhpcTdQRY+o1OGgyJCRGbJY080ld0qRMvitK41LdRBNand1Z2rzCqKH/gt +dQrJczOUB+ZsCQrxx7rwBO21/xPm3K6azmTEIBDwHo0s5LaK3DWXF1YaTOYMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV1uJSvIU48Cu33x7SRvrPYtfn8mMG2zGb2640g03m8=; b=YY1DjC2Rv13IQgowYQD8l486dnFJL0N472hl0ssWNff7eaKaFzflMCopvb3fLXz6g/Aa7z IAAPWL9BeBHNNi+SUAZjvV2jUvxxPiRihpto1wvhtHliu+FhpzYnFPOfU0Vsf7C6aw/uF3 lPYO431TNujCfSdP2YVivPYW/GzuC27PN9Wc7yRx7ZCIRa5R8q0NU2vwQIIyiN47tDZ+9n 9y8wD8VuzPYsYhZfunQPgupBw4KZnKS9eCLMgfPf42WmTknTHnCPkGGWuX6JIJy2uANfd2 Em1xII69afk9LXyKEG82wLWvn8Sjxd6Gw6ZxQzoM0NLQHrtEv8qwtxnzyzMdmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536930; a=rsa-sha256; cv=none; b=vOoN3xbwCpnaDwGDRdz8nXoDthqKEpkT+q8c1vV/csr/rsxrPt0dxXcM+c41xDiFCSnxWA TGEjEMPgQFXHgRBMT5C+XYGa/LJ5SY6CuXl6omiFP1TOzAYLnn0qhErpH7X1BR0duHa/Jq p4kohxzvkB1/mLzwXEmEXNFC/eIH0JPJx3ofusdu3Z6Mw0ltSH/kxei63+wy12PoG3DmHX vUYBFoPQ6aZd6+rSlkSWxx/E83TyC1/Tjhh6449+0kzYix2rg33DSSmIyNDMwst9pkV3Ml 0kScj77aw3qywTfql/TdPf2Zuu0VwHp4OjEifGgGVxWWPdNCLm6xYMzwpcPqBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY420bz0z3Gx for ; Wed, 24 Dec 2025 00:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3151f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6397c1478ac2 - stable/15 - swap_pager_seek_data(): improve assertions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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: 6397c1478ac2f8a4ee566ecec3196ab28b3b33d4 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:10 +0000 Message-Id: <694b36e2.3151f.25f73709@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6397c1478ac2f8a4ee566ecec3196ab28b3b33d4 commit 6397c1478ac2f8a4ee566ecec3196ab28b3b33d4 Author: Konstantin Belousov AuthorDate: 2025-12-14 09:30:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 swap_pager_seek_data(): improve assertions (cherry picked from commit bdfd695037a95b076aeffd04ed9fdf042b6ce218) --- sys/vm/swap_pager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 676e585a6b53..5e9a0ad94cb3 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2460,7 +2460,8 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) vm_page_t m; vm_pindex_t swap_index; - VM_OBJECT_ASSERT_RLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); + KASSERT((object->flags & OBJ_SWAP) != 0, ("non-swap obj %p", object)); vm_page_iter_init(&pages, object); m = vm_radix_iter_lookup_ge(&pages, pindex); if (m != NULL && pages.index == pindex && vm_page_any_valid(m)) From nobody Wed Dec 24 00:42:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbY450TRZz6LBBY for ; Wed, 24 Dec 2025 00:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY442Ww2z3ZKg for ; Wed, 24 Dec 2025 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJhNbGkNfzeBslFwwAufFL3OBdnlHqPsIoNf3feNQYM=; b=KineANeVPb8QIkGlnZdYQ+EB843354taPiFQHE2dSc/Ax4Lq+pz35vE8CvkGf9rTFpukW/ a8/4FIHHFQm+ptl4GH2hoKLy/Io0CYeOdw3VngMY9isVA0ZJODiYL3Ad9Va/ORwXL/l6bL 7/ljlI3kM89Gnbfs85XiQPmn1qaY3O+4gt3L7sY7VGZNEhTZpek81QefSu0Dq7r6uKzVcm tEMpLmMmdZc0LMJRpRMMYzOzE2DBx2Rf+WYXag8jck+AMYkQyqGehc3M8g0nFSxmv2sjx7 TdEZZbZYqr+T55hkwdwGzEsy3nBhZg77FK3orFFUcn7QG8h41xriyPYviuG06g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJhNbGkNfzeBslFwwAufFL3OBdnlHqPsIoNf3feNQYM=; b=q/p5Kg480moBS1irY9niPheEG9h6gjHSzn0WfF5zmbavZPglxCIM0EJoPA9OemXfO40+Xw CiTM4vittxy/yOkBEWtt7XFqIeaj5FeSlWsGkcyd1KAusKQ7Ute5KBlGDT0pkxjLdSnPjb +xDn0qTy6MmzxJaYEWa0/mtS9dKSvr0s/Y3a/wAIXxJf37OkIkEBab77/DA67FYIO9ElpP r09gRJzoZmrOXecnBsk7HjKKRKULl/TaxSuYLXxwRp4ghSFdfg/G/LMItgz/TPtZt8GF5w xBGXpODNJ23KV7MbG7TCgj7ZttfK+Z8bADNLqIKA5HNLoRc3MGB2Pv81IVrUWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536932; a=rsa-sha256; cv=none; b=S7F6sNibbndL9gZNFHLPlA8xM0tyrNetlZaTNwMVdcdOLyrsmfR23Mh0a8S4hREMOl/NUU IMWmY5TKOE1rXCiEt3uGg1noDqcmbO/jBiRB3/p5hrZ3L1Vb+hrKhyy+nRYjod62dG84ws e9RnTjpNN5bNj/DkpK8C0X/p+JT85TuXc4oLxdWFnZSW/CWqkeRzq9FMuaKlRCKo5bAyVf +1MqYdCWPKJjeHGT8k9VURVamjPnoa0KLo3lRaGV5ItRVgcLbm3VQCMtHTt7K3RJG9fvXW 6g+4e9PdMuNE3V4EzdFrMPQIGENED4iiedSzXRdtI2qxUGtVJazeBX4fvtZUrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY441rVBz3Sl for ; Wed, 24 Dec 2025 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3059d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d7bc2ee3dedd - stable/15 - vm_object_coalesce(): check that coalescing does not revive stale pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d7bc2ee3dedde2a9188234a563c4259c480d2664 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:12 +0000 Message-Id: <694b36e4.3059d.1b685b7c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7bc2ee3dedde2a9188234a563c4259c480d2664 commit d7bc2ee3dedde2a9188234a563c4259c480d2664 Author: Konstantin Belousov AuthorDate: 2025-11-22 18:43:57 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 vm_object_coalesce(): check that coalescing does not revive stale pages (cherry picked from commit f94bfc469df9a2bc78ed15cc42525d09e3413e0b) --- sys/vm/vm_object.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 413ba5459e3d..117900135ac3 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2244,6 +2244,23 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, if (next_pindex + next_size > prev_object->size) prev_object->size = next_pindex + next_size; +#ifdef INVARIANTS + /* + * Re-check: there must be no pages in the next range backed + * by prev_entry's object. Otherwise, the resulting + * corruption is same as faulting in a non-zeroed page. + */ + if (vm_check_pg_zero) { + vm_pindex_t pidx; + + pidx = swap_pager_seek_data(prev_object, next_pindex); + KASSERT(pidx >= next_pindex + next_size, + ("found obj %p pindex %#jx e %#jx %#jx %#jx", + prev_object, pidx, (uintmax_t)prev_offset, + (uintmax_t)prev_size, (uintmax_t)next_size)); + } +#endif + VM_OBJECT_WUNLOCK(prev_object); return (TRUE); } From nobody Wed Dec 24 00:42:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbY444rHZz6LB5m for ; Wed, 24 Dec 2025 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY435pgdz3ZM8 for ; Wed, 24 Dec 2025 00:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0TMW6eh0yathvwOmA908jYbJPE1uRLVkQjIrdZ05EU=; b=jY2jW/yiPtJMVHMBO/+FjEkaaYv4KzZ/QqmQiQCDYnq/nl6+G7dN7xMrUKkWgqd8id3t7B tPyS9ieNfBviaGY1aOzjo/QYCbImcLSd/IgCNB62x+6xfDWPcVuJAmGUbEl5qg7L7dycnG ZyoRBMRXf5NjP4MNdOcLbOOMCrMPUAaH5ioZEjjnqRQLtJD2UOwLsBFTCmq16/JQjVbG9x Ss0evLz+SJUUDzfzlLTo5z5kVA8hy47o9AtUAeFv/8rlSsKZEL+4tFFk+Z0YHlQGv+ChKg IYkqlV7hfOP3t+UKUjOdyVHDz7ZzSNp2QYGfBUyDHSrltqNIhD8urRfw8TzEoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0TMW6eh0yathvwOmA908jYbJPE1uRLVkQjIrdZ05EU=; b=wQ8NHPFkO7qaMzJe6XDrxYLRM6ZOYYX9xv37WDw7cE9lSuUCA3mBUg5KhX+MkhZv1sYKra xC8JUGhyyr6DK1Fy61Vh7dDadkGttwqV69g3mEgZHs1w0QpbNzcE+4ziLx3ZPHjrKoPCgL 6DHn1Npp2ieiMMXGMP0zckpZIT/3Ewjk/TmWAA65SZerNVnGlh8Rcew6q/tFluW66X0z4n YUj2vBQZkv/H1NgQsEmy/OdzDZlDB1q3kqN6eWwyY1H9UV5LRyMMGJflNyLobB+8cURAol BJc34FiTgJTZ5ErLE41WmTXWBS4szZLjAPbpS2v9dsXv7BBGWpwat0wx7DgNgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536931; a=rsa-sha256; cv=none; b=k+ZWh7SFWq527SCX7E8tN1uqO+w7Jjr1gs8HU1zHU/px1yDBCYXCZSKRDfzvlse4jMO4jD NJCcbuHaiSL9V1ijyqgv6CMzOHqyt2KFhR71OgfxU4+PmbeXvM16qb+HDk7Huf6kOf2+Kb RB5vVfsummdEI0ooFmsqAUWTErRIuZGunFN4wlPtTcu/0+/NE8uz2n6k7TsNXu5p/RU052 h4akbEP3eCfEw49s2JtI3+/LklswCccS6c6LgvZ2RXsFMTxy6On9DW44uyvrKcHXtHBNSQ zwRB43ym0Qx8SxTxpUMVf+7m9hPChrYoS47p0qSwpN8t3uHNen5uYHhkEBxYMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY4311qzz3x7 for ; Wed, 24 Dec 2025 00:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31427 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7dc87eef4695 - stable/15 - swap_pager_seek_data(): move the clipping at the object size to consumers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7dc87eef4695c93765b598f4558ff5e55bf8bf05 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:11 +0000 Message-Id: <694b36e3.31427.36f1cbe5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc87eef4695c93765b598f4558ff5e55bf8bf05 commit 7dc87eef4695c93765b598f4558ff5e55bf8bf05 Author: Konstantin Belousov AuthorDate: 2025-12-16 05:32:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 swap_pager_seek_data(): move the clipping at the object size to consumers (cherry picked from commit 30ae88e3b217b12476dba665d163ab0d8dd6a8a7) --- sys/fs/tmpfs/tmpfs_vnops.c | 2 ++ sys/vm/swap_pager.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 0f4ea2fdc28c..e1bc0d156baa 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -2091,6 +2091,8 @@ tmpfs_seek_data_locked(vm_object_t obj, off_t noff) vm_pindex_t p; p = swap_pager_seek_data(obj, OFF_TO_IDX(noff)); + if (p == OBJ_MAX_SIZE) + p = obj->size; return (p == OFF_TO_IDX(noff) ? noff : IDX_TO_OFF(p)); } diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 5e9a0ad94cb3..ab95bde34ceb 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2479,8 +2479,6 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) return (pages.index); m = vm_radix_iter_step(&pages); } - if (swap_index == OBJ_MAX_SIZE) - swap_index = object->size; return (swap_index); } From nobody Wed Dec 24 00:42:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbY462S2gz6LB53 for ; Wed, 24 Dec 2025 00:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY4534jtz3Z9y for ; Wed, 24 Dec 2025 00:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm3CK+dW7ZkeS9NoWH4ioNoeVeO3hO73ZFWIDWgmQNE=; b=nAYxJOBac/r9RqNGDzDA8DO45MJRXFaMkupAxBeMF201HFbdI4Ih22SadeJVjnG3YtKHNQ nMcGgjM/9340oRyzuHMubPmg8ydQCg9YSAEXQQcj0Xr55oCSDRrIWWnbVL9H18zuqQ48HR +Un+u5KAiV/4P+bSaKliRUwX3ahMw/YNyps7XqUrdPBIN4Q2/JaiuB3wb/GtPaSUMUMDgv MAisdJu8cfX/aTE4GQDvrmGRLLgO6EOgQq6PXLt1e4/lfpXCCRHwUcgchmt0ZxMcndWhSa V+V2+ifLD0fbtJpPtWBgFgVt4VG1rKRlHaW/qU+rZ2PnedsA6X1Tf9XZn2FxFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm3CK+dW7ZkeS9NoWH4ioNoeVeO3hO73ZFWIDWgmQNE=; b=EfMl2hoWmiQohdYtSk7bEj57K5OQNRkSogoeL/BfiH/3CKjdZysppzFASO+Tvrbct3ZYNP Oh7k9IdOWuzH9DSUrRxJ3yg3ATGnEqUkrmXLYPFNBXbkrzvBU2FW5SIXaO5aHYRWNVF8+h 3XgLwwBtN8bXpUl/ZX4BfIo249mM3T18/WhN9t2klCkrriyZrLhYKPvZz5REx86hZsf7mE 8uGSbYQdAgjBOQzi2MWduN+pZoLRkMSnBLPZXtMwzNsMA1MjEmKr1MMaxOCEy9pTcPK5s3 Fg1zBORBOkvFatszza01jEc8QE7BiQl8Rppy1rFZHSdsMmybL/XJW55ZErk2GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536933; a=rsa-sha256; cv=none; b=bsCsBN9ynSIL5c06tCPZoD819mwbYbXaDqgG3JYbBq1EQ2OTGSW3mNx2mSA8pUJSK8F25q AiOkWLsm1LYCmsk4HvUjjj5mx/D2uBFqZOi2bju0fdR5ILg0sU+iyTGRyrvDhlJ6UuL8X5 lW7aoqSjUqpQ/6rupX6VQQ7RTFwk6cPnPlev8aOBPMzSeuiSE/scuduBkHTfx5LyYBQBWO IZn6caxH7EWw/IHNXBUFBP0Q54sGdeYLJdMOAoouurRlKUtMcmNP389s2w4qNlfObFozEL bFxwKIS2jAN99Jrb6gCDZlHbhLq/Ter5XSa7rQGaEN/KtpZz4KI+OcnyfO0NUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY452c6yz4Qd for ; Wed, 24 Dec 2025 00:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3073e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 478098563e21 - stable/15 - vm_fault_trap(): fix comments grammar List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 478098563e21e9fb0a34c68fbc7c7fe323d90cc6 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:13 +0000 Message-Id: <694b36e5.3073e.2d1260a3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=478098563e21e9fb0a34c68fbc7c7fe323d90cc6 commit 478098563e21e9fb0a34c68fbc7c7fe323d90cc6 Author: Konstantin Belousov AuthorDate: 2025-12-21 21:21:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 vm_fault_trap(): fix comments grammar (cherry picked from commit 95788a851deb33242c18beb47f8a79eec320dfa5) --- sys/vm/vm_fault.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index f7318f96f709..1f13869aebf1 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -714,10 +714,10 @@ _Static_assert(UCODE_PAGEFLT == T_PAGEFLT, "T_PAGEFLT"); /* * vm_fault_trap: * - * Helper for the page fault trap handlers, wrapping vm_fault(). - * Issues ktrace(2) tracepoints for the faults. + * Helper for the machine-dependent page fault trap handlers, wrapping + * vm_fault(). Issues ktrace(2) tracepoints for the faults. * - * If a fault cannot be handled successfully by satisfying the + * If the fault cannot be handled successfully by updating the * required mapping, and the faulted instruction cannot be restarted, * the signal number and si_code values are returned for trapsignal() * to deliver. @@ -1657,10 +1657,10 @@ vm_fault_object(struct faultstate *fs, int *behindp, int *aheadp) * The given address should be truncated to the proper page address. * * KERN_SUCCESS is returned if the page fault is handled; otherwise, a - * Mach error specifying why the fault is fatal is returned. + * Mach error code explaining why the fault is fatal is returned. * - * The map in question must be alive, either being the map for current - * process, or the owner process hold count incremented to prevent + * The map in question must be alive, either being the map for the current + * process, or the owner process hold count has been incremented to prevent * exit(). * * If the thread private TDP_NOFAULTING flag is set, any fault results From nobody Wed Dec 24 00:46:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbY9T3FwYz6LBmH for ; Wed, 24 Dec 2025 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY9T2hg2z3bdZ for ; Wed, 24 Dec 2025 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766537213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPg3njn66NniF9Von1+2s8AKygi2ZDN6g244Hn16ews=; b=am9iRcv+8qLHUQLKmmNdMVhffXFVjjMtYt51waLTuM2+6at1szfLRmqvykt4OEH0zw+qi+ TRokn5cmx/hn4XnUdMTWpwluBFIGyjiWE+4YotkIb/svciDZmsEzCFaOF+OO8FOvQ9lbQj C+Au5uDI5RKUrWzACS1P/YtI3MZxpAI8bAjEIjexy7qA983l+A8haroiguxRBUusHXNDX/ 9iB9mU4/KyVi01qR0RIWPaMtP3N4amOrtxbkICNBLLDiWYm5Zvy2fTP2a/4yULiQLO/FT/ AYU1MUiWEZtKwI0+J3ABX9t220T1D3+Ze1qXWFvZ2zmgfFrffsKU+7AFhsDAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766537213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPg3njn66NniF9Von1+2s8AKygi2ZDN6g244Hn16ews=; b=MHNUo89/nj4CGCCLH5/Pqx7VZ1i7gOSmetTfJLnJKaaJEB9WoYr1IK9L8y1lWu0hbypqJL IDMPCgsiJZoutjmZkxjMKraNyaYaKp0/07pUr1nJ99TUA12Oc4+yE39LFA5kbcRa/jc1UC VZ7uRR/R6NIGrMnrYGuz6yPyw+NOw58JLmBxlPRuV7ZEw5Lg13Fc+5ZX2gfpu9nCmR7bOp vQZ3WE/0F2P85xlLr3Q/OuzIWxiqWxT8UMoLZykx/7RwCWYSWNn6ebvFGd2dyBSA/uWMTs iOWdMuLpLaMo6mVHVslUy8f+Q6x6mR8X5e5YY0uZu0S7FLLiogxkOFL64ieUnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766537213; a=rsa-sha256; cv=none; b=uECCoDAh0kRXApk8+N0mnXvo0Osr5FxHh6Sjb5Meh/V1aJa7BgPm6rYkR31hDvqUDZhx1t Tao92ZK2dksCXLxQXx3McMEqXrh8K9uhiOLNkB6/9qNFc+ovHMHKy5APQb7K493UlE7/cM aFcE/KrtLYbOufYp3JKJo8/Egwf4rPfumuwRyMk6RP7MJPgkwv2/YUCdu7lsU7Z1C+Deau k77f5CquQXLDx4eXG/rkAfysz/Aia/4/R6ekegYZwgVfSKtn5t3XqD9xeiLBZaz3WWrjeW nYkwd6omG1xmqicufANaIqhOxSgu3Ci00lqnJ8aDuBUNFBXsdHFSQc1JVFxUIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY9T20l1z439 for ; Wed, 24 Dec 2025 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:46:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b29fb0b5259c - stable/14 - devfs: make destroy_dev() a release barrier for cdevpriv destructors runs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b29fb0b5259cc991d6e51e0de53455701014858e Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:46:53 +0000 Message-Id: <694b37fd.31a42.677655fb@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b29fb0b5259cc991d6e51e0de53455701014858e commit b29fb0b5259cc991d6e51e0de53455701014858e Author: Konstantin Belousov AuthorDate: 2025-10-23 18:37:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:43:07 +0000 devfs: make destroy_dev() a release barrier for cdevpriv destructors runs (cherry picked from commit 4dbe6628179d8e6bf400bfdb4bfa869bdc102a56) --- sys/fs/devfs/devfs_int.h | 1 + sys/fs/devfs/devfs_vnops.c | 17 ++++++++++++++--- sys/kern/kern_conf.c | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h index 916297425b53..9fa75c0e90ad 100644 --- a/sys/fs/devfs/devfs_int.h +++ b/sys/fs/devfs/devfs_int.h @@ -67,6 +67,7 @@ struct cdev_priv { void *cdp_dtr_cb_arg; LIST_HEAD(, cdev_privdata) cdp_fdpriv; + u_int cdp_fdpriv_dtrc; struct mtx cdp_threadlock; }; diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 2a4576320286..1ff24b54cbf0 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -202,14 +202,25 @@ devfs_foreach_cdevpriv(struct cdev *dev, int (*cb)(void *data, void *arg), void devfs_destroy_cdevpriv(struct cdev_privdata *p) { + struct file *fp; + struct cdev_priv *cdp; mtx_assert(&cdevpriv_mtx, MA_OWNED); - KASSERT(p->cdpd_fp->f_cdevpriv == p, - ("devfs_destoy_cdevpriv %p != %p", p->cdpd_fp->f_cdevpriv, p)); - p->cdpd_fp->f_cdevpriv = NULL; + fp = p->cdpd_fp; + KASSERT(fp->f_cdevpriv == p, + ("devfs_destoy_cdevpriv %p != %p", fp->f_cdevpriv, p)); + cdp = cdev2priv((struct cdev *)fp->f_data); + cdp->cdp_fdpriv_dtrc++; + fp->f_cdevpriv = NULL; LIST_REMOVE(p, cdpd_list); mtx_unlock(&cdevpriv_mtx); (p->cdpd_dtr)(p->cdpd_data); + mtx_lock(&cdevpriv_mtx); + MPASS(cdp->cdp_fdpriv_dtrc >= 1); + cdp->cdp_fdpriv_dtrc--; + if (cdp->cdp_fdpriv_dtrc == 0) + wakeup(&cdp->cdp_fdpriv_dtrc); + mtx_unlock(&cdevpriv_mtx); free(p, M_CDEVPDATA); } diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index db5fe7a6a373..dcc7ebafb13c 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -1164,6 +1164,9 @@ destroy_devl(struct cdev *dev) devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } + while (cdp->cdp_fdpriv_dtrc != 0) { + msleep(&cdp->cdp_fdpriv_dtrc, &cdevpriv_mtx, 0, "cdfdpc", 0); + } mtx_unlock(&cdevpriv_mtx); dev_lock(); From nobody Wed Dec 24 00:46:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbY9V6CSHz6LBfl for ; Wed, 24 Dec 2025 00:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY9V3DSHz3bMy for ; Wed, 24 Dec 2025 00:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766537214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZw0Pem+fhcJ9L+gz2XhFhbQFRPk5sZ9Zl0rt9rp3Oc=; b=UxCRrUNkiC0IEUjHI7YYLA3B7KdsR2v514G++f28h0kSR2GVZrzUzledf6sywpX7jNZ0RY aW8A3MwMFDCXFYOtwDW48vILMBDQu+gecIyDs0+fNNQViga+3NunxLkHBrLVvm+mhDZepm YgSwg0U8mKN4yC7MoWTs62YHTlAoYRhQzfCndjKnymfeSorLCMbI+4LPfP2pDSSw15WBc0 N3YM/WUCISYtUNvAH7FeKJg/WO/j21wRfGnPH+Aq9Ytgm9srikRv+cDvZyap9EWWZn0bIB FPeTpeM1u8oMtqcGv3gkQXSCpbEyxkd8OumfwMa70vHCPU8vwhSlNzZL64qLmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766537214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZw0Pem+fhcJ9L+gz2XhFhbQFRPk5sZ9Zl0rt9rp3Oc=; b=PDXBfFSrBM7di/vjLJkxSeYu/WGejPsDjzRlZHd2mEdx3r1Ncp7M/MgxqlABXmsJP8JBuq vrE4Ah6VuMEnR0xV+I+kpIRcB7UxArSDpWjgvJVx+PL4VTZd7ylei0A37qeLijeQlkJpXO A8QtKEkfT7/0jCzNrdAzWOsenkL43NvlLPUuMLcKp2Aacl67Y2oFfOEXO0TujcdJC8W7dj lXkaQI33TYrUu8TVnSxEdTnSGJ0a07CeRahLAuXeXW9dMGs+yFuWbEi0T6YGedSwGDhgHr uqTZ63Sj7cD/ISOQ1QzgMSpfB1U53uAW/9NCpPKq2/EsjjEIvsoJ4d+QZ4WP0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766537214; a=rsa-sha256; cv=none; b=Viec7CR8SjHS4Ij5U8piIqxoYJPLNzrldEmIJV4bkvQeXU9pxe1Era36VWivn9psJd8e4m yWsOubdOuIssOJ75IiIdwKCXPOc1CML1njxXOCtEOGedarCAwRNFCMRqBb1rXxuSq+p/be 7DfEVjw2pX/47jFEDE7fSg8LKB3uzecSO4w6b0r6B5K0BEHTul5+uz0wKX8oIuH+BKbtam zffLjrMCuMJiSzXgU7iICc0JWBHTgByQc5opxqVWp0oitfZFXQuNq8jBurFsIYkpmMfXi/ ysN/b6VXQkJbc4hNg4d9Xdz6Qh7fTWu94S8Hd+vYNAUWZemgb8rjBqQP4kFAFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY9V2mCZz4Yp for ; Wed, 24 Dec 2025 00:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30742 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:46:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e6bdbc17bec4 - stable/14 - vm_fault_trap(): fix comments grammar List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6bdbc17bec4645946838c18f1c3b3dfdf50707e Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:46:54 +0000 Message-Id: <694b37fe.30742.262414f5@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6bdbc17bec4645946838c18f1c3b3dfdf50707e commit e6bdbc17bec4645946838c18f1c3b3dfdf50707e Author: Konstantin Belousov AuthorDate: 2025-12-21 21:21:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:43:07 +0000 vm_fault_trap(): fix comments grammar (cherry picked from commit 95788a851deb33242c18beb47f8a79eec320dfa5) --- sys/vm/vm_fault.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 87744e2d3210..418f39ac2a2b 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -700,10 +700,10 @@ _Static_assert(UCODE_PAGEFLT == T_PAGEFLT, "T_PAGEFLT"); /* * vm_fault_trap: * - * Helper for the page fault trap handlers, wrapping vm_fault(). - * Issues ktrace(2) tracepoints for the faults. + * Helper for the machine-dependent page fault trap handlers, wrapping + * vm_fault(). Issues ktrace(2) tracepoints for the faults. * - * If a fault cannot be handled successfully by satisfying the + * If the fault cannot be handled successfully by updating the * required mapping, and the faulted instruction cannot be restarted, * the signal number and si_code values are returned for trapsignal() * to deliver. @@ -1622,10 +1622,10 @@ vm_fault_object(struct faultstate *fs, int *behindp, int *aheadp) * The given address should be truncated to the proper page address. * * KERN_SUCCESS is returned if the page fault is handled; otherwise, a - * Mach error specifying why the fault is fatal is returned. + * Mach error code explaining why the fault is fatal is returned. * - * The map in question must be alive, either being the map for current - * process, or the owner process hold count incremented to prevent + * The map in question must be alive, either being the map for the current + * process, or the owner process hold count has been incremented to prevent * exit(). * * If the thread private TDP_NOFAULTING flag is set, any fault results From nobody Wed Dec 24 07:21:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbjwk6gCqz6Lhk3 for ; Wed, 24 Dec 2025 07:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbjwk5jfDz46RT for ; Wed, 24 Dec 2025 07:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766560886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SOiQXTku0enNmMpxs3BIhmaslsEu9TLimk+9uzBvepU=; b=Rx9RuVf5bQcASbFSdusXbRCD3g4HqzlpoczZpY2f5it9nzoyP2ooRQFQs2dHKwaYxXIhqz piiO90vGHXWmB9pYvHs+yByUjEBaDbNhhsD1erJtuedozAnlkOHJPV8+itXI/jV3jEuIrK GNMMwu9ChGKRIMh7wkY00npCaV2RheexjoooGzhDzhDcbVrB5xd563eV+JuYEK4XYm9qIz wcJIzCsYbfzDEcWbjyWdlUJDXfL/AUwKN7oFrc9SDNs9aHlFhuPHsH930WjJGJ9SfHEGDk a76T6ZCLUiSknqPd/MeSYIQe+4RzyBdMWu4B6v1KomN7bf0s4choLSJesc1raA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766560886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SOiQXTku0enNmMpxs3BIhmaslsEu9TLimk+9uzBvepU=; b=oRYGk8it2A9nwGRGbUFb/5xlo9SY+A9FzJQnuj+a9bttFEQqQjl56gGV5Hp4Ec5Vag/XcZ 4l9OD3YJ8Rp/E/birDU88rJug+PQzgQIFSg/2pb9k/b+MXbJQUn7yI9E2Mq2RJ/dLR2yQK gZlttDYcXq9bdL5lE3cfxgG1NIWf79Zy7pkuhFIk9isvyzvaY596Au94DwWi3+6mWfpz27 bFtw17nyVHJgofHAvhPF7fjFmhZzYFMMwnhk6X7EUbs2cUp8UCCr3jKrM7BRCvo6ssmVZH ywlhOjB0nUfVeSBLyrLhBvnUt+woPGAiJ40LRy/WjDSCxgZvhXbd0sgumcAjTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766560886; a=rsa-sha256; cv=none; b=U1yItkjL7I+p/DWxRAPt/MI4OXsfHE+zrTj8YESNEeVBUZbVtuYq6KtQKxJgV4iwGKTqwZ Eb7pui1woCaAdBj0xcyXVC8HsvZ5P57GxQcFZKtD8CgENA9u5vJvis7fUgw8/V8aq4GL5o v2j9fI8AKFfjevArw7SrrA5SRz+e+zt3kNRQ89qf+f1RIbvoYZuh6fQVOdKWyGhMPRrakZ EqJwp0XwbY76sZYMj3XA/gjU8KvRnIBpmCK5MVh3Sbf5ZjG6bOdI6rKcyfH41D5KGH9nxq 25+rvVWP06JAGJp3SDgeN0gXLQmGTBRE+XwmNbURIEV8OUuRhv/C4+s9yAjnFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbjwk5Fq1zYBH for ; Wed, 24 Dec 2025 07:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 388ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 07:21:21 +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: 5fa23c5c21a4 - stable/15 - unionfs: Support renaming symbolic links List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5fa23c5c21a404de315e2f178b3170fa165a76cc Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 07:21:21 +0000 Message-Id: <694b9471.388ff.1b93c071@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa23c5c21a404de315e2f178b3170fa165a76cc commit 5fa23c5c21a404de315e2f178b3170fa165a76cc Author: Dag-Erling Smørgrav AuthorDate: 2025-12-17 22:38:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-24 07:21:01 +0000 unionfs: Support renaming symbolic links This adds support for renaming a symbolic link found on the lower fs, which necessitates copying it to the upper fs, as well as basic tests. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: olce, siderop1_netapp.com, jah Differential Revision: https://reviews.freebsd.org/D54229 (cherry picked from commit a678e87f5533521f6dec1a4e85c3decb1c3b6584) --- etc/mtree/BSD.tests.dist | 2 + sys/fs/unionfs/union.h | 1 + sys/fs/unionfs/union_subr.c | 168 +++++++++++++++++++++++++++++++++++ sys/fs/unionfs/union_vnops.c | 10 +++ tests/sys/fs/Makefile | 1 + tests/sys/fs/unionfs/Makefile | 8 ++ tests/sys/fs/unionfs/unionfs_test.sh | 165 ++++++++++++++++++++++++++++++++++ 7 files changed, 355 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 41151d35e518..641846ebb603 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -824,6 +824,8 @@ .. tmpfs .. + unionfs + .. .. geom class diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index 0bd1894a2195..fe5a578ef4dc 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -142,6 +142,7 @@ void unionfs_tryrem_node_status(struct unionfs_node *, int unionfs_check_rmdir(struct vnode *, struct ucred *, struct thread *td); int unionfs_copyfile(struct vnode *, int, struct ucred *, struct thread *); +int unionfs_copylink(struct vnode *, struct ucred *, struct thread *); void unionfs_create_uppervattr_core(struct unionfs_mount *, struct vattr *, struct vattr *, struct thread *); int unionfs_create_uppervattr(struct unionfs_mount *, struct vnode *, diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index f99d9fe9ca35..1ceb6a50c01d 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -1516,6 +1516,174 @@ unionfs_copyfile_cleanup: return (error); } +/* + * Create a new symbolic link on upper. + * + * If an error is returned, *vpp will be invalid, otherwise it will hold a + * locked, referenced and opened vnode. + * + * unp is never updated. + */ +static int +unionfs_vn_symlink_on_upper(struct vnode **vpp, struct vnode *udvp, + struct vnode *vp, struct vattr *uvap, const char *target, + struct thread *td) +{ + struct unionfs_mount *ump; + struct unionfs_node *unp; + struct vnode *uvp; + struct vnode *lvp; + struct ucred *cred; + struct vattr lva; + struct nameidata nd; + int error; + + ASSERT_VOP_ELOCKED(vp, __func__); + unp = VTOUNIONFS(vp); + ump = MOUNTTOUNIONFSMOUNT(UNIONFSTOV(unp)->v_mount); + uvp = NULL; + lvp = unp->un_lowervp; + cred = td->td_ucred; + error = 0; + + if ((error = VOP_GETATTR(lvp, &lva, cred)) != 0) + return (error); + unionfs_create_uppervattr_core(ump, &lva, uvap, td); + + if (unp->un_path == NULL) + panic("%s: NULL un_path", __func__); + + nd.ni_cnd.cn_namelen = unp->un_pathlen; + nd.ni_cnd.cn_pnbuf = unp->un_path; + nd.ni_cnd.cn_nameiop = CREATE; + nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | ISLASTCN; + nd.ni_cnd.cn_lkflags = LK_EXCLUSIVE; + nd.ni_cnd.cn_cred = cred; + nd.ni_cnd.cn_nameptr = nd.ni_cnd.cn_pnbuf; + NDPREINIT(&nd); + + vref(udvp); + VOP_UNLOCK(vp); + if ((error = vfs_relookup(udvp, &uvp, &nd.ni_cnd, false)) != 0) { + vrele(udvp); + return (error); + } + + if (uvp != NULL) { + if (uvp == udvp) + vrele(uvp); + else + vput(uvp); + error = EEXIST; + goto unionfs_vn_symlink_on_upper_cleanup; + } + + error = VOP_SYMLINK(udvp, &uvp, &nd.ni_cnd, uvap, target); + if (error == 0) + *vpp = uvp; + +unionfs_vn_symlink_on_upper_cleanup: + vput(udvp); + return (error); +} + +/* + * Copy symbolic link from lower to upper. + * + * vp is a unionfs vnode that should be locked on entry and will be + * locked on return. + * + * If no error returned, unp will be updated. + */ +int +unionfs_copylink(struct vnode *vp, struct ucred *cred, + struct thread *td) +{ + struct unionfs_node *unp; + struct unionfs_node *dunp; + struct mount *mp; + struct vnode *udvp; + struct vnode *lvp; + struct vnode *uvp; + struct vattr uva; + char *buf = NULL; + struct uio uio; + struct iovec iov; + int error; + + ASSERT_VOP_ELOCKED(vp, __func__); + unp = VTOUNIONFS(vp); + lvp = unp->un_lowervp; + uvp = NULL; + + if ((UNIONFSTOV(unp)->v_mount->mnt_flag & MNT_RDONLY)) + return (EROFS); + if (unp->un_dvp == NULL) + return (EINVAL); + if (unp->un_uppervp != NULL) + return (EEXIST); + + udvp = NULL; + VI_LOCK(unp->un_dvp); + dunp = VTOUNIONFS(unp->un_dvp); + if (dunp != NULL) + udvp = dunp->un_uppervp; + VI_UNLOCK(unp->un_dvp); + + if (udvp == NULL) + return (EROFS); + if ((udvp->v_mount->mnt_flag & MNT_RDONLY)) + return (EROFS); + ASSERT_VOP_UNLOCKED(udvp, __func__); + + error = unionfs_set_in_progress_flag(vp, UNIONFS_COPY_IN_PROGRESS); + if (error == EJUSTRETURN) + return (0); + else if (error != 0) + return (error); + + uio.uio_td = td; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_offset = 0; + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + iov.iov_base = buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + uio.uio_resid = iov.iov_len = MAXPATHLEN; + uio.uio_rw = UIO_READ; + + if ((error = VOP_READLINK(lvp, &uio, cred)) != 0) + goto unionfs_copylink_cleanup; + buf[iov.iov_len - uio.uio_resid] = '\0'; + if ((error = vn_start_write(udvp, &mp, V_WAIT | V_PCATCH)) != 0) + goto unionfs_copylink_cleanup; + error = unionfs_vn_symlink_on_upper(&uvp, udvp, vp, &uva, buf, td); + vn_finished_write(mp); + if (error != 0) { + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + goto unionfs_copylink_cleanup; + } + + vn_lock_pair(vp, false, LK_EXCLUSIVE, uvp, true, LK_EXCLUSIVE); + unp = VTOUNIONFS(vp); + if (unp == NULL) { + error = ENOENT; + goto unionfs_copylink_cleanup; + } + + if (error == 0) { + /* Reset the attributes. Ignore errors. */ + uva.va_type = VNON; + VOP_SETATTR(uvp, &uva, cred); + unionfs_node_update(unp, uvp, td); + } + +unionfs_copylink_cleanup: + if (buf != NULL) + free(buf, M_TEMP); + unionfs_clear_in_progress_flag(vp, UNIONFS_COPY_IN_PROGRESS); + return (error); +} + /* * Determine if the unionfs view of a directory is empty such that * an rmdir operation can be permitted. diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 410ab413b172..8e6b11548a36 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1478,6 +1478,13 @@ unionfs_rename(struct vop_rename_args *ap) */ VOP_UNLOCK(tdvp); relock_tdvp = true; + } else if (fvp->v_type == VLNK) { + /* + * The symbolic link case is similar to the + * regular file case. + */ + VOP_UNLOCK(tdvp); + relock_tdvp = true; } else if (fvp->v_type == VDIR && tdvp != fdvp) { /* * For directories, unionfs_mkshadowdir() will expect @@ -1501,6 +1508,9 @@ unionfs_rename(struct vop_rename_args *ap) case VREG: error = unionfs_copyfile(fvp, 1, fcnp->cn_cred, td); break; + case VLNK: + error = unionfs_copylink(fvp, fcnp->cn_cred, td); + break; case VDIR: error = unionfs_mkshadowdir(fdvp, fvp, fcnp, td); break; diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile index e36a97d2335a..254394f43714 100644 --- a/tests/sys/fs/Makefile +++ b/tests/sys/fs/Makefile @@ -14,6 +14,7 @@ TESTS_SUBDIRS+= fusefs .endif TESTS_SUBDIRS+= tarfs TESTS_SUBDIRS+= tmpfs +TESTS_SUBDIRS+= unionfs ${PACKAGE}FILES+= h_funcs.subr ${PACKAGE}FILESDIR= ${TESTSDIR} diff --git a/tests/sys/fs/unionfs/Makefile b/tests/sys/fs/unionfs/Makefile new file mode 100644 index 000000000000..da25fcefb473 --- /dev/null +++ b/tests/sys/fs/unionfs/Makefile @@ -0,0 +1,8 @@ +PACKAGE= tests + +TESTSDIR= ${TESTSBASE}/sys/fs/unionfs +BINDIR= ${TESTSDIR} + +ATF_TESTS_SH+= unionfs_test + +.include diff --git a/tests/sys/fs/unionfs/unionfs_test.sh b/tests/sys/fs/unionfs/unionfs_test.sh new file mode 100644 index 000000000000..ee8a9bae19e7 --- /dev/null +++ b/tests/sys/fs/unionfs/unionfs_test.sh @@ -0,0 +1,165 @@ +#!/bin/sh +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Klara, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# Create and mount a filesystem for use in our tests +unionfs_mkfs() { + local name=$1 + local size=${2:-1} + # Create mountpoint + atf_check mkdir ${name} + # Create filesystem image + atf_check -e ignore dd if=/dev/zero of=${name}.img bs=1m count=${size} + echo ${name} >>imgs + # Create memory disk + atf_check -o save:${name}.md mdconfig ${name}.img + md=$(cat ${name}.md) + echo ${md} >>mds + # Format and mount filesystem + atf_check -o ignore newfs /dev/${md} + atf_check mount /dev/${md} ${name} + echo ${name} >>mounts +} + +# Mount a unionfs +unionfs_mount() { + local upper=$1 + local lower=$2 + # Mount upper over lower + atf_check mount -t unionfs ${upper} ${lower} + echo ${lower} >>mounts +} + +# Clean up after a test +unionfs_cleanup() { + # Unmount filesystems + if [ -f mounts ]; then + tail -r mounts | while read mount; do + umount ${mount} || true + done + fi + # Destroy memory disks + if [ -f mds ]; then + tail -r mds | while read md; do + mdconfig -d -u ${md} || true + done + fi + # Delete filesystem images and mountpoints + if [ -f imgs ]; then + tail -r imgs | while read name; do + rm -f ${name}.img || true + rmdir ${name} || true + done + fi +} + +atf_test_case unionfs_basic cleanup +unionfs_basic_head() { + atf_set "descr" "Basic function test" + atf_set "require.user" "root" + atf_set "require.kmods" "unionfs" +} +unionfs_basic_body() { + # Create upper and lower + unionfs_mkfs upper + unionfs_mkfs lower + # Mount upper over lower + unionfs_mount upper lower + # Create object on unionfs + atf_check touch upper/file + atf_check mkdir upper/dir + atf_check touch lower/dir/file + # Verify that objects were created on upper + atf_check test -f lower/file + atf_check test -d lower/dir + atf_check test -f upper/dir/file +} +unionfs_basic_cleanup() { + unionfs_cleanup +} + +atf_test_case unionfs_exec cleanup +unionfs_exec_head() { + atf_set "descr" "Test executing programs" + atf_set "require.user" "root" + atf_set "require.kmods" "unionfs" +} +unionfs_exec_body() { + # Create upper and copy a binary to it + unionfs_mkfs upper + atf_check cp -p /usr/bin/true upper/upper + # Create lower and copy a binary to it + unionfs_mkfs lower + atf_check cp -p /usr/bin/true lower/lower + # Mount upper over lower + unionfs_mount upper lower + # Execute both binaries + atf_check lower/lower + atf_check lower/upper +} +unionfs_exec_cleanup() { + unionfs_cleanup +} + +atf_test_case unionfs_rename cleanup +unionfs_rename_head() { + atf_set "descr" "Test renaming objects on lower" + atf_set "require.user" "root" + atf_set "require.kmods" "unionfs" +} +unionfs_rename_body() { + # Create upper and lower + unionfs_mkfs upper + unionfs_mkfs lower + # Create objects on lower + atf_check touch lower/file + atf_check mkdir lower/dir + atf_check ln -s dead lower/link + # Mount upper over lower + unionfs_mount upper lower + # Rename objects + atf_check mv lower/file lower/newfile + atf_check mv lower/dir lower/newdir + atf_check mv lower/link lower/newlink + # Verify that old names no longer exist + atf_check test ! -f lower/file + atf_check test ! -d lower/dir + atf_check test ! -L lower/link + # Verify that new names exist on upper + atf_check test -f upper/newfile + atf_check test -d upper/newdir + atf_check test -L upper/newlink +} +unionfs_rename_cleanup() { + unionfs_cleanup +} + +atf_init_test_cases() { + atf_add_test_case unionfs_basic + atf_add_test_case unionfs_exec + atf_add_test_case unionfs_rename +} From nobody Wed Dec 24 15:57:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbxMq6mgGz6LBMk for ; Wed, 24 Dec 2025 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbxMq6C0cz3tFw for ; Wed, 24 Dec 2025 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766591831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qjaDP+XQLlRi+NeGmsEfuyiQgCPWPHuZYzHL9Igz8qA=; b=pbUyW08QW++14PvZUqK/plALLlZfoMF7FpEaNEYpA0qKDdZW52PPX6fFj+YorU7mGUBHBe O3MozrS3W4cCUsRC9yPTl0UsZF/eUNXEE7lB/qfEnAooT4FoBjq43CXIoickRRJdGBmZQl JzQcegAR10A1i1J9dwcYHBNRcmvaT/bXLAFS7LZ2DPfCsLJB97WcM/wiEA1XqXmXgbwGJl aGy6SU2eqJ3PSWM9TZdGFvpI13BJmvX0tTG45047v81+QXD/tMrws+qhmcO5bAVtWFxuws StV8LkyHYaTwUnsTRxkBXSGhjH46yXV8gnkIt2ucxQk/D92zPygSyKjQw870qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766591831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qjaDP+XQLlRi+NeGmsEfuyiQgCPWPHuZYzHL9Igz8qA=; b=ZahbA9lsq7ceJ/qfRIYzjFtcg4zLpQjzz+8+Sz521wBtaau2DEGu0uEurxmVM6zTlWc2cR EO7ePZSSH1PfDLC5yy+TMYpPGiCl0hHxuyhLWwwMpABlpSp9MEKK+paY9MOTsBPE24R0nZ FFC095DR4vGm9v4/s3mPowfveDch/B3geCW2H62phK3nFIW8xjy0w2h0RnWhlDABQ2DvDH fxRme1TORldVqfTjx3DpzBa62X4qqlCCColeZd+y/dbmpeS6NGGGp/nrr72VXn2GBfD2Dw TYHcbzBHpMSqVCppGuH2y3gN23fJlPphAT5QtWVlLyAy2nHnOxmGbEyJ1t7MIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766591831; a=rsa-sha256; cv=none; b=AYbK6OyWlseqbvDULwMxHhXPFMfIih9o/WGSQGKr0StGuxurJiLQzdgC+hmEnTlGzvx8ZM CpInf9HewAgn23dc93aNcetweoAjVHqEG2a4f8bNrg3qDe59R45rDJ/EaMY9MalAe4kKql c93/48Zz54hxxSGwm/0Jdz3g3hfJDUBmVm59N8TVRJmajTvQjuNFIHm16AuidG5JVPW01/ PppNsG8CLtamorlNKR4xyHFQJFYaClw+YVKX4c+P0JnVe/Fn26/OFCCb1bX8Id+vNnGWHp 5fNNf2zIU2K/fw3O02EtiCazihkVyyyq2hIbyPCYC0znOCfdVr4JfwVP2yLOLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbxMq5Q7vzpPF for ; Wed, 24 Dec 2025 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a81d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 15:57:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 160077a4d751 - main - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 160077a4d75186a979f28f0778259c66d8cac8be Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 15:57:11 +0000 Message-Id: <694c0d57.a81d.7eb74ea3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=160077a4d75186a979f28f0778259c66d8cac8be commit 160077a4d75186a979f28f0778259c66d8cac8be Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2025-12-24 15:52:48 +0000 OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f86e9d0dc192..a7ae52650999 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -892,14 +892,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3870,7 +3870,7 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif -.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if ${MK_LLDB} == no || ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatelldb.so.19 .endif From nobody Wed Dec 24 16:30:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dby6p2DMTz6LF0k for ; Wed, 24 Dec 2025 16:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dby6n6w8Lz3w9y for ; Wed, 24 Dec 2025 16:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766593858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ThY2dqZ7dcSnDoWRv02Zv935w2GDepl1+gogBbW8aek=; b=gpeJSF5l07jENfIWEdAaS6w1msTE7RFKq602fk1aAXttTiaTYMEOJgr+hB1ttpc21q+WHd EH9HvUfnq3eX3dXUFW1afE86FJbIWoxtBF0UeU2RwJtbtjC7SVs5QjSRAGm85naVa6S3IY /NyZgqRO8qq9b5lc7GJMekSEcRBKB7BwavPGbnAoZm0zAZ9HT77rf41Ehf4ApxnCFv2X9V qKCeHybK0OBodbPSORXolwms4Jg1ax2svQdyDtEhf2xkfC3R6uQt6a6YMO4TLF/PhaA8jc Ob2uyDMcKum+6JTpoRVcJtst/inbbboSXfzUwWcDg468o/0QSivlH8vorarsEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766593858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ThY2dqZ7dcSnDoWRv02Zv935w2GDepl1+gogBbW8aek=; b=TgiTs794iAuZvo1mGSwyOXRHipj8KEX5C0sK87KRlwHHUQjy/SiEAGyFb9YcvMqZWvIKRx CFJteMpZVXLW+5j8seVyvPzJdcsr1GHX4Yl3B+KUkRfybg3X48zimL6/qzbWwUFJMB7ZNW GErY4Kju2gyWIcCpWcA8tUKMoU69r2GYg9RRn+27lm9I7H78MkjkXSFQqKtaYdkdYffB5u Bc1tU61S+VZQk6c7fP5tmW+GTN6YbFGiRq8qmYUBHqPa4QRocg0kKDahot4pRzXYL694sn UixPPO5aocNOsp3JCs82bJsA2XtK+QQu5+D2geSTCptAByeyURgOoZWI4QAAdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766593858; a=rsa-sha256; cv=none; b=fTtdcAHBhDj7/MH0/wEB04jojGTAzDCbflsAxCYcy8/TmpE/R0zW9RN0uoxvhUpGYcSySK Y1qwbT/0VLtHRPfLtw01hAi9S0V7m0WSYwqg5dXG/Kn/HRJeChq0v7DcY3hvbnBrruBEMX hprjtbGx9vLXzUnS+DptnWw2c8v8Hw+kAbnQVsd7UtOkLZVrBpO8AplOR8GEYjfwzIcK2i KpuPXiqPv01naIdMlZn3YjUdT/px0vXeZGsehDoSaPt1NP7NbfFO+EjpsMdTBYh8X2Zjow 8BqSER+GCNnykP0TXRWuXEFZUq38It1IYK7AJT2eazei5xOlJmAy/XOGJ5YhLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dby6n6Sdvzq5H for ; Wed, 24 Dec 2025 16:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dd78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 16:30:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 4f184fd35d81 - main - nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f184fd35d81bbd85284d47d2a65aeece67e87d4 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 16:30:57 +0000 Message-Id: <694c1541.dd78.7e393209@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4f184fd35d81bbd85284d47d2a65aeece67e87d4 commit 4f184fd35d81bbd85284d47d2a65aeece67e87d4 Author: Rick Macklem AuthorDate: 2025-12-24 16:29:29 +0000 Commit: Rick Macklem CommitDate: 2025-12-24 16:29:29 +0000 nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup The nfsd can be configured to support NFSv3, NFSv4 or both of them. This patch adds a short paragraph to nfsd.8 to explain this. This is a content change. Reviewed by: kib, zaiee (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54279 --- usr.sbin/nfsd/nfsd.8 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index 2e5724dbce33..79085d33230c 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 30, 2025 +.Dd December 23, 2025 .Dt NFSD 8 .Os .Sh NAME @@ -46,7 +46,7 @@ NFS server .Sh DESCRIPTION The .Nm -utility runs on a server machine to service NFS requests from client machines. +utility runs on a server machine to service NFSv4 and/or NFSv3 requests from client machines. At least one .Nm must be running for a machine to operate as a server. @@ -54,6 +54,62 @@ must be running for a machine to operate as a server. Unless otherwise specified, eight servers per CPU for UDP transport are started. .Pp +The +.Nm +server may be configured to serve NFSv3, NFSv4 or both of them. +When +.Bd +nfs_server_enable="YES" +.Ed +is set in +.Xr rc.conf 5 , +.Nm +is configured for NFSv3 only, by default. +To configure the +.Nm +to serve NFSv4, you must also: +.sp +.Bl -bullet -compact +.It +Add a +.Dq V4: +line to +.Xr exports 5 . +(This is needed as well as either the ZFS sharenfs property +or an exports line for each exported file system.) +.It +Either choose to do uids in +.Dq strings , +which is probably +the easiest unless you are doing +.Xr kerberos 7 +mounts or +run +.Xr nfsuserd 8 +.Pq choose one, not both of these . +Setting the sysctls MIBs +.Va vfs.nfs.enable_uidtostring +and +.Va vfs.nfsd.enable_stringtouid +to one and not running the nfsuserd chooses uids in +.Dq strings . +.It +Set +.Bd +nfsv4_server_enable="YES" +.Ed +in +.Xr rc.conf 5 +or set +.Bd +nfsv4_server_only="YES" +.Ed +in +.Xr rc.conf 5 +if you do not want NFSv3 to be served. +.El +.sp +.Pp When .Nm is run in an appropriately configured vnet jail, the server is restricted @@ -336,7 +392,9 @@ just do a .Xr pnfs 4 , .Xr pnfsserver 4 , .Xr exports 5 , +.Xr rc.conf 5 , .Xr stablerestart 5 , +.Xr kerberos 7 , .Xr gssd 8 , .Xr ipfw 8 , .Xr jail 8 , From nobody Wed Dec 24 18:19:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc0WZ6955z6LN14 for ; Wed, 24 Dec 2025 18:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc0WZ5WDFz44fF for ; Wed, 24 Dec 2025 18:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LEDiKFSo9NCl4fRvOmMr1QMq7x2SKU2Iu9ev53c7iic=; b=xybsEHDp9wzc+XqAKg2bgr5gQWTdMvQCCWtMth7EV5+JaPRfAPfKo8fUG8wEglrpyjDLSF lLQnXyvow6bjozLUsAzwdt1Ra7Eq40IBVLigMbfTxi8XZz6xUex6b0pVbkN9A2e89nUZ9r Mn9r84AEY5ufb+Kwx2Ims8ibou8alA0UrcHbTAFesi5A0xy9PYXLVvLDGvT4Do9TMIF9OC 00oVM8DOFcdLBjq2+2W6CfQrS64/rrr+wdNi6nN7xeZblExns34v29yzf+barCIVtLQXnu 4NKBrn/1Eg144SR/yHZCtu4BljhIeDG8hCcdRIH2Dl4XuOGYdjrSORwhVzxf2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LEDiKFSo9NCl4fRvOmMr1QMq7x2SKU2Iu9ev53c7iic=; b=BpBkVZY9fHue2D0mAZHOT+hy7Gz/TfYZntX3MY9zdDQDAb+Tgl/xIl/MeBra7FzipjG/Mo tZPDnfl+vYPNM2P0gi5ediYl90u3EV94J429RDBFmm6PHTvpcMh0+On8LxWspHjayKO82V OnTcy/w0JF13dY2VBt4eTWxLXPbPDyfcZXKc6YPdXrWpuJqj9KLZlw4claE2Nx0VPrUaBG IwQvc70fWlZrK3REJMkBu4Ct4M7UoZrIt87LsnOoCxi2ODQ+mfs4+O+zVqkIOzVXRcQysp hjVFOKEHW0Wg6iaqbAi9pKIbt4NHEvyfv8Ex+xGfZlg2c3qaL8NhLGhrjISeiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766600346; a=rsa-sha256; cv=none; b=QfD+kGc18Yros5WRNBDv7+joWis9igSRKpD/dUbnwpfSCEFz/LYijQzPejZ0ONrltwYBTF V4JNIO5Cs/z6Qt+ollTH4sXeBVCaMGrvNEdi465+e3+9dRC9EqXT9rN1L9zchCYypWav++ Om5f+3iq4nvU8YPH1EgTP6nQb+ka5QCcYLElYT+2Hw2AhV8Eud9WFP9GDme5CPnmxd0CMv fFpOceKAkZhuIOjtqmtKhl8G1zjJ6vDFA8jarLdupiAX9XJt3AqgMKH94Jjl/BVkcVyk/5 TR7ASAjPInFYPJCd3aU4hZLRVdHf+t9Gsf+qdzEvXTuLz4daMnvSS55L91RRXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc0WZ50LlztTx for ; Wed, 24 Dec 2025 18:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3098e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 18:19:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Sergey A. Osokin Subject: git: 2cf7b7af8fa7 - stable/15 - bsd-family-tree: add macOS 26 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2cf7b7af8fa7410c39ad190535402a48339645e7 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 18:19:06 +0000 Message-Id: <694c2e9a.3098e.4a494636@gitrepo.freebsd.org> The branch stable/15 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=2cf7b7af8fa7410c39ad190535402a48339645e7 commit 2cf7b7af8fa7410c39ad190535402a48339645e7 Author: Sergey A. Osokin AuthorDate: 2025-10-31 20:25:11 +0000 Commit: Sergey A. Osokin CommitDate: 2025-12-24 16:06:49 +0000 bsd-family-tree: add macOS 26 Sponsored by: tipi.work (cherry picked from commit c6e02892bbca1237546e3943c0971768822e1745) --- share/misc/bsd-family-tree | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index b0502dfc7925..82e9ac45c495 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -479,7 +479,10 @@ FreeBSD 5.2 | | | | | | | | | DragonFly 6.4.1 | | | | | DragonFly 6.4.2 | FreeBSD | | | | - | 14.3 | | OpenBSD 7.8 | + | 14.3 | | | | + | macOS | | | + | 26 | | | + | | | OpenBSD 7.8 | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -925,6 +928,7 @@ OpenBSD 7.7 2025-04-28 [OBD] DragonFly 6.4.1 2025-04-30 [DFB] DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] +macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] Bibliography From nobody Wed Dec 24 18:19:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc0Wc2fBgz6LMvC for ; Wed, 24 Dec 2025 18:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc0Wc0cy1z44hv for ; Wed, 24 Dec 2025 18:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600348; h=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=TbBkIPvJ1dsVZm2Fp8sZud241lbez8wfDRA/je14Y4Q=; b=GYMFJYRFKpf51gHTozc49oX0A894kLAkwqJZAi0sCY+PSPCEUXRBqz4TYOFhT/9KmC+KK3 NW0HWq+s64pXU+ZDET0B6C+rw9olhc8TbHxdjuzqSp17LgjB/1k3azs13BLHu+IJ2v+y8R KTBbbioMlfL3G3a4GxId52oqZPFmEtzwvOg35ipWJR8z18XoDAPw/Z1YFBEGg+ngl0zsi9 uPTQuUjMXSgoZjUWmqFO55sXyEBwPKnbDW0u2B5CAtpLVxnVLZ/OhwAqCI2AZM6J72M557 2wQklU2UM/kcWdcek+UMDltUMhub2F7hsUKoj1wtEoOg1p5H26npokoYULdfbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600348; h=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=TbBkIPvJ1dsVZm2Fp8sZud241lbez8wfDRA/je14Y4Q=; b=XJEGs5v8sBHo2ytDMg9m9LAQ19chGANahZkmTKbnDqrvhaGda8EKgemlrMbCZh3EK4wDSC ZdDVyd2RwYkOJQiCUU8uIL0GrIcr4XBwkw6UmP5EC4P5ABuo3Y1lPHajt8aloTOIrEMI0T 6k/tqRKgtnfHX+0CNm8rRX7Yde3h4WYf11lafokoT9C4r5jBBkLyjxmyfWw6OC3Q3ByYhC iaXEHkUFdqaGCAPV2Qs3cILTfV784e5f614SCP1xDn6BMzoLQA+zD4gZ+LKS2jdY6gMYOJ cbpcjNeNDQ8AxOsj+qUHD1copN0hiiMAimDnXDgcDrLNIqOzh3V577b+8z4uFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766600348; a=rsa-sha256; cv=none; b=Aw6704O2i8rpfW3M0jZUmJ4pohMRIdR5WbDOv17SG4ypvrbIY2/z+H2n7mf8igkbi5bBde SxSDlUfcHSlTwgBbTIcMapkH+UTCq8sn9uiIFvHoKZ+7mowKdMDQNWE0oQ+nuyvsAjuZdA X8u3IefBA7KqD4j65qCV/Y8AlQvNi6PujFh0ls3b9nZ9Gkun+27chVoLhEdkEBorl1G5ic He+JrMN6SD4nz3GFLIn5saFCh9eHj/V63wmb4b12uWQAGJUpl/8v3nGDoLv/UWIRA7u4QO N83NR8evDAzLtoneAFjT557FpC9idBRDItIH9HuUItnSHGRoAWgy0foKQ2wnRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc0Wb5gHpzsk6 for ; Wed, 24 Dec 2025 18:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30917 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 18:19:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Sergey A. Osokin Subject: git: d8ff327be726 - stable/15 - bsd-family-tree: Re-center OpenBSD line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d8ff327be726659c965fca54389c511dfb1746b7 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 18:19:07 +0000 Message-Id: <694c2e9b.30917.65b33572@gitrepo.freebsd.org> The branch stable/15 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=d8ff327be726659c965fca54389c511dfb1746b7 commit d8ff327be726659c965fca54389c511dfb1746b7 Author: Ed Maste AuthorDate: 2025-11-07 14:58:50 +0000 Commit: Sergey A. Osokin CommitDate: 2025-12-24 18:17:32 +0000 bsd-family-tree: Re-center OpenBSD line Commit 09aeca28dd75 ("BSD family tree: reduce OpenBSD-NetBSD crowding") moved OpenBSD releases over 2 spaces. Move the line through OpenBSD releases over as well. Reviewed by: obrien Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53635 (cherry picked from commit 1821cf482ff128b08bd65807e1f7aad7eb873e0b) --- share/misc/bsd-family-tree | 808 ++++++++++++++++++++++----------------------- 1 file changed, 404 insertions(+), 404 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 82e9ac45c495..01dfd4cc0cbf 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -83,410 +83,410 @@ FreeBSD 2.0.5 \ | BSD/OS 2.0.1 | | | | OpenBSD 2.3 | | | | | | BSD/OS 3.0 | FreeBSD 2.1 | | | | - | | | | *--NetBSD 1.1 -. BSD/OS 2.1 - | FreeBSD 2.1.5 | | | \ | - | | | | *--NetBSD 1.2 \ BSD/OS 3.0 - | FreeBSD 2.1.6 | | | \ OpenBSD 2.0 | - | | | | | \ | | - | FreeBSD 2.1.6.1 | | | \ | | - | | | | | \ | | - | FreeBSD 2.1.7 | | | | | | - | | | | | NetBSD 1.2.1 | | - | FreeBSD 2.1.7.1 | | | | | - | | | | | | - | | | | | | - *-FreeBSD 2.2 | | | | | - | \ | | | | | - | FreeBSD 2.2.1 | | | | | - | | | | | | | - | FreeBSD 2.2.2 | | | OpenBSD 2.1 | - | | | | | | | - | FreeBSD 2.2.5 | | | | | - | | | | | OpenBSD 2.2 | - | | | | *--NetBSD 1.3 | | - | FreeBSD 2.2.6 | | | | | | - | | | | | NetBSD 1.3.1 | BSD/OS 3.1 - | | | | | | OpenBSD 2.3 | - | | | | | NetBSD 1.3.2 | | - | FreeBSD 2.2.7 | | | | | | - | | | | | | | BSD/OS 4.0 - | FreeBSD 2.2.8 | | | | | | - | | | | | | | | - | v | | | | OpenBSD 2.4 | - | FreeBSD 2.2.9 | | | | | | - | | | | | | | -FreeBSD 3.0 <--------* | | v | | - | | | NetBSD 1.3.3 | | - *---FreeBSD 3.1 | | | | - | | | | | BSD/OS 4.0.1 - | FreeBSD 3.2----* | .--*--NetBSD 1.4 OpenBSD 2.5 | - | | | | | | | | | - | | | | | | | | | - | | | | | | | | | - | FreeBSD 3.3 | | | | NetBSD 1.4.1 | | - | | | | | | | OpenBSD 2.6 | - | FreeBSD 3.4 | | | | | | | - | | | | | | | | BSD/OS 4.1 -FreeBSD 4.0 | | | | | NetBSD 1.4.2 | | - | | | | | | | | | - | | | | | | | | | - | FreeBSD 3.5 | | | | | OpenBSD 2.7 | - | | | | | | | | | - | FreeBSD 3.5.1 | | | | | | | - | | | | | | | | - *---FreeBSD 4.1 | | | | | | | - | | | | | | | | | - | FreeBSD 4.1.1 | | / | | | | - | | | | / | | | | - | FreeBSD 4.2 Darwin/ | NetBSD 1.4.3 | | - | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2 - | | | | | | - | | | | | | - | | 10.0 *--NetBSD 1.5 | | - | FreeBSD 4.3 | | | | | - | | | | | OpenBSD 2.9 | - | | | | NetBSD 1.5.1 | | - | | | | | | | - | FreeBSD 4.4-. | | NetBSD 1.5.2 | | - | | | Mac OS X | | | | - | | | 10.1 | | OpenBSD 3.0 | - | FreeBSD 4.5 | | | | | | - | | \ | | | | BSD/OS 4.3 - | FreeBSD 4.6 \ | | | OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3 | | - | FreeBSD 4.6.2 Mac OS X | | | - | | 10.2 | | | - | FreeBSD 4.7 | | | | - | | | *--NetBSD 1.6 OpenBSD 3.2 | - | FreeBSD 4.8 | | | | | - | | | | NetBSD 1.6.1 | | - | |--------. | | | OpenBSD 3.3 BSD/OS 5.0 - | | \ | | | | | - | FreeBSD 4.9 | | | | OpenBSD 3.4 BSD/OS 5.1 ISE - | | | | | | | - | | | | | NetBSD 1.6.2 | - | | | | | | | - | | | | | | OpenBSD 3.5 - | | | | | v | - | FreeBSD 4.10 | | | | - | | | | | | - | FreeBSD 4.11 | | | | - | | | | | - | `-|------|-----------------|---------------------. - | | | | \ -FreeBSD 5.0 | | | | - | | | | | -FreeBSD 5.1 | | | DragonFly 1.0 - | \ | | | | - | ----- Mac OS X | | | - | 10.3 | | | -FreeBSD 5.2 | | | | - | | | | | | - | FreeBSD 5.2.1 | | | | - | | | | | - *-------FreeBSD 5.3 | | | | - | | | | OpenBSD 3.6 | - | | | *--NetBSD 2.0 | | - | | | | | | | DragonFly 1.2.0 - | | Mac OS X | | NetBSD 2.0.2 | | - | | 10.4 | | | | | - | FreeBSD 5.4 | | | | | | - | | | | | | OpenBSD 3.7 | - | | | | | NetBSD 2.0.3 | | - | | | | | | | | - *--FreeBSD | | | | v OpenBSD 3.8 | - | 6.0 | | | | | | - | | | | | \ | | - | | | | | NetBSD 2.1 | | - | | | | | | | - | | | | *--NetBSD 3.0 | | - | | | | | | | | DragonFly 1.4.0 - | | | | | | | OpenBSD 3.9 | - | FreeBSD | | | | | | | - | 6.1 | | | | | | | - | | FreeBSD 5.5 | | | | | | - | | | | | NetBSD 3.0.1 | DragonFly 1.6.0 - | | | | | | | | - | | | | | | OpenBSD 4.0 | - | | | | | NetBSD 3.0.2 | | - | | | | NetBSD 3.1 | | - | FreeBSD 6.2 | | | | - | | | | | DragonFly 1.8.0 - | | | | OpenBSD 4.1 | - | | | | | DragonFly 1.10.0 - | | Mac OS X | | | - | | 10.5 | | | - | | | | OpenBSD 4.2 | - | | | *--NetBSD 4.0 | | - | FreeBSD 6.3 | | | | | - | \ | | | | | - *--FreeBSD | | | | | DragonFly 1.12.0 - | 7.0 | | | | | | - | | | | | | OpenBSD 4.3 | - | | | | | NetBSD | DragonFly 2.0.0 - | | FreeBSD | | 4.0.1 OpenBSD 4.4 | - | | 6.4 | | | | - | | | | | | - | FreeBSD 7.1 | | | | - | | | | | DragonFly 2.2.0 - | FreeBSD 7.2 | *--NetBSD OpenBSD 4.5 | - | \ | | 5.0 | | - | \ | | / | \ | | - | | Mac OS X | | | \ | | - | | 10.6 | | | \ | | - | | | | | | NetBSD | DragonFly 2.4.0 - | | | | | | 5.0.1 OpenBSD 4.6 | - | | | | | | | | | - *--FreeBSD | | | | | | | | - | 8.0 | | | | | | | | - | | FreeBSD | | | | NetBSD | | - | | 7.3 | | | | 5.0.2 | DragonFly 2.6.0 - | | | | | | | OpenBSD 4.7 | - | FreeBSD | | | | | | | - | 8.1 | | | | | | | - | | | | | | | | DragonFly 2.8.2 - | | | | | | | OpenBSD 4.8 | - | | | | | | *--NetBSD | | - | FreeBSD FreeBSD | | | 5.1 | | - | 8.2 7.4 | | | | | DragonFly 2.10.1 - | | | | | | OpenBSD 4.9 | - | `-----. Mac OS X | | | | | - | \ 10.7 | | | | | - | | | | | | OpenBSD 5.0 | - *--FreeBSD | | | | | | | - | 9.0 | | | | NetBSD | DragonFly 3.0.1 - | | FreeBSD | | | 5.1.2 | | - | | 8.3 | | | | | | - | | | | | | NetBSD | | - | | | | | | 5.1.3 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 5.1.4 | | - | | | | | | OpenBSD 5.1 | - | | | Mac OS X | `--------. | | - | | | 10.8 | | | | - | | | | *--NetBSD | | | - | | | | | 6.0 | | | - | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1 - | FreeBSD | | | | | NetBSD | | - | 9.1 | | | | | 5.2 | | - | | | | | | | | | | - | | | | | | | NetBSD | | - | | | | | | | 5.2.1 | | - | | | | | | | | | | - | | | | | | | NetBSD | | - | | | | | | | 5.2.2 | | - | | | | | | | | | - | | | | | | \ | | - | | | | | | NetBSD | | - | | | | | | 6.0.1 | | - | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 - | | | | | | NetBSD | | - | | | | | | 6.0.2 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.3 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.4 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.5 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.6 | | - | | | | | | | | - | | | | | *--NetBSD | | - | | | | | 6.1 | | - | | FreeBSD | | | | | - | | 8.4 | | NetBSD | | - | | | | | 6.1.1 | | - | | | | | | | - | FreeBSD | | NetBSD | | - | 9.2 | | 6.1.2 | | - | | Mac OS X | | | | - | | 10.9 | | OpenBSD 5.4 | - | `-----. | | | | DragonFly 3.6.0 - | \ | | | | | - *--FreeBSD | | | NetBSD | | - | 10.0 | | | 6.1.3 | | - | | | | | | | | - | | | | | | | DragonFly 3.6.1 - | | | | | | | | - | | | | | | | | - | | | | | | | DragonFly 3.6.2 - | | | | | NetBSD | | - | | | | | 6.1.4 | | - | | | | | | | | - | | | | | | OpenBSD 5.5 | - | | | | | | | | - | | | | | | | DragonFly 3.8.0 - | | | | | | | | - | | | | | | | | - | | | | | | | DragonFly 3.8.1 - | | | | | | | | - | | | | | | | | - | | | | | | | DragonFly 3.6.3 - | | | | | | | | - | | FreeBSD | | | | | - | | 9.3 | | | | | - | | | | NetBSD | DragonFly 3.8.2 - | | | | 6.1.5 | | - | | Mac OS X | | | - | | 10.10 | | | - | | | | OpenBSD 5.6 | - | FreeBSD | | | | - | 10.1 | | | DragonFly 4.0.1 - | | | | | | - | | | | | DragonFly 4.0.2 - | | | | | | - | | | | | DragonFly 4.0.3 - | | | | | | - | | | | | DragonFly 4.0.4 - | | | | | | - | | | | | DragonFly 4.0.5 - | | | | | | - | | | | OpenBSD 5.7 | - | | | | | DragonFly 4.2.0 - | FreeBSD | | | | - | 10.2 | | | | - | | macOS *--NetBSD 7.0 | | - | | 10.11 | | | OpenBSD 5.8 | - | | | | | `--. | DragonFly 4.4.1 - | FreeBSD | | | | OpenBSD 5.9 | - | 10.3 | | | | | | - | | | | | NetBSD | | - | | | | | 7.0.1 | | - | `------. | | | | | DragonFly 4.6.0 - | | | | | | | | - | | | | | | | | - *--FreeBSD | macOS | | | OpenBSD 6.0 | - | 11.0 | 10.12 | | NetBSD | | - | | | | | | 7.0.2 | | - | | | | | | | | - | | | | | *--NetBSD | | - | | | | | | 7.1 | | - | | | | | | | | | - | | | | | | | | | - | | | macOS | | | | DragonFly 4.8.0 - | | | 10.13 | | | OpenBSD 6.1 | - | FreeBSD | | | | | | DragonFly 5.0.0 - | 11.1 FreeBSD | | | | | | - | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1 - | | | | | | | | - | `------. | | | NetBSD | DragonFly 5.0.2 - | | | | | 7.1.1 | | - | | | | | | | | - | | | | | NetBSD | | - | | | | | 7.1.2 `--. | - | | | | | | | - | | | | `-----. OpenBSD 6.3 | - | | | *--NetBSD | | DragonFly 5.2.0 - | | | | 8.0 | | | - | | | | | | | DragonFly 5.2.1 - | | | | | | | | - | | | | | | | DragonFly 5.2.2 - | FreeBSD | | | *--NetBSD | | - | 11.2 | | | 7.2 | | - | | macOS | | | | - | | 10.14 | | OpenBSD 6.4 | - | | | | | | | - | | | | | | DragonFly 5.4.0 - *--FreeBSD | | | | | | - | 12.0 | | | | | DragonFly 5.4.1 - | | | | | | OpenBSD 6.5 | - | | | | | | | | - | | | | | NetBSD | | - | | | | | 8.1 | DragonFly 5.6 - | | | | | | | | - | | | | | | | DragonFly 5.6.1 - | | FreeBSD macOS | | | | - | | 11.3 10.15 | | | | - | FreeBSD | | | | OpenBSD 6.6 | - | 12.1 | macOS | `-------. | | - | | | 10.15.1 | | | DragonFly 5.6.2 - | | | | *--NetBSD | | | - | | | | | 9.0 | | | - | | | | | | | | | - | | | | | | | | DragonFly 5.8 - | | | | | | | | | - | | | | | | | | DragonFly 5.6.3 - | | | | | | NetBSD | | - | | | | | | 8.2 | | - | | | | | | | | DragonFly 5.8.1 - | | | | | | | OpenBSD 6.7 | - | | FreeBSD | | | | | | - | | 11.4 | | | | | | - | | | | | | | DragonFly 5.8.2 - | | | | | | | DragonFly 5.8.3 - | | | | NetBSD | OpenBSD 6.8 | - | FreeBSD macOS | 9.1 | | | - | 12.2 11 | | | | | - | | | | | | | | - | `------. | | | | | | - | | | | | | | | - *--FreeBSD | | | | | | | - | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0 - | | | | | 9.2 | | | - | | | | | | | | DragonFly 6.0.1 - | | | | | | | | | - | | FreeBSD macOS | | | OpenBSD 7.0 | - | | 12.3 12 | | | | | - | | | | | | | | DragonFly 6.2.1 - | | | | | | | OpenBSD 7.1 | - | FreeBSD | | | | | | | - | 13.1 | | | | | | | - | | | | | | | | DragonFly 6.2.2 - | | | | | NetBSD | | | - | | | macOS | 9.3 | OpenBSD 7.2 | - | | | 13 | | | | | - | | FreeBSD | | | | | | - | | 12.4 | | | | | | - | | | | | | | DragonFly 6.4.0 - | | | | | | OpenBSD 7.3 | - | FreeBSD | | | | | | - | 13.2 | | | | | | - | | | | | | | | - | `------. | | | | | | - | | macOS | | | | | - | | 14 | | | | | - | | | | | | OpenBSD 7.4 | - *--FreeBSD | | | | | | | - | 14.0 | | | | | | | - | | | | | | | | | - | | FreeBSD | | NetBSD | | | - | | 13.3 | | 9.4 | | | - | | | | | | | | - | | | | *--NetBSD | | | - | | | | | 10.0 | | | - | | | | | | | | | - | | | | | | | OpenBSD 7.5 | - | | | | | | NetBSD | | - | | | | | | 8.3 | | - | FreeBSD | | | | | | - | 14.1 | | | | | | - | | | macOS | | | | - | | | 15 | | | | - | | FreeBSD | | | | | - | | 13.4 | | | OpenBSD 7.6 | - | FreeBSD | | | | | | - | 14.2 | | | | | | - | | | | | NetBSD | | - | | | | | 10.1 | | - | | FreeBSD | | | | - | | 13.5 | | | | - | | | | OpenBSD 7.7 | - | | | | | DragonFly 6.4.1 - | | | | | DragonFly 6.4.2 - | FreeBSD | | | | - | 14.3 | | | | - | macOS | | | - | 26 | | | - | | | OpenBSD 7.8 | - | | | | | -FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current - | | | | | - v v v v v + | | | | *--NetBSD 1.1 ---. BSD/OS 2.1 + | FreeBSD 2.1.5 | | | \ | + | | | | *--NetBSD 1.2 \ BSD/OS 3.0 + | FreeBSD 2.1.6 | | | \ OpenBSD 2.0 | + | | | | | \ | | + | FreeBSD 2.1.6.1 | | | \ | | + | | | | | \ | | + | FreeBSD 2.1.7 | | | | | | + | | | | | NetBSD 1.2.1 | | + | FreeBSD 2.1.7.1 | | | | | + | | | | | | + | | | | | | + *-FreeBSD 2.2 | | | | | + | \ | | | | | + | FreeBSD 2.2.1 | | | | | + | | | | | | | + | FreeBSD 2.2.2 | | | OpenBSD 2.1 | + | | | | | | | + | FreeBSD 2.2.5 | | | | | + | | | | | OpenBSD 2.2 | + | | | | *--NetBSD 1.3 | | + | FreeBSD 2.2.6 | | | | | | + | | | | | NetBSD 1.3.1 | BSD/OS 3.1 + | | | | | | OpenBSD 2.3 | + | | | | | NetBSD 1.3.2 | | + | FreeBSD 2.2.7 | | | | | | + | | | | | | | BSD/OS 4.0 + | FreeBSD 2.2.8 | | | | | | + | | | | | | | | + | v | | | | OpenBSD 2.4 | + | FreeBSD 2.2.9 | | | | | | + | | | | | | | +FreeBSD 3.0 <--------* | | v | | + | | | NetBSD 1.3.3 | | + *---FreeBSD 3.1 | | | | + | | | | | BSD/OS 4.0.1 + | FreeBSD 3.2----* | .--*--NetBSD 1.4 OpenBSD 2.5 | + | | | | | | | | | + | | | | | | | | | + | | | | | | | | | + | FreeBSD 3.3 | | | | NetBSD 1.4.1 | | + | | | | | | | OpenBSD 2.6 | + | FreeBSD 3.4 | | | | | | | + | | | | | | | | BSD/OS 4.1 +FreeBSD 4.0 | | | | | NetBSD 1.4.2 | | + | | | | | | | | | + | | | | | | | | | + | FreeBSD 3.5 | | | | | OpenBSD 2.7 | + | | | | | | | | | + | FreeBSD 3.5.1 | | | | | | | + | | | | | | | | + *---FreeBSD 4.1 | | | | | | | + | | | | | | | | | + | FreeBSD 4.1.1 | | / | | | | + | | | | / | | | | + | FreeBSD 4.2 Darwin/ | NetBSD 1.4.3 | | + | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2 + | | | | | | + | | | | | | + | | 10.0 *--NetBSD 1.5 | | + | FreeBSD 4.3 | | | | | + | | | | | OpenBSD 2.9 | + | | | | NetBSD 1.5.1 | | + | | | | | | | + | FreeBSD 4.4-. | | NetBSD 1.5.2 | | + | | | Mac OS X | | | | + | | | 10.1 | | OpenBSD 3.0 | + | FreeBSD 4.5 | | | | | | + | | \ | | | | BSD/OS 4.3 + | FreeBSD 4.6 \ | | | OpenBSD 3.1 | + | | \ | | NetBSD 1.5.3 | | + | FreeBSD 4.6.2 Mac OS X | | | + | | 10.2 | | | + | FreeBSD 4.7 | | | | + | | | *--NetBSD 1.6 OpenBSD 3.2 | + | FreeBSD 4.8 | | | | | + | | | | NetBSD 1.6.1 | | + | |--------. | | | OpenBSD 3.3 BSD/OS 5.0 + | | \ | | | | | + | FreeBSD 4.9 | | | | OpenBSD 3.4 BSD/OS 5.1 ISE + | | | | | | | + | | | | | NetBSD 1.6.2 | + | | | | | | | + | | | | | | OpenBSD 3.5 + | | | | | v | + | FreeBSD 4.10 | | | | + | | | | | | + | FreeBSD 4.11 | | | | + | | | | | + | `-|------|-------------------|-------------------. + | | | | \ +FreeBSD 5.0 | | | | + | | | | | +FreeBSD 5.1 | | | DragonFly 1.0 + | \ | | | | + | ----- Mac OS X | | | + | 10.3 | | | +FreeBSD 5.2 | | | | + | | | | | | + | FreeBSD 5.2.1 | | | | + | | | | | + *-------FreeBSD 5.3 | | | | + | | | | OpenBSD 3.6 | + | | | *--NetBSD 2.0 | | + | | | | | | | DragonFly 1.2.0 + | | Mac OS X | | NetBSD 2.0.2 | | + | | 10.4 | | | | | + | FreeBSD 5.4 | | | | | | + | | | | | | OpenBSD 3.7 | + | | | | | NetBSD 2.0.3 | | + | | | | | | | | + *--FreeBSD | | | | v OpenBSD 3.8 | + | 6.0 | | | | | | + | | | | | \ | | + | | | | | NetBSD 2.1 | | + | | | | | | | + | | | | *--NetBSD 3.0 | | + | | | | | | | | DragonFly 1.4.0 + | | | | | | | OpenBSD 3.9 | + | FreeBSD | | | | | | | + | 6.1 | | | | | | | + | | FreeBSD 5.5 | | | | | | + | | | | | NetBSD 3.0.1 | DragonFly 1.6.0 + | | | | | | | | + | | | | | | OpenBSD 4.0 | + | | | | | NetBSD 3.0.2 | | + | | | | NetBSD 3.1 | | + | FreeBSD 6.2 | | | | + | | | | | DragonFly 1.8.0 + | | | | OpenBSD 4.1 | + | | | | | DragonFly 1.10.0 + | | Mac OS X | | | + | | 10.5 | | | + | | | | OpenBSD 4.2 | + | | | *--NetBSD 4.0 | | + | FreeBSD 6.3 | | | | | + | \ | | | | | + *--FreeBSD | | | | | DragonFly 1.12.0 + | 7.0 | | | | | | + | | | | | | OpenBSD 4.3 | + | | | | | NetBSD | DragonFly 2.0.0 + | | FreeBSD | | 4.0.1 OpenBSD 4.4 | + | | 6.4 | | | | + | | | | | | + | FreeBSD 7.1 | | | | + | | | | | DragonFly 2.2.0 + | FreeBSD 7.2 | *--NetBSD OpenBSD 4.5 | + | \ | | 5.0 | | + | \ | | / | \ | | + | | Mac OS X | | | \ | | + | | 10.6 | | | \ | | + | | | | | | NetBSD | DragonFly 2.4.0 + | | | | | | 5.0.1 OpenBSD 4.6 | + | | | | | | | | | + *--FreeBSD | | | | | | | | + | 8.0 | | | | | | | | + | | FreeBSD | | | | NetBSD | | + | | 7.3 | | | | 5.0.2 | DragonFly 2.6.0 + | | | | | | | OpenBSD 4.7 | + | FreeBSD | | | | | | | + | 8.1 | | | | | | | + | | | | | | | | DragonFly 2.8.2 + | | | | | | | OpenBSD 4.8 | + | | | | | | *--NetBSD | | + | FreeBSD FreeBSD | | | 5.1 | | + | 8.2 7.4 | | | | | DragonFly 2.10.1 + | | | | | | OpenBSD 4.9 | + | `-----. Mac OS X | | | | | + | \ 10.7 | | | | | + | | | | | | OpenBSD 5.0 | + *--FreeBSD | | | | | | | + | 9.0 | | | | NetBSD | DragonFly 3.0.1 + | | FreeBSD | | | 5.1.2 | | + | | 8.3 | | | | | | + | | | | | | NetBSD | | + | | | | | | 5.1.3 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 5.1.4 | | + | | | | | | OpenBSD 5.1 | + | | | Mac OS X | `--------. | | + | | | 10.8 | | | | + | | | | *--NetBSD | | | + | | | | | 6.0 | | | + | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1 + | FreeBSD | | | | | NetBSD | | + | 9.1 | | | | | 5.2 | | + | | | | | | | | | | + | | | | | | | NetBSD | | + | | | | | | | 5.2.1 | | + | | | | | | | | | | + | | | | | | | NetBSD | | + | | | | | | | 5.2.2 | | + | | | | | | | | | + | | | | | | \ | | + | | | | | | NetBSD | | + | | | | | | 6.0.1 | | + | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 + | | | | | | NetBSD | | + | | | | | | 6.0.2 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.3 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.4 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.5 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.6 | | + | | | | | | | | + | | | | | *--NetBSD | | + | | | | | 6.1 | | + | | FreeBSD | | | | | + | | 8.4 | | NetBSD | | + | | | | | 6.1.1 | | + | | | | | | | + | FreeBSD | | NetBSD | | + | 9.2 | | 6.1.2 | | + | | Mac OS X | | | | + | | 10.9 | | OpenBSD 5.4 | + | `-----. | | | | DragonFly 3.6.0 + | \ | | | | | + *--FreeBSD | | | NetBSD | | + | 10.0 | | | 6.1.3 | | + | | | | | | | | + | | | | | | | DragonFly 3.6.1 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.6.2 + | | | | | NetBSD | | + | | | | | 6.1.4 | | + | | | | | | | | + | | | | | | OpenBSD 5.5 | + | | | | | | | | + | | | | | | | DragonFly 3.8.0 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.8.1 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.6.3 + | | | | | | | | + | | FreeBSD | | | | | + | | 9.3 | | | | | + | | | | NetBSD | DragonFly 3.8.2 + | | | | 6.1.5 | | + | | Mac OS X | | | + | | 10.10 | | | + | | | | OpenBSD 5.6 | + | FreeBSD | | | | + | 10.1 | | | DragonFly 4.0.1 + | | | | | | + | | | | | DragonFly 4.0.2 + | | | | | | + | | | | | DragonFly 4.0.3 + | | | | | | + | | | | | DragonFly 4.0.4 + | | | | | | + | | | | | DragonFly 4.0.5 + | | | | | | + | | | | OpenBSD 5.7 | + | | | | | DragonFly 4.2.0 + | FreeBSD | | | | + | 10.2 | | | | + | | macOS *--NetBSD 7.0 | | + | | 10.11 | | | OpenBSD 5.8 | + | | | | | `--. | DragonFly 4.4.1 + | FreeBSD | | | | OpenBSD 5.9 | + | 10.3 | | | | | | + | | | | | NetBSD | | + | | | | | 7.0.1 | | + | `------. | | | | | DragonFly 4.6.0 + | | | | | | | | + | | | | | | | | + *--FreeBSD | macOS | | | OpenBSD 6.0 | + | 11.0 | 10.12 | | NetBSD | | + | | | | | | 7.0.2 | | + | | | | | | | | + | | | | | *--NetBSD | | + | | | | | | 7.1 | | + | | | | | | | | | + | | | | | | | | | + | | | macOS | | | | DragonFly 4.8.0 + | | | 10.13 | | | OpenBSD 6.1 | + | FreeBSD | | | | | | DragonFly 5.0.0 + | 11.1 FreeBSD | | | | | | + | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1 + | | | | | | | | + | `------. | | | NetBSD | DragonFly 5.0.2 + | | | | | 7.1.1 | | + | | | | | | | | + | | | | | NetBSD | | + | | | | | 7.1.2 `--. | + | | | | | | | + | | | | `-----. OpenBSD 6.3 | + | | | *--NetBSD | | DragonFly 5.2.0 + | | | | 8.0 | | | + | | | | | | | DragonFly 5.2.1 + | | | | | | | | + | | | | | | | DragonFly 5.2.2 + | FreeBSD | | | *--NetBSD | | + | 11.2 | | | 7.2 | | + | | macOS | | | | + | | 10.14 | | OpenBSD 6.4 | + | | | | | | | + | | | | | | DragonFly 5.4.0 + *--FreeBSD | | | | | | + | 12.0 | | | | | DragonFly 5.4.1 + | | | | | | OpenBSD 6.5 | + | | | | | | | | + | | | | | NetBSD | | + | | | | | 8.1 | DragonFly 5.6 + | | | | | | | | + | | | | | | | DragonFly 5.6.1 + | | FreeBSD macOS | | | | + | | 11.3 10.15 | | | | + | FreeBSD | | | | OpenBSD 6.6 | + | 12.1 | macOS | `-------. | | + | | | 10.15.1 | | | DragonFly 5.6.2 + | | | | *--NetBSD | | | + | | | | | 9.0 | | | + | | | | | | | | | + | | | | | | | | DragonFly 5.8 + | | | | | | | | | + | | | | | | | | DragonFly 5.6.3 + | | | | | | NetBSD | | + | | | | | | 8.2 | | + | | | | | | | | DragonFly 5.8.1 + | | | | | | | OpenBSD 6.7 | + | | FreeBSD | | | | | | + | | 11.4 | | | | | | + | | | | | | | DragonFly 5.8.2 + | | | | | | | DragonFly 5.8.3 + | | | | NetBSD | OpenBSD 6.8 | + | FreeBSD macOS | 9.1 | | | + | 12.2 11 | | | | | + | | | | | | | | + | `------. | | | | | | + | | | | | | | | + *--FreeBSD | | | | | | | + | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0 + | | | | | 9.2 | | | + | | | | | | | | DragonFly 6.0.1 + | | | | | | | | | + | | FreeBSD macOS | | | OpenBSD 7.0 | + | | 12.3 12 | | | | | + | | | | | | | | DragonFly 6.2.1 + | | | | | | | OpenBSD 7.1 | + | FreeBSD | | | | | | | + | 13.1 | | | | | | | + | | | | | | | | DragonFly 6.2.2 + | | | | | NetBSD | | | + | | | macOS | 9.3 | OpenBSD 7.2 | + | | | 13 | | | | | + | | FreeBSD | | | | | | + | | 12.4 | | | | | | + | | | | | | | DragonFly 6.4.0 + | | | | | | OpenBSD 7.3 | + | FreeBSD | | | | | | + | 13.2 | | | | | | + | | | | | | | | + | `------. | | | | | | + | | macOS | | | | | + | | 14 | | | | | + | | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | | | + | 14.0 | | | | | | | + | | | | | | | | | + | | FreeBSD | | NetBSD | | | + | | 13.3 | | 9.4 | | | + | | | | | | | | + | | | | *--NetBSD | | | + | | | | | 10.0 | | | + | | | | | | | | | + | | | | | | | OpenBSD 7.5 | + | | | | | | NetBSD | | + | | | | | | 8.3 | | + | FreeBSD | | | | | | + | 14.1 | | | | | | + | | | macOS | | | | + | | | 15 | | | | + | | FreeBSD | | | | | + | | 13.4 | | | OpenBSD 7.6 | + | FreeBSD | | | | | | + | 14.2 | | | | | | + | | | | | NetBSD | | + | | | | | 10.1 | | + | | FreeBSD | | | | + | | 13.5 | | | | + | | | | OpenBSD 7.7 | + | | | | | DragonFly 6.4.1 + | | | | | DragonFly 6.4.2 + | FreeBSD | | | | + | 14.3 | | | | + | macOS | | | + | 26 | | | + | | | OpenBSD 7.8 | + | | | | | +FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current + | | | | | + v v v v v Time ---------------- From nobody Wed Dec 24 18:19:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc0Wd13jjz6LN3y for ; Wed, 24 Dec 2025 18:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc0Wc6wRvz44nG for ; Wed, 24 Dec 2025 18:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600349; h=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=ni9vwFQ7RgowAmSwAd713l2qDakwB2BR6JGB7IbiJFo=; b=wFFm3XQK/hK+8XSBetnVkGFs00MZjOQf9BFNoRzpBdgU+VFcdxOPw3QQfzXvLybYsz9ipG QNSVh42KIWYn84w9t/yjHQFqqqMJevw4ihVQsFeF1Ml5aadTbgI8PSl1DjbtfvcPJ/OsjL XPn7gWvZisGy2UDKbydslyblhyhgxz9h0UTBoO9YxI/jO+evcYhScYA/BGQaDd1a40+aI8 uCIavbuG2Xw1vh7nwbBTz3uS1mzN6ZXdbaarqzpP5adyM2fP/OAAMllVltBieHQYplWsY2 gvwbnqaI/fx1TWZye5Q5X+mPHUyunqGzN2y7L+gnKD0OeKQAmosIt8NtIHUWlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600349; h=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=ni9vwFQ7RgowAmSwAd713l2qDakwB2BR6JGB7IbiJFo=; b=uEGdVvUkO5coE2OQ5FjpHsDZoPitJELUSOWKyn6uMg3fJ9N5v0Q88sUtRIFV8Lo6LVFC/K kv9s56bzgIDcpl2v6KXXc06UglfbrTX4opW/B9CCJ0gjklub+5j85APG7F0Dpu6AzpXSn1 ET4OPdQ9kKdJcmo9xZ+DnZkMjKsXmUAOQO1pt+DW+gxELWddBQTBLbpFOIZVHdumMjPt0n i6XZIN4UsNIu/9Lu0QoB1Qt/7GB6SUZQDghYLmWCfnWG/W2FTDBxeHMj5VTPf8gteBDphF 01Vn6tLnfdXqkZRFoBC5QJcjhKUNc94TO8vBo4LkKSzjlbtXKgQaY+zaB1ukTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766600349; a=rsa-sha256; cv=none; b=ClTyVpeKS5MwESFPKe3e6l2UEv5vrwRIpMzQ5yPP1M/ldFkU39oaLbrVdnHyD9YN/KGIeS IA+27AYS7V4Sot9kjmLJpZJ46xbdQ0E7yVxUt9qkiEqwuoqULmeyLipJmCVaVV6ryi50rn squOUz+QwltP6MaYpbzdSwxUw+NaCXZ+1ESyYElPh95y1aRMQOC0qhhS+JboQ9J+JnLeos 3pwgPfmb16TBrtNDfruowIJmUJkK+UURSethYztniJIKzndn6ByayP82NQcm2yDb1cH48V vT9tQZUe/cADX1CpgVl4rvPR1fq1xTuKRfFZ3xmKzJw9MdNp6DRmHkQ8wYVcfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc0Wc6PmGztRn for ; Wed, 24 Dec 2025 18:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 277ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 18:19:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Maxim Konovalov From: Sergey A. Osokin Subject: git: 1c7c315e8029 - stable/15 - bsd-family-tree: add FreeBSD 15.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c7c315e8029425d3841d88021db477230860dc9 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 18:19:08 +0000 Message-Id: <694c2e9c.277ca.16910bf1@gitrepo.freebsd.org> The branch stable/15 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=1c7c315e8029425d3841d88021db477230860dc9 commit 1c7c315e8029425d3841d88021db477230860dc9 Author: Maxim Konovalov AuthorDate: 2025-12-02 03:44:42 +0000 Commit: Sergey A. Osokin CommitDate: 2025-12-24 18:18:22 +0000 bsd-family-tree: add FreeBSD 15.0 (cherry picked from commit 7b44ab1c6abe106a44604a8504edca0e57ec1c42) Sponsored by: tipi.work --- share/misc/bsd-family-tree | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 01dfd4cc0cbf..36910c9ad94a 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -300,7 +300,7 @@ FreeBSD 5.2 | | | | | | | | | 6.1 | | | | FreeBSD | | | | | | | 8.4 | | NetBSD | | - | | | | | 6.1.1 | | + | | | | 6.1.1 | | | | | | | | | | FreeBSD | | NetBSD | | | 9.2 | | 6.1.2 | | @@ -483,6 +483,8 @@ FreeBSD 5.2 | | | | | macOS | | | | 26 | | | | | | OpenBSD 7.8 | + *--FreeBSD | | | | + | 15.0 | | | | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -930,6 +932,7 @@ DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] +FreeBSD 15.0 2025-12-02 [FBD] Bibliography ------------------------ From nobody Wed Dec 24 18:23:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc0cR2bJvz6LNBy for ; Wed, 24 Dec 2025 18:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc0cR1gzZz4617 for ; Wed, 24 Dec 2025 18:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvkRMCGgzVzgzi66eImkQutgFVHBwaVxNsFBse79p7s=; b=tX7NdaeTWGoTbD0Y8avYhxG5WxTjuSlhaePGx2WAOQka3lpCLinyjM1iMmbnPbA3TRqlt+ Eipv554GYndJ+aK7iPaKu5YEYhIUOsipp/9s6r6EGiK1QdXsDXc6AYTI4z5iwh/4ltwsUU tFTWAFWn1UjSoa1GEswFzX4rcNqjauEZTVMxe/+qhsVVURBwT7YP96L0vGPclmMn+EWyVr gTsxSrfCz01K5oXKcHMsldRzuHQHom3S/DUYWZEHAeuq5NT1HOSjmELpYvhM+FamisH+Dq STp7sE7MSeRqg0HOAQUcdG52F+v8zcf7NF8G62EDaD1jOTfoNFFCN8W6LZXUoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvkRMCGgzVzgzi66eImkQutgFVHBwaVxNsFBse79p7s=; b=m2GGUjLjovCGZV/Zn1zbkl7PulqEgOel4H78WLabKCUCgFOI3fHadQ3VsWYJKmL9t9iyNc rm1ydyZdCvpk+00mkDCuKOhWDuADAtirdgfWCggdPCLl0TRDGSyT+ltQ9YtSFg+EeKto8b OKMMTAbdR5XtClJxqQaFYKHXCuak0Q0EUyQo0g+3Vrm9v/a/PMQx9E56yyPeOwUacCO6Of YCoKKMO8FjBJIz3jJZKtGYefeT7797kU7fvCodYsjgPn96sVYu2s4X/Iam9fRoUwV0wehW /Xf2KqucCB4jmYAIAcL4yZE0q52Q25nbQJhPH+3/XhvwAgMUxsvndtuq6fhtOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766600599; a=rsa-sha256; cv=none; b=xL2xLnuuAwvAV4X55LNhWtcBE5VYKmSgY7ijK1kxTiFNvg4Lav+i0ClumEFdU/a/ISRn3D wi3Ch2k2qnzHACyVEoTFizyZBsFPka5+8AiUviTC7iY5xpz96hxyZ5c2KW4VAKwzZ9kIOo jgVibAn0f0GCCYzcqnO64xUAorNQXVX+kq9bR0CiPJHj6nvJuayfrSN4tZPkqueEZNRC5p yWoMpMQjHKk0Ajab+slZ7ce4HqGaxwBj/zvwa228Co6ju+oYsTcepFh4yss+rLE80+xzhn qYEZIg4eZT4eGNC+WAROVmvG0fDUkqFfK7hvQUGOX0EYXN837JrWTLvAUuLW0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc0cR1HCVztYJ for ; Wed, 24 Dec 2025 18:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32653 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 18:23:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Sergey A. Osokin Subject: git: 36b9d6094b38 - stable/14 - bsd-family-tree: add macOS 26 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 36b9d6094b38d5a33ea5221a9fb76b819e536638 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 18:23:19 +0000 Message-Id: <694c2f97.32653.7e4efdf1@gitrepo.freebsd.org> The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=36b9d6094b38d5a33ea5221a9fb76b819e536638 commit 36b9d6094b38d5a33ea5221a9fb76b819e536638 Author: Sergey A. Osokin AuthorDate: 2025-10-31 20:25:11 +0000 Commit: Sergey A. Osokin CommitDate: 2025-12-24 18:21:02 +0000 bsd-family-tree: add macOS 26 Sponsored by: tipi.work (cherry picked from commit c6e02892bbca1237546e3943c0971768822e1745) --- share/misc/bsd-family-tree | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index d36c64259569..f16d2502c58c 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -479,7 +479,10 @@ FreeBSD 5.2 | | | | | | | | | DragonFly 6.4.1 | | | | | DragonFly 6.4.2 | FreeBSD | | | | - | 14.3 | | OpenBSD 7.8 | + | 14.3 | | | | + | macOS | | | + | 26 | | | + | | | OpenBSD 7.8 | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -926,6 +929,7 @@ OpenBSD 7.7 2025-04-28 [OBD] DragonFly 6.4.1 2025-04-30 [DFB] DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] +macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] Bibliography From nobody Wed Dec 24 18:23:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc0cS4b9cz6LNXM for ; Wed, 24 Dec 2025 18:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc0cS2XgFz463q for ; Wed, 24 Dec 2025 18:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600600; h=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=RH/kCY1Z5sOIoyNDLnKyQFZ0w3N/m/UVV6Sih4V+07I=; b=ZZsUX12l08OdYC8c+nu+KTXEiMDvZ0mNHWzZtJWEg8o9Zk30RRnznp/Y32rI1ygXri4XXA oFQXalFfcRftT4IGMfK9IeYAt83XaRk0Nxi/vUs26FaKGE54IWeUe1tqP7P7LXffP5nniV lu4r0oFemhQlzCgfjwLQaGzR540d+0zBbblKmYA82IkhoJDzBfwa7fyKNTg7R/osJuS+3z 8XLBbgPTq0e2kK1HoLXqpn3SS0+n1kbfo1+tJVE+F4f0HAvm7ikJpX+UUCNYzKjuuJwxlC ZXypCoFQeTvdQyztWbEdwFu/SIVAMf4wD4c3U1R2t6CkwSDQtUZZUSEGPtUxxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600600; h=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=RH/kCY1Z5sOIoyNDLnKyQFZ0w3N/m/UVV6Sih4V+07I=; b=GJCCVBHdmTp1zMK7IlnkoUUYwwrNGrhc2mnRsf6oiq3XC7j9XHmt7jM3HkmPixNQn07h6N ft+9gVXQvH98sectZ/Y2Xlr3hsPXLFglROXlO72wUVv6mAJhkE9TMR4ZbQ4qX8F63MaBDN bLgjE48PWRhRqi9F9md/lxpcZ3F6F9HDzXqV+8INi/lGQYsBgPmc6Enp4hV7J0X9pGdPsW gaP5triu3ixbFaz3jKCAZusYwEjGYaJePrB4l6mBlfUSpucybfEnb39GwQaFwwCGtRCkm9 XqXqQGea344F6MATaunZZZKMKnQWuKRWAoRA7n1S+uqlfdLiwl2KYbjDeO/pXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766600600; a=rsa-sha256; cv=none; b=JSaDOYoq1MtaszIsV24y4x/SIeBhuDO1+L8Hp4IkG/mzwomIbjsZ6+vp8wk7f1ENt/iWuw UkKgn6PnUsmJpK5YJB3iEpQj40vWMfUcQjCJwxD8v8Sp9Q7BE5iz0Q8DPWVT/fFcjLajBb ylXAVV2pbog83m5tqSt2yDaWq3CltTEEe8fB4HZeHMBo1Zf4rPSo6K+pbO8G3UCGe1u7mB jPpCm79kooymN6vZS4kTp2ZFEii9vN2VkTWoRFj70pQRIQvkwBOCcpUKcul8282Mnkd/0K FxAbgMrZl6RHe5qdWypgxheLq7ZF+wqGtRBC7bDRCJhjwn7UGQIxosKHsN95uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc0cS279Jzt2x for ; Wed, 24 Dec 2025 18:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 316aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 18:23:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Sergey A. Osokin Subject: git: 5b428bb8a0ca - stable/14 - bsd-family-tree: Re-center OpenBSD line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b428bb8a0ca0216af8c7a957a6617c26e864def Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 18:23:20 +0000 Message-Id: <694c2f98.316aa.4afa6b92@gitrepo.freebsd.org> The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=5b428bb8a0ca0216af8c7a957a6617c26e864def commit 5b428bb8a0ca0216af8c7a957a6617c26e864def Author: Ed Maste AuthorDate: 2025-11-07 14:58:50 +0000 Commit: Sergey A. Osokin CommitDate: 2025-12-24 18:22:38 +0000 bsd-family-tree: Re-center OpenBSD line Commit 09aeca28dd75 ("BSD family tree: reduce OpenBSD-NetBSD crowding") moved OpenBSD releases over 2 spaces. Move the line through OpenBSD releases over as well. Reviewed by: obrien Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53635 (cherry picked from commit 1821cf482ff128b08bd65807e1f7aad7eb873e0b) --- share/misc/bsd-family-tree | 808 ++++++++++++++++++++++----------------------- 1 file changed, 404 insertions(+), 404 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index f16d2502c58c..6283be25b91f 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -83,410 +83,410 @@ FreeBSD 2.0.5 \ | BSD/OS 2.0.1 | | | | OpenBSD 2.3 | | | | | | BSD/OS 3.0 | FreeBSD 2.1 | | | | - | | | | *--NetBSD 1.1 -. BSD/OS 2.1 - | FreeBSD 2.1.5 | | | \ | - | | | | *--NetBSD 1.2 \ BSD/OS 3.0 - | FreeBSD 2.1.6 | | | \ OpenBSD 2.0 | - | | | | | \ | | - | FreeBSD 2.1.6.1 | | | \ | | - | | | | | \ | | - | FreeBSD 2.1.7 | | | | | | - | | | | | NetBSD 1.2.1 | | - | FreeBSD 2.1.7.1 | | | | | - | | | | | | - | | | | | | - *-FreeBSD 2.2 | | | | | - | \ | | | | | - | FreeBSD 2.2.1 | | | | | - | | | | | | | - | FreeBSD 2.2.2 | | | OpenBSD 2.1 | - | | | | | | | - | FreeBSD 2.2.5 | | | | | - | | | | | OpenBSD 2.2 | - | | | | *--NetBSD 1.3 | | - | FreeBSD 2.2.6 | | | | | | - | | | | | NetBSD 1.3.1 | BSD/OS 3.1 - | | | | | | OpenBSD 2.3 | - | | | | | NetBSD 1.3.2 | | - | FreeBSD 2.2.7 | | | | | | - | | | | | | | BSD/OS 4.0 - | FreeBSD 2.2.8 | | | | | | - | | | | | | | | - | v | | | | OpenBSD 2.4 | - | FreeBSD 2.2.9 | | | | | | - | | | | | | | -FreeBSD 3.0 <--------* | | v | | - | | | NetBSD 1.3.3 | | - *---FreeBSD 3.1 | | | | - | | | | | BSD/OS 4.0.1 - | FreeBSD 3.2----* | .--*--NetBSD 1.4 OpenBSD 2.5 | - | | | | | | | | | - | | | | | | | | | - | | | | | | | | | - | FreeBSD 3.3 | | | | NetBSD 1.4.1 | | - | | | | | | | OpenBSD 2.6 | - | FreeBSD 3.4 | | | | | | | - | | | | | | | | BSD/OS 4.1 -FreeBSD 4.0 | | | | | NetBSD 1.4.2 | | - | | | | | | | | | - | | | | | | | | | - | FreeBSD 3.5 | | | | | OpenBSD 2.7 | - | | | | | | | | | - | FreeBSD 3.5.1 | | | | | | | - | | | | | | | | - *---FreeBSD 4.1 | | | | | | | - | | | | | | | | | - | FreeBSD 4.1.1 | | / | | | | - | | | | / | | | | - | FreeBSD 4.2 Darwin/ | NetBSD 1.4.3 | | - | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2 - | | | | | | - | | | | | | - | | 10.0 *--NetBSD 1.5 | | - | FreeBSD 4.3 | | | | | - | | | | | OpenBSD 2.9 | - | | | | NetBSD 1.5.1 | | - | | | | | | | - | FreeBSD 4.4-. | | NetBSD 1.5.2 | | - | | | Mac OS X | | | | - | | | 10.1 | | OpenBSD 3.0 | - | FreeBSD 4.5 | | | | | | - | | \ | | | | BSD/OS 4.3 - | FreeBSD 4.6 \ | | | OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3 | | - | FreeBSD 4.6.2 Mac OS X | | | - | | 10.2 | | | - | FreeBSD 4.7 | | | | - | | | *--NetBSD 1.6 OpenBSD 3.2 | - | FreeBSD 4.8 | | | | | - | | | | NetBSD 1.6.1 | | - | |--------. | | | OpenBSD 3.3 BSD/OS 5.0 - | | \ | | | | | - | FreeBSD 4.9 | | | | OpenBSD 3.4 BSD/OS 5.1 ISE - | | | | | | | - | | | | | NetBSD 1.6.2 | - | | | | | | | - | | | | | | OpenBSD 3.5 - | | | | | v | - | FreeBSD 4.10 | | | | - | | | | | | - | FreeBSD 4.11 | | | | - | | | | | - | `-|------|-----------------|---------------------. - | | | | \ -FreeBSD 5.0 | | | | - | | | | | -FreeBSD 5.1 | | | DragonFly 1.0 - | \ | | | | - | ----- Mac OS X | | | - | 10.3 | | | -FreeBSD 5.2 | | | | - | | | | | | - | FreeBSD 5.2.1 | | | | - | | | | | - *-------FreeBSD 5.3 | | | | - | | | | OpenBSD 3.6 | - | | | *--NetBSD 2.0 | | - | | | | | | | DragonFly 1.2.0 - | | Mac OS X | | NetBSD 2.0.2 | | - | | 10.4 | | | | | - | FreeBSD 5.4 | | | | | | - | | | | | | OpenBSD 3.7 | - | | | | | NetBSD 2.0.3 | | - | | | | | | | | - *--FreeBSD | | | | v OpenBSD 3.8 | - | 6.0 | | | | | | - | | | | | \ | | - | | | | | NetBSD 2.1 | | - | | | | | | | - | | | | *--NetBSD 3.0 | | - | | | | | | | | DragonFly 1.4.0 - | | | | | | | OpenBSD 3.9 | - | FreeBSD | | | | | | | - | 6.1 | | | | | | | - | | FreeBSD 5.5 | | | | | | - | | | | | NetBSD 3.0.1 | DragonFly 1.6.0 - | | | | | | | | - | | | | | | OpenBSD 4.0 | - | | | | | NetBSD 3.0.2 | | - | | | | NetBSD 3.1 | | - | FreeBSD 6.2 | | | | - | | | | | DragonFly 1.8.0 - | | | | OpenBSD 4.1 | - | | | | | DragonFly 1.10.0 - | | Mac OS X | | | - | | 10.5 | | | - | | | | OpenBSD 4.2 | - | | | *--NetBSD 4.0 | | - | FreeBSD 6.3 | | | | | - | \ | | | | | - *--FreeBSD | | | | | DragonFly 1.12.0 - | 7.0 | | | | | | - | | | | | | OpenBSD 4.3 | - | | | | | NetBSD | DragonFly 2.0.0 - | | FreeBSD | | 4.0.1 OpenBSD 4.4 | - | | 6.4 | | | | - | | | | | | - | FreeBSD 7.1 | | | | - | | | | | DragonFly 2.2.0 - | FreeBSD 7.2 | *--NetBSD OpenBSD 4.5 | - | \ | | 5.0 | | - | \ | | / | \ | | - | | Mac OS X | | | \ | | - | | 10.6 | | | \ | | - | | | | | | NetBSD | DragonFly 2.4.0 - | | | | | | 5.0.1 OpenBSD 4.6 | - | | | | | | | | | - *--FreeBSD | | | | | | | | - | 8.0 | | | | | | | | - | | FreeBSD | | | | NetBSD | | - | | 7.3 | | | | 5.0.2 | DragonFly 2.6.0 - | | | | | | | OpenBSD 4.7 | - | FreeBSD | | | | | | | - | 8.1 | | | | | | | - | | | | | | | | DragonFly 2.8.2 - | | | | | | | OpenBSD 4.8 | - | | | | | | *--NetBSD | | - | FreeBSD FreeBSD | | | 5.1 | | - | 8.2 7.4 | | | | | DragonFly 2.10.1 - | | | | | | OpenBSD 4.9 | - | `-----. Mac OS X | | | | | - | \ 10.7 | | | | | - | | | | | | OpenBSD 5.0 | - *--FreeBSD | | | | | | | - | 9.0 | | | | NetBSD | DragonFly 3.0.1 - | | FreeBSD | | | 5.1.2 | | - | | 8.3 | | | | | | - | | | | | | NetBSD | | - | | | | | | 5.1.3 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 5.1.4 | | - | | | | | | OpenBSD 5.1 | - | | | Mac OS X | `--------. | | - | | | 10.8 | | | | - | | | | *--NetBSD | | | - | | | | | 6.0 | | | - | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1 - | FreeBSD | | | | | NetBSD | | - | 9.1 | | | | | 5.2 | | - | | | | | | | | | | - | | | | | | | NetBSD | | - | | | | | | | 5.2.1 | | - | | | | | | | | | | - | | | | | | | NetBSD | | - | | | | | | | 5.2.2 | | - | | | | | | | | | - | | | | | | \ | | - | | | | | | NetBSD | | - | | | | | | 6.0.1 | | - | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 - | | | | | | NetBSD | | - | | | | | | 6.0.2 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.3 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.4 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.5 | | - | | | | | | | | | - | | | | | | NetBSD | | - | | | | | | 6.0.6 | | - | | | | | | | | - | | | | | *--NetBSD | | - | | | | | 6.1 | | - | | FreeBSD | | | | | - | | 8.4 | | NetBSD | | - | | | | | 6.1.1 | | - | | | | | | | - | FreeBSD | | NetBSD | | - | 9.2 | | 6.1.2 | | - | | Mac OS X | | | | - | | 10.9 | | OpenBSD 5.4 | - | `-----. | | | | DragonFly 3.6.0 - | \ | | | | | - *--FreeBSD | | | NetBSD | | - | 10.0 | | | 6.1.3 | | - | | | | | | | | - | | | | | | | DragonFly 3.6.1 - | | | | | | | | - | | | | | | | | - | | | | | | | DragonFly 3.6.2 - | | | | | NetBSD | | - | | | | | 6.1.4 | | - | | | | | | | | - | | | | | | OpenBSD 5.5 | - | | | | | | | | - | | | | | | | DragonFly 3.8.0 - | | | | | | | | - | | | | | | | | - | | | | | | | DragonFly 3.8.1 - | | | | | | | | - | | | | | | | | - | | | | | | | DragonFly 3.6.3 - | | | | | | | | - | | FreeBSD | | | | | - | | 9.3 | | | | | - | | | | NetBSD | DragonFly 3.8.2 - | | | | 6.1.5 | | - | | Mac OS X | | | - | | 10.10 | | | - | | | | OpenBSD 5.6 | - | FreeBSD | | | | - | 10.1 | | | DragonFly 4.0.1 - | | | | | | - | | | | | DragonFly 4.0.2 - | | | | | | - | | | | | DragonFly 4.0.3 - | | | | | | - | | | | | DragonFly 4.0.4 - | | | | | | - | | | | | DragonFly 4.0.5 - | | | | | | - | | | | OpenBSD 5.7 | - | | | | | DragonFly 4.2.0 - | FreeBSD | | | | - | 10.2 | | | | - | | macOS *--NetBSD 7.0 | | - | | 10.11 | | | OpenBSD 5.8 | - | | | | | `--. | DragonFly 4.4.1 - | FreeBSD | | | | OpenBSD 5.9 | - | 10.3 | | | | | | - | | | | | NetBSD | | - | | | | | 7.0.1 | | - | `------. | | | | | DragonFly 4.6.0 - | | | | | | | | - | | | | | | | | - *--FreeBSD | macOS | | | OpenBSD 6.0 | - | 11.0 | 10.12 | | NetBSD | | - | | | | | | 7.0.2 | | - | | | | | | | | - | | | | | *--NetBSD | | - | | | | | | 7.1 | | - | | | | | | | | | - | | | | | | | | | - | | | macOS | | | | DragonFly 4.8.0 - | | | 10.13 | | | OpenBSD 6.1 | - | FreeBSD | | | | | | DragonFly 5.0.0 - | 11.1 FreeBSD | | | | | | - | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1 - | | | | | | | | - | `------. | | | NetBSD | DragonFly 5.0.2 - | | | | | 7.1.1 | | - | | | | | | | | - | | | | | NetBSD | | - | | | | | 7.1.2 `--. | - | | | | | | | - | | | | `-----. OpenBSD 6.3 | - | | | *--NetBSD | | DragonFly 5.2.0 - | | | | 8.0 | | | - | | | | | | | DragonFly 5.2.1 - | | | | | | | | - | | | | | | | DragonFly 5.2.2 - | FreeBSD | | | *--NetBSD | | - | 11.2 | | | 7.2 | | - | | macOS | | | | - | | 10.14 | | OpenBSD 6.4 | - | | | | | | | - | | | | | | DragonFly 5.4.0 - *--FreeBSD | | | | | | - | 12.0 | | | | | DragonFly 5.4.1 - | | | | | | OpenBSD 6.5 | - | | | | | | | | - | | | | | NetBSD | | - | | | | | 8.1 | DragonFly 5.6 - | | | | | | | | - | | | | | | | DragonFly 5.6.1 - | | FreeBSD macOS | | | | - | | 11.3 10.15 | | | | - | FreeBSD | | | | OpenBSD 6.6 | - | 12.1 | macOS | `-------. | | - | | | 10.15.1 | | | DragonFly 5.6.2 - | | | | *--NetBSD | | | - | | | | | 9.0 | | | - | | | | | | | | | - | | | | | | | | DragonFly 5.8 - | | | | | | | | | - | | | | | | | | DragonFly 5.6.3 - | | | | | | NetBSD | | - | | | | | | 8.2 | | - | | | | | | | | DragonFly 5.8.1 - | | | | | | | OpenBSD 6.7 | - | | FreeBSD | | | | | | - | | 11.4 | | | | | | - | | | | | | | DragonFly 5.8.2 - | | | | | | | DragonFly 5.8.3 - | | | | NetBSD | OpenBSD 6.8 | - | FreeBSD macOS | 9.1 | | | - | 12.2 11 | | | | | - | | | | | | | | - | `------. | | | | | | - | | | | | | | | - *--FreeBSD | | | | | | | - | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0 - | | | | | 9.2 | | | - | | | | | | | | DragonFly 6.0.1 - | | | | | | | | | - | | FreeBSD macOS | | | OpenBSD 7.0 | - | | 12.3 12 | | | | | - | | | | | | | | DragonFly 6.2.1 - | | | | | | | OpenBSD 7.1 | - | FreeBSD | | | | | | | - | 13.1 | | | | | | | - | | | | | | | | DragonFly 6.2.2 - | | | | | NetBSD | | | - | | | macOS | 9.3 | OpenBSD 7.2 | - | | | 13 | | | | | - | | FreeBSD | | | | | | - | | 12.4 | | | | | | - | | | | | | | DragonFly 6.4.0 - | | | | | | OpenBSD 7.3 | - | FreeBSD | | | | | | - | 13.2 | | | | | | - | | | | | | | | - | `------. | | | | | | - | | macOS | | | | | - | | 14 | | | | | - | | | | | | OpenBSD 7.4 | - *--FreeBSD | | | | | | | - | 14.0 | | | | | | | - | | | | | | | | | - | | FreeBSD | | NetBSD | | | - | | 13.3 | | 9.4 | | | - | | | | | | | | - | | | | *--NetBSD | | | - | | | | | 10.0 | | | - | | | | | | | | | - | | | | | | | OpenBSD 7.5 | - | | | | | | NetBSD | | - | | | | | | 8.3 | | - | FreeBSD | | | | | | - | 14.1 | | | | | | - | | | macOS | | | | - | | | 15 | | | | - | | FreeBSD | | | | | - | | 13.4 | | | OpenBSD 7.6 | - | FreeBSD | | | | | | - | 14.2 | | | | | | - | | | | | NetBSD | | - | | | | | 10.1 | | - | | FreeBSD | | | | - | | 13.5 | | | | - | | | | OpenBSD 7.7 | - | | | | | DragonFly 6.4.1 - | | | | | DragonFly 6.4.2 - | FreeBSD | | | | - | 14.3 | | | | - | macOS | | | - | 26 | | | - | | | OpenBSD 7.8 | - | | | | | -FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current - | | | | | - v v v v v + | | | | *--NetBSD 1.1 ---. BSD/OS 2.1 + | FreeBSD 2.1.5 | | | \ | + | | | | *--NetBSD 1.2 \ BSD/OS 3.0 + | FreeBSD 2.1.6 | | | \ OpenBSD 2.0 | + | | | | | \ | | + | FreeBSD 2.1.6.1 | | | \ | | + | | | | | \ | | + | FreeBSD 2.1.7 | | | | | | + | | | | | NetBSD 1.2.1 | | + | FreeBSD 2.1.7.1 | | | | | + | | | | | | + | | | | | | + *-FreeBSD 2.2 | | | | | + | \ | | | | | + | FreeBSD 2.2.1 | | | | | + | | | | | | | + | FreeBSD 2.2.2 | | | OpenBSD 2.1 | + | | | | | | | + | FreeBSD 2.2.5 | | | | | + | | | | | OpenBSD 2.2 | + | | | | *--NetBSD 1.3 | | + | FreeBSD 2.2.6 | | | | | | + | | | | | NetBSD 1.3.1 | BSD/OS 3.1 + | | | | | | OpenBSD 2.3 | + | | | | | NetBSD 1.3.2 | | + | FreeBSD 2.2.7 | | | | | | + | | | | | | | BSD/OS 4.0 + | FreeBSD 2.2.8 | | | | | | + | | | | | | | | + | v | | | | OpenBSD 2.4 | + | FreeBSD 2.2.9 | | | | | | + | | | | | | | +FreeBSD 3.0 <--------* | | v | | + | | | NetBSD 1.3.3 | | + *---FreeBSD 3.1 | | | | + | | | | | BSD/OS 4.0.1 + | FreeBSD 3.2----* | .--*--NetBSD 1.4 OpenBSD 2.5 | + | | | | | | | | | + | | | | | | | | | + | | | | | | | | | + | FreeBSD 3.3 | | | | NetBSD 1.4.1 | | + | | | | | | | OpenBSD 2.6 | + | FreeBSD 3.4 | | | | | | | + | | | | | | | | BSD/OS 4.1 +FreeBSD 4.0 | | | | | NetBSD 1.4.2 | | + | | | | | | | | | + | | | | | | | | | + | FreeBSD 3.5 | | | | | OpenBSD 2.7 | + | | | | | | | | | + | FreeBSD 3.5.1 | | | | | | | + | | | | | | | | + *---FreeBSD 4.1 | | | | | | | + | | | | | | | | | + | FreeBSD 4.1.1 | | / | | | | + | | | | / | | | | + | FreeBSD 4.2 Darwin/ | NetBSD 1.4.3 | | + | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2 + | | | | | | + | | | | | | + | | 10.0 *--NetBSD 1.5 | | + | FreeBSD 4.3 | | | | | + | | | | | OpenBSD 2.9 | + | | | | NetBSD 1.5.1 | | + | | | | | | | + | FreeBSD 4.4-. | | NetBSD 1.5.2 | | + | | | Mac OS X | | | | + | | | 10.1 | | OpenBSD 3.0 | + | FreeBSD 4.5 | | | | | | + | | \ | | | | BSD/OS 4.3 + | FreeBSD 4.6 \ | | | OpenBSD 3.1 | + | | \ | | NetBSD 1.5.3 | | + | FreeBSD 4.6.2 Mac OS X | | | + | | 10.2 | | | + | FreeBSD 4.7 | | | | + | | | *--NetBSD 1.6 OpenBSD 3.2 | + | FreeBSD 4.8 | | | | | + | | | | NetBSD 1.6.1 | | + | |--------. | | | OpenBSD 3.3 BSD/OS 5.0 + | | \ | | | | | + | FreeBSD 4.9 | | | | OpenBSD 3.4 BSD/OS 5.1 ISE + | | | | | | | + | | | | | NetBSD 1.6.2 | + | | | | | | | + | | | | | | OpenBSD 3.5 + | | | | | v | + | FreeBSD 4.10 | | | | + | | | | | | + | FreeBSD 4.11 | | | | + | | | | | + | `-|------|-------------------|-------------------. + | | | | \ +FreeBSD 5.0 | | | | + | | | | | +FreeBSD 5.1 | | | DragonFly 1.0 + | \ | | | | + | ----- Mac OS X | | | + | 10.3 | | | +FreeBSD 5.2 | | | | + | | | | | | + | FreeBSD 5.2.1 | | | | + | | | | | + *-------FreeBSD 5.3 | | | | + | | | | OpenBSD 3.6 | + | | | *--NetBSD 2.0 | | + | | | | | | | DragonFly 1.2.0 + | | Mac OS X | | NetBSD 2.0.2 | | + | | 10.4 | | | | | + | FreeBSD 5.4 | | | | | | + | | | | | | OpenBSD 3.7 | + | | | | | NetBSD 2.0.3 | | + | | | | | | | | + *--FreeBSD | | | | v OpenBSD 3.8 | + | 6.0 | | | | | | + | | | | | \ | | + | | | | | NetBSD 2.1 | | + | | | | | | | + | | | | *--NetBSD 3.0 | | + | | | | | | | | DragonFly 1.4.0 + | | | | | | | OpenBSD 3.9 | + | FreeBSD | | | | | | | + | 6.1 | | | | | | | + | | FreeBSD 5.5 | | | | | | + | | | | | NetBSD 3.0.1 | DragonFly 1.6.0 + | | | | | | | | + | | | | | | OpenBSD 4.0 | + | | | | | NetBSD 3.0.2 | | + | | | | NetBSD 3.1 | | + | FreeBSD 6.2 | | | | + | | | | | DragonFly 1.8.0 + | | | | OpenBSD 4.1 | + | | | | | DragonFly 1.10.0 + | | Mac OS X | | | + | | 10.5 | | | + | | | | OpenBSD 4.2 | + | | | *--NetBSD 4.0 | | + | FreeBSD 6.3 | | | | | + | \ | | | | | + *--FreeBSD | | | | | DragonFly 1.12.0 + | 7.0 | | | | | | + | | | | | | OpenBSD 4.3 | + | | | | | NetBSD | DragonFly 2.0.0 + | | FreeBSD | | 4.0.1 OpenBSD 4.4 | + | | 6.4 | | | | + | | | | | | + | FreeBSD 7.1 | | | | + | | | | | DragonFly 2.2.0 + | FreeBSD 7.2 | *--NetBSD OpenBSD 4.5 | + | \ | | 5.0 | | + | \ | | / | \ | | + | | Mac OS X | | | \ | | + | | 10.6 | | | \ | | + | | | | | | NetBSD | DragonFly 2.4.0 + | | | | | | 5.0.1 OpenBSD 4.6 | + | | | | | | | | | + *--FreeBSD | | | | | | | | + | 8.0 | | | | | | | | + | | FreeBSD | | | | NetBSD | | + | | 7.3 | | | | 5.0.2 | DragonFly 2.6.0 + | | | | | | | OpenBSD 4.7 | + | FreeBSD | | | | | | | + | 8.1 | | | | | | | + | | | | | | | | DragonFly 2.8.2 + | | | | | | | OpenBSD 4.8 | + | | | | | | *--NetBSD | | + | FreeBSD FreeBSD | | | 5.1 | | + | 8.2 7.4 | | | | | DragonFly 2.10.1 + | | | | | | OpenBSD 4.9 | + | `-----. Mac OS X | | | | | + | \ 10.7 | | | | | + | | | | | | OpenBSD 5.0 | + *--FreeBSD | | | | | | | + | 9.0 | | | | NetBSD | DragonFly 3.0.1 + | | FreeBSD | | | 5.1.2 | | + | | 8.3 | | | | | | + | | | | | | NetBSD | | + | | | | | | 5.1.3 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 5.1.4 | | + | | | | | | OpenBSD 5.1 | + | | | Mac OS X | `--------. | | + | | | 10.8 | | | | + | | | | *--NetBSD | | | + | | | | | 6.0 | | | + | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1 + | FreeBSD | | | | | NetBSD | | + | 9.1 | | | | | 5.2 | | + | | | | | | | | | | + | | | | | | | NetBSD | | + | | | | | | | 5.2.1 | | + | | | | | | | | | | + | | | | | | | NetBSD | | + | | | | | | | 5.2.2 | | + | | | | | | | | | + | | | | | | \ | | + | | | | | | NetBSD | | + | | | | | | 6.0.1 | | + | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 + | | | | | | NetBSD | | + | | | | | | 6.0.2 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.3 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.4 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.5 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.6 | | + | | | | | | | | + | | | | | *--NetBSD | | + | | | | | 6.1 | | + | | FreeBSD | | | | | + | | 8.4 | | NetBSD | | + | | | | | 6.1.1 | | + | | | | | | | + | FreeBSD | | NetBSD | | + | 9.2 | | 6.1.2 | | + | | Mac OS X | | | | + | | 10.9 | | OpenBSD 5.4 | + | `-----. | | | | DragonFly 3.6.0 + | \ | | | | | + *--FreeBSD | | | NetBSD | | + | 10.0 | | | 6.1.3 | | + | | | | | | | | + | | | | | | | DragonFly 3.6.1 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.6.2 + | | | | | NetBSD | | + | | | | | 6.1.4 | | + | | | | | | | | + | | | | | | OpenBSD 5.5 | + | | | | | | | | + | | | | | | | DragonFly 3.8.0 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.8.1 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.6.3 + | | | | | | | | + | | FreeBSD | | | | | + | | 9.3 | | | | | + | | | | NetBSD | DragonFly 3.8.2 + | | | | 6.1.5 | | + | | Mac OS X | | | + | | 10.10 | | | + | | | | OpenBSD 5.6 | + | FreeBSD | | | | + | 10.1 | | | DragonFly 4.0.1 + | | | | | | + | | | | | DragonFly 4.0.2 + | | | | | | + | | | | | DragonFly 4.0.3 + | | | | | | + | | | | | DragonFly 4.0.4 + | | | | | | + | | | | | DragonFly 4.0.5 + | | | | | | + | | | | OpenBSD 5.7 | + | | | | | DragonFly 4.2.0 + | FreeBSD | | | | + | 10.2 | | | | + | | macOS *--NetBSD 7.0 | | + | | 10.11 | | | OpenBSD 5.8 | + | | | | | `--. | DragonFly 4.4.1 + | FreeBSD | | | | OpenBSD 5.9 | + | 10.3 | | | | | | + | | | | | NetBSD | | + | | | | | 7.0.1 | | + | `------. | | | | | DragonFly 4.6.0 + | | | | | | | | + | | | | | | | | + *--FreeBSD | macOS | | | OpenBSD 6.0 | + | 11.0 | 10.12 | | NetBSD | | + | | | | | | 7.0.2 | | + | | | | | | | | + | | | | | *--NetBSD | | + | | | | | | 7.1 | | + | | | | | | | | | + | | | | | | | | | + | | | macOS | | | | DragonFly 4.8.0 + | | | 10.13 | | | OpenBSD 6.1 | + | FreeBSD | | | | | | DragonFly 5.0.0 + | 11.1 FreeBSD | | | | | | + | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1 + | | | | | | | | + | `------. | | | NetBSD | DragonFly 5.0.2 + | | | | | 7.1.1 | | + | | | | | | | | + | | | | | NetBSD | | + | | | | | 7.1.2 `--. | + | | | | | | | + | | | | `-----. OpenBSD 6.3 | + | | | *--NetBSD | | DragonFly 5.2.0 + | | | | 8.0 | | | + | | | | | | | DragonFly 5.2.1 + | | | | | | | | + | | | | | | | DragonFly 5.2.2 + | FreeBSD | | | *--NetBSD | | + | 11.2 | | | 7.2 | | + | | macOS | | | | + | | 10.14 | | OpenBSD 6.4 | + | | | | | | | + | | | | | | DragonFly 5.4.0 + *--FreeBSD | | | | | | + | 12.0 | | | | | DragonFly 5.4.1 + | | | | | | OpenBSD 6.5 | + | | | | | | | | + | | | | | NetBSD | | + | | | | | 8.1 | DragonFly 5.6 + | | | | | | | | + | | | | | | | DragonFly 5.6.1 + | | FreeBSD macOS | | | | + | | 11.3 10.15 | | | | + | FreeBSD | | | | OpenBSD 6.6 | + | 12.1 | macOS | `-------. | | + | | | 10.15.1 | | | DragonFly 5.6.2 + | | | | *--NetBSD | | | + | | | | | 9.0 | | | + | | | | | | | | | + | | | | | | | | DragonFly 5.8 + | | | | | | | | | + | | | | | | | | DragonFly 5.6.3 + | | | | | | NetBSD | | + | | | | | | 8.2 | | + | | | | | | | | DragonFly 5.8.1 + | | | | | | | OpenBSD 6.7 | + | | FreeBSD | | | | | | + | | 11.4 | | | | | | + | | | | | | | DragonFly 5.8.2 + | | | | | | | DragonFly 5.8.3 + | | | | NetBSD | OpenBSD 6.8 | + | FreeBSD macOS | 9.1 | | | + | 12.2 11 | | | | | + | | | | | | | | + | `------. | | | | | | + | | | | | | | | + *--FreeBSD | | | | | | | + | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0 + | | | | | 9.2 | | | + | | | | | | | | DragonFly 6.0.1 + | | | | | | | | | + | | FreeBSD macOS | | | OpenBSD 7.0 | + | | 12.3 12 | | | | | + | | | | | | | | DragonFly 6.2.1 + | | | | | | | OpenBSD 7.1 | + | FreeBSD | | | | | | | + | 13.1 | | | | | | | + | | | | | | | | DragonFly 6.2.2 + | | | | | NetBSD | | | + | | | macOS | 9.3 | OpenBSD 7.2 | + | | | 13 | | | | | + | | FreeBSD | | | | | | + | | 12.4 | | | | | | + | | | | | | | DragonFly 6.4.0 + | | | | | | OpenBSD 7.3 | + | FreeBSD | | | | | | + | 13.2 | | | | | | + | | | | | | | | + | `------. | | | | | | + | | macOS | | | | | + | | 14 | | | | | + | | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | | | + | 14.0 | | | | | | | + | | | | | | | | | + | | FreeBSD | | NetBSD | | | + | | 13.3 | | 9.4 | | | + | | | | | | | | + | | | | *--NetBSD | | | + | | | | | 10.0 | | | + | | | | | | | | | + | | | | | | | OpenBSD 7.5 | + | | | | | | NetBSD | | + | | | | | | 8.3 | | + | FreeBSD | | | | | | + | 14.1 | | | | | | + | | | macOS | | | | + | | | 15 | | | | + | | FreeBSD | | | | | + | | 13.4 | | | OpenBSD 7.6 | + | FreeBSD | | | | | | + | 14.2 | | | | | | + | | | | | NetBSD | | + | | | | | 10.1 | | + | | FreeBSD | | | | + | | 13.5 | | | | + | | | | OpenBSD 7.7 | + | | | | | DragonFly 6.4.1 + | | | | | DragonFly 6.4.2 + | FreeBSD | | | | + | 14.3 | | | | + | macOS | | | + | 26 | | | + | | | OpenBSD 7.8 | + | | | | | +FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current + | | | | | + v v v v v Time ---------------- From nobody Wed Dec 24 18:23:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc0cT6Bwgz6LNXQ for ; Wed, 24 Dec 2025 18:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc0cT3Pg5z46D6 for ; Wed, 24 Dec 2025 18:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600601; h=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=8bzmdXUN+xJcpm7G7WyuRsM9we29VVObtd+NGmhJjKg=; b=EOlTXYWfGhX84+AeBtEJv2/7x37teVbtN1O3Thw9l6dyq14eHNnlFtuM7F5DztaRIkoey1 gzJlu3/yiLIls71iyoS/qHjHNeR7Uau229jofb95ZL8xEA3EG87OywQx1OVcZKerJr6Cpg Evwu5Hm+jtslBHNyjynrcVGxDhwt394rwcJOtrxpvYKZaoqhg9eyUtIqezcX5meJu8lan/ 3g7SqZrBGXaqzTViLxiutw5+P+4GNe7UDIo8+ylLNlZhKodrWlDaSP2Vid8+DcsSfLkw15 5YCO7hOsVh4PpXS/QzVLm8KDW9v0aCI9HzsCgTGVuPeWnngDRq3YaAs9dG8JdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766600601; h=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=8bzmdXUN+xJcpm7G7WyuRsM9we29VVObtd+NGmhJjKg=; b=dOFEW76wUaiazxG7Orm7uSopS+5ljd1IWXGDlLJiPRKW3QwFOHo46fO+a/MsNzpFduGxrO Ktm8JFz2kjeGlOP+rC+fXl4Y/gG4jlvFR5Dx27hae1mf8ttMTDnX3oHZi1xIUqGKu7YZ70 EHTsHk4+136vbF9m6Gn2e+puc8EuXVLGPxOX1hcoV31EwUO5YMGfmwMYMS+AT23lZVta6/ 6uBaFD3vFO4VrXtCooLK0jDURDXta9e4GmFNM7Xg6X7R2FUsxHMP1GSpbZm3quFy2n7G29 AjUTjWjzr4X5jiXHnNlaEqhGjTUdSdFq+tne4I2zHhEWjdNh4jBcC5ub4GAeLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766600601; a=rsa-sha256; cv=none; b=CkpscnKzXc04AJyZvIhr+hCmVyY9REKaEzI3TXsn7JoM1r8OUBbERchxBktRaRaEyjqpbh vUMDSNhq5r29oLCmwpg2JIns5Kp9mwdXpp/JVrCExXGdODI7UxVjfJRutuy8k1yUtWr4/o KEpDfkSaLg/ZB3fLlr0EM/Hd2WOn7u/l6iL/XykWsJkFgIKt1FZVy0NFQ534QTgxF4/MZ4 QhIXdsfqS5/8hehDcgPJVM2QLNsCPAZP65twVqZIftG4E02h0lM/3EiX47uLZHRTMKo7LS J8REqvS9ODqIwsZS+Eo2Pf7JZe80YW5K3g5r2K8Jip5t7G1lygN3gTBw51DxPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc0cT2tNQztSQ for ; Wed, 24 Dec 2025 18:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 18:23:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Maxim Konovalov From: Sergey A. Osokin Subject: git: fff399d8c6ad - stable/14 - bsd-family-tree: add FreeBSD 15.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fff399d8c6adfdd52275faa6b79da70a0682af6a Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 18:23:21 +0000 Message-Id: <694c2f99.30969.6e9467fe@gitrepo.freebsd.org> The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=fff399d8c6adfdd52275faa6b79da70a0682af6a commit fff399d8c6adfdd52275faa6b79da70a0682af6a Author: Maxim Konovalov AuthorDate: 2025-12-02 03:44:42 +0000 Commit: Sergey A. Osokin CommitDate: 2025-12-24 18:22:52 +0000 bsd-family-tree: add FreeBSD 15.0 (cherry picked from commit 7b44ab1c6abe106a44604a8504edca0e57ec1c42) Sponsored by: tipi.work --- share/misc/bsd-family-tree | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 6283be25b91f..ec70048523ba 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -300,7 +300,7 @@ FreeBSD 5.2 | | | | | | | | | 6.1 | | | | FreeBSD | | | | | | | 8.4 | | NetBSD | | - | | | | | 6.1.1 | | + | | | | 6.1.1 | | | | | | | | | | FreeBSD | | NetBSD | | | 9.2 | | 6.1.2 | | @@ -483,6 +483,8 @@ FreeBSD 5.2 | | | | | macOS | | | | 26 | | | | | | OpenBSD 7.8 | + *--FreeBSD | | | | + | 15.0 | | | | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -931,6 +933,7 @@ DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] +FreeBSD 15.0 2025-12-02 [FBD] Bibliography ------------------------ From nobody Wed Dec 24 18:45:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc15r3wvRz6LPx1 for ; Wed, 24 Dec 2025 18:45:20 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc15r349Bz487Q for ; Wed, 24 Dec 2025 18:45:20 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766601920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZO+v4mnCzWS7rTlwvy2tQaKCwtQHbahpuhF79QjSQrg=; b=uURN6gbGRJimseja5Up4Ti8w8kn2SBwMQmkfgzyukAPRBJ7gh+BdKy9ahXRjo4fVr5jI2h JzJqRmEQmZvNKHsBn/9kdkv6imTtqIF6peWq1h3OwxPlRTTODRlYR6vrMv6YqhExaXcE6X seHdcPAQgIZ5fskOgxOKJCtgHyCtiq5zdmWN+4OZOj8sg/WZqUydq1BqmD2lI5SovIGpB2 e2Jhf4qfzyI1OfNPz+25IIcnjl97OTWBdcHM5OPE+X+3DJlN3gco5jnh82Pl3sDnn7jtnj UdPlCF4JAVmLVTj3WnQIKvIX4OVO0oE8hzcK1wtVypiU3oNp3lWyN0r3IIq7ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766601920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZO+v4mnCzWS7rTlwvy2tQaKCwtQHbahpuhF79QjSQrg=; b=uOs1D20AmNdxIvH52mihZ3A/WU88rFztWVGWPn+8OSvMfJFONLd8breqPI+QOVpxIO2y1u GX4xMVb5Ks3zM+FML367+8Gfv7B8Btel9D4gKp1Qjj4EXGIPr+KicLMfRCbm7spCSiKs18 xLmuq8gbz1pNLinzLjdUI5l7g7c3sPbe/bCteRcjQwVl9XayoGaKLzTBZTTzLjP+PpqNJ+ QHWcTbAIi7zoC3a2w7U91qzGwao5UWwi25lmMV8My3GvXUQ43b+3Vdon5A9xcBxaSGVAWe 3odn4HDlcM66c4h/ZbbB0WIEljeIWLOU/UvLynMN8mxaxMlX01iUpGZ2KYGkNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766601920; a=rsa-sha256; cv=none; b=caqTIk17C5fX3iGKf4mMCbwZPaw/qSeJrTNcPymUNzNkqGCtWWY9bHDq5ZB+9rG8tDHbUX sagEGTydZfRdJnrQnoOmg0t1Bp7si43l/aDZA0RU7PPY6TN7SQfcFFcXhn0kArPiDxV5KF aWd756bGlwU9j8lbzn0KBtzr4x0vnbD1ieSEyweqqqItyXlImd9xl/kvV5FKCoXfCTrv7/ KCEUSCVFHKuZjkUVWcSVMU/f8zlSExEP2JKGM/wOHcQeHlgN0HT4DdKa+6xTy3KGJ9+yqV +42HzMh/l8Hzmfu2AMItkTZJ1iNUsxEvVDjYk4SjgQISXgGqjvVntjp/OEusHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dc15r2Kzyz3GW for ; Wed, 24 Dec 2025 18:45:20 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4ede6ca6f65so9674231cf.0 for ; Wed, 24 Dec 2025 10:45:20 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWx2fbVpWNraZFb91r9F7n/cbgDPfho7eOYCS/qgTltZtqSMEkrM2RNZ0KN0txqVRto2ywmlMpLSzjkw3PvVISa4apU@freebsd.org X-Gm-Message-State: AOJu0Yw9urtKGbyRFtKeVyN4H9InDKd/LTy+lapAYk+v/5dYJBGwhiPF VE2OEbE3AY2FUEazBNMUyRQ0llasj1VjlW0rGUvy3o1Aa2tW6+Q27u8DLsdhCWlshcI7JBYBvlN ZbD5FqZiwKoSHueW5HXfUSYnbv3wA3wY= X-Google-Smtp-Source: AGHT+IHSKe13SkicjRYGP8e7avdTlZ0zyPAFPVUl04LyGLW4mplkV2wZMwHppofM1ZuuusmuoXvLtPOz7buW8SH5HY8= X-Received: by 2002:a05:622a:1922:b0:4f1:b3c0:2ae7 with SMTP id d75a77b69052e-4f4b43e3a80mr182488481cf.6.1766601919869; Wed, 24 Dec 2025 10:45:19 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> In-Reply-To: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> From: Nuno Teixeira Date: Wed, 24 Dec 2025 18:45:08 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2oyaLa7XFYcFZnswf7hCw4W-qXKyEDz_8Pm2Q3S2DhaSr-mz9kkjXq9eLY Message-ID: Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000e4b7ac0646b70f38" --000000000000e4b7ac0646b70f38 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Dimitry, Just a quick question about users that run current with speed in their minds, should WITH_LLVM_LINK_STATIC_LIBRARIES be added to /etc/src.conf too? WITH_MALLOC_PRODUCTION=3Dyes WITHOUT_LLVM_ASSERTIONS=3Dyes WITHOUT_PTHREADS_ASSERTIONS=3Dyes WITHOUT_ASSERT_DEBUG=3Dyes Thanks! Dimitry Andric escreveu (ter=C3=A7a, 23/12/2025 =C3=A0(s)= 21:04): > The branch main has been updated by dim: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D8d5a11cd0137d3ad70f6b06e063ea91= a776d510a > > commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a > Author: Dimitry Andric > AuthorDate: 2025-06-18 10:06:25 +0000 > Commit: Dimitry Andric > CommitDate: 2025-12-23 21:01:40 +0000 > > src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000e4b7ac0646b70f38 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Dimitry,

Just a quick = question about users that run current with speed in their minds,
should WITH_LLVM_LINK_STATIC_LIBRARIES be added to=C2=A0<= /span>/etc/src.conf too?

WITH_MALLOC= _PRODUCTION=3Dyes
WITHOUT_LLVM_ASSERTIONS=3Dyes
WITHOUT_PTHREADS_ASSE= RTIONS=3Dyes
WITHOUT_ASSERT_DEBUG=3Dyes

Thanks!
<= br>
Dimitry Andric <dim@f= reebsd.org> escreveu (ter=C3=A7a, 23/12/2025 =C3=A0(s) 21:04):
The branch main has b= een updated by dim:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D8d5a11cd0137d3ad70f6b06e063ea91a776d510a
commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a
Author:=C2=A0 =C2=A0 =C2=A0Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-06-18 10:06:25 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2025-12-23 21:01:40 +0000

=C2=A0 =C2=A0 src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob

=C2=A0=C2=A0 =C2=A0
--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000e4b7ac0646b70f38-- From nobody Wed Dec 24 20:12:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc32N1M8qz6LWYL for ; Wed, 24 Dec 2025 20:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc32M6hkCz4J3m for ; Wed, 24 Dec 2025 20:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766607148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8LsTiNlyQEnprOv5BwO1o/kkdmjmYYOxJylKaCjYlk=; b=fTpOtJdbyK8w2b4q53icMZ0iOUiy4sUGWVXhJ+wkWSC03/LsN+RdXNH+D+uC0i9UYV/rIS sRkfVvXuAtqEC28xdyR8tw4/RLKt1UC2zcgKo4VyUPJw2wsGyDJbxkbU+VHHqWP4GCvcFE niLl1MGz4t5X4lvrqiUS4tLkWp019zpEyiJga7sWNFU0vqprazHulq/SCA5hd/TBpEDVgq NcgZ9WDK1a6WE5aR8AMQPMKGO7ZTqzc+c9f42nPZXFl9PioX5vISr5SVnKD2x2helRHivu Z/S6CGJ961bKvy1Ul2SRptXdr+EThKO4czfE0D+7HqcGwd0edede1am6HO+NqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766607147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8LsTiNlyQEnprOv5BwO1o/kkdmjmYYOxJylKaCjYlk=; b=LFhm1UQFn7uQGqsHCUTyyyG20AuwJEN3/4ZAzkZF2eHito/DBa91cQvbLkultBF9FdXA7X mfVNV1zK0ta91qqnTUvU+1eDGiSbbv/GAUPhgggmUMf7RXNyQ6wEbCrwxXSmptt7/PpnBk 59PLWPHLVH7i0mdVE68K5SofpTyhJWzDwZ6O9cb2MM5wBa7TrlKsOC5ZS+SSlZ1oraZXNe GYIdhe1TglPttitLBN/2LRVFEHG8F2PBbyRYcZ2rknsrA9nHqwHfLji5W2sxuBoBrcyo9Q IlDN0hdOQfCTYcqFNvaiOLiSIeSUNuN94ab7CjDVgzgLkhlwaGCOLhaNAdPEmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766607148; a=rsa-sha256; cv=none; b=nBmv83c3zMYFoRM+FxGJbzUG/cM1h5dKFKhV5Yrt0ZdaIedYHtJIBSsi/yGVQiCycc0Ryl O/gKOutngY+ydtRTd5r1e61JVOWMck1QqG51p9DUHDccYk3gAsfZokcOOv4ndHB8KPPJHq 8oJ2vtTmlGsD3pSIrvOmjC5OABEZ/3kl54he+wy39wofLXJ4hocQ4xEnXEurIIgIsrvSFk XOHqMpHbZhEhOEm0pSA6uacsKEUkeBBsS+7nEJXPorrGSInhvzDpK5vtShAnrKYCU2HaW0 GGfy8vdOBemRxbrPkM1bXjSVfg0oCbcWf9WfueQLdI++J/0HWCTtUxqdPvqa/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc32M5xZ4zxMX for ; Wed, 24 Dec 2025 20:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c608 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 20:12:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: bbc5f5483723 - stable/15 - LinuxKPI: Move vmap-related code from linux_compat.c to linux_page.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bbc5f5483723635eeace96015144ab56b2dab3d5 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 20:12:27 +0000 Message-Id: <694c492b.3c608.4d03064a@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=bbc5f5483723635eeace96015144ab56b2dab3d5 commit bbc5f5483723635eeace96015144ab56b2dab3d5 Author: Vladimir Kondratyev AuthorDate: 2025-12-17 21:31:11 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-24 20:06:00 +0000 LinuxKPI: Move vmap-related code from linux_compat.c to linux_page.c Coming vmap_pfn() implementation requires is_vmalloc_addr() to be in the same file with other vmap-related code. Move code out from the overcrowded file. No functional changes intended. MFC after: 1 week Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D54223 (cherry picked from commit 20ce906157dfc9ae6ee834f56f2bba154f37d653) --- sys/compat/linuxkpi/common/src/linux_compat.c | 111 ----------------------- sys/compat/linuxkpi/common/src/linux_page.c | 125 ++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 111 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index ff0f477ea8cc..35430daf311d 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1812,113 +1812,6 @@ const struct fileops linuxfileops = { .fo_flags = DFLAG_PASSABLE, }; -/* - * Hash of vmmap addresses. This is infrequently accessed and does not - * need to be particularly large. This is done because we must store the - * caller's idea of the map size to properly unmap. - */ -struct vmmap { - LIST_ENTRY(vmmap) vm_next; - void *vm_addr; - unsigned long vm_size; -}; - -struct vmmaphd { - struct vmmap *lh_first; -}; -#define VMMAP_HASH_SIZE 64 -#define VMMAP_HASH_MASK (VMMAP_HASH_SIZE - 1) -#define VM_HASH(addr) ((uintptr_t)(addr) >> PAGE_SHIFT) & VMMAP_HASH_MASK -static struct vmmaphd vmmaphead[VMMAP_HASH_SIZE]; -static struct mtx vmmaplock; - -static void -vmmap_add(void *addr, unsigned long size) -{ - struct vmmap *vmmap; - - vmmap = kmalloc(sizeof(*vmmap), GFP_KERNEL); - mtx_lock(&vmmaplock); - vmmap->vm_size = size; - vmmap->vm_addr = addr; - LIST_INSERT_HEAD(&vmmaphead[VM_HASH(addr)], vmmap, vm_next); - mtx_unlock(&vmmaplock); -} - -static struct vmmap * -vmmap_remove(void *addr) -{ - struct vmmap *vmmap; - - mtx_lock(&vmmaplock); - LIST_FOREACH(vmmap, &vmmaphead[VM_HASH(addr)], vm_next) - if (vmmap->vm_addr == addr) - break; - if (vmmap) - LIST_REMOVE(vmmap, vm_next); - mtx_unlock(&vmmaplock); - - return (vmmap); -} - -#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__) || defined(__riscv) -void * -_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr) -{ - void *addr; - - addr = pmap_mapdev_attr(phys_addr, size, attr); - if (addr == NULL) - return (NULL); - vmmap_add(addr, size); - - return (addr); -} -#endif - -void -iounmap(void *addr) -{ - struct vmmap *vmmap; - - vmmap = vmmap_remove(addr); - if (vmmap == NULL) - return; -#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__) || defined(__riscv) - pmap_unmapdev(addr, vmmap->vm_size); -#endif - kfree(vmmap); -} - -void * -vmap(struct page **pages, unsigned int count, unsigned long flags, int prot) -{ - vm_offset_t off; - size_t size; - - size = count * PAGE_SIZE; - off = kva_alloc(size); - if (off == 0) - return (NULL); - vmmap_add((void *)off, size); - pmap_qenter(off, pages, count); - - return ((void *)off); -} - -void -vunmap(void *addr) -{ - struct vmmap *vmmap; - - vmmap = vmmap_remove(addr); - if (vmmap == NULL) - return; - pmap_qremove((vm_offset_t)addr, vmmap->vm_size / PAGE_SIZE); - kva_free((vm_offset_t)addr, vmmap->vm_size); - kfree(vmmap); -} - static char * devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt, va_list ap) { @@ -2887,9 +2780,6 @@ linux_compat_init(void *arg) INIT_LIST_HEAD(&pci_drivers); INIT_LIST_HEAD(&pci_devices); spin_lock_init(&pci_lock); - mtx_init(&vmmaplock, "IO Map lock", NULL, MTX_DEF); - for (i = 0; i < VMMAP_HASH_SIZE; i++) - LIST_INIT(&vmmaphead[i]); init_waitqueue_head(&linux_bit_waitq); init_waitqueue_head(&linux_var_waitq); @@ -3000,7 +2890,6 @@ linux_compat_uninit(void *arg) free(__cpu_data, M_KMALLOC); #endif - mtx_destroy(&vmmaplock); spin_lock_destroy(&pci_lock); rw_destroy(&linux_vma_lock); } diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index c0d9d71ba1ce..57ca1401b912 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -318,12 +318,119 @@ lkpi_get_user_pages(unsigned long start, unsigned long nr_pages, !!(gup_flags & FOLL_WRITE), pages)); } +/* + * Hash of vmmap addresses. This is infrequently accessed and does not + * need to be particularly large. This is done because we must store the + * caller's idea of the map size to properly unmap. + */ +struct vmmap { + LIST_ENTRY(vmmap) vm_next; + void *vm_addr; + unsigned long vm_size; +}; + +struct vmmaphd { + struct vmmap *lh_first; +}; +#define VMMAP_HASH_SIZE 64 +#define VMMAP_HASH_MASK (VMMAP_HASH_SIZE - 1) +#define VM_HASH(addr) ((uintptr_t)(addr) >> PAGE_SHIFT) & VMMAP_HASH_MASK +static struct vmmaphd vmmaphead[VMMAP_HASH_SIZE]; +static struct mtx vmmaplock; + int is_vmalloc_addr(const void *addr) { return (vtoslab((vm_offset_t)addr & ~UMA_SLAB_MASK) != NULL); } +static void +vmmap_add(void *addr, unsigned long size) +{ + struct vmmap *vmmap; + + vmmap = kmalloc(sizeof(*vmmap), GFP_KERNEL); + mtx_lock(&vmmaplock); + vmmap->vm_size = size; + vmmap->vm_addr = addr; + LIST_INSERT_HEAD(&vmmaphead[VM_HASH(addr)], vmmap, vm_next); + mtx_unlock(&vmmaplock); +} + +static struct vmmap * +vmmap_remove(void *addr) +{ + struct vmmap *vmmap; + + mtx_lock(&vmmaplock); + LIST_FOREACH(vmmap, &vmmaphead[VM_HASH(addr)], vm_next) + if (vmmap->vm_addr == addr) + break; + if (vmmap) + LIST_REMOVE(vmmap, vm_next); + mtx_unlock(&vmmaplock); + + return (vmmap); +} + +#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__) || defined(__riscv) +void * +_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr) +{ + void *addr; + + addr = pmap_mapdev_attr(phys_addr, size, attr); + if (addr == NULL) + return (NULL); + vmmap_add(addr, size); + + return (addr); +} +#endif + +void +iounmap(void *addr) +{ + struct vmmap *vmmap; + + vmmap = vmmap_remove(addr); + if (vmmap == NULL) + return; +#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__) || defined(__riscv) + pmap_unmapdev(addr, vmmap->vm_size); +#endif + kfree(vmmap); +} + +void * +vmap(struct page **pages, unsigned int count, unsigned long flags, int prot) +{ + vm_offset_t off; + size_t size; + + size = count * PAGE_SIZE; + off = kva_alloc(size); + if (off == 0) + return (NULL); + vmmap_add((void *)off, size); + pmap_qenter(off, pages, count); + + return ((void *)off); +} + +void +vunmap(void *addr) +{ + struct vmmap *vmmap; + + vmmap = vmmap_remove(addr); + if (vmmap == NULL) + return; + pmap_qremove((vm_offset_t)addr, vmmap->vm_size / PAGE_SIZE); + kva_free((vm_offset_t)addr, vmmap->vm_size); + kfree(vmmap); +} + vm_fault_t lkpi_vmf_insert_pfn_prot_locked(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn, pgprot_t prot) @@ -575,3 +682,21 @@ linuxkpi__page_frag_cache_drain(struct page *page, size_t count __unused) linux_free_pages(page, 0); } + +static void +lkpi_page_init(void *arg) +{ + int i; + + mtx_init(&vmmaplock, "IO Map lock", NULL, MTX_DEF); + for (i = 0; i < VMMAP_HASH_SIZE; i++) + LIST_INIT(&vmmaphead[i]); +} +SYSINIT(lkpi_page, SI_SUB_DRIVERS, SI_ORDER_SECOND, lkpi_page_init, NULL); + +static void +lkpi_page_uninit(void *arg) +{ + mtx_destroy(&vmmaplock); +} +SYSUNINIT(lkpi_page, SI_SUB_DRIVERS, SI_ORDER_SECOND, lkpi_page_uninit, NULL); From nobody Wed Dec 24 20:12:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc32P4ll4z6LWHY for ; Wed, 24 Dec 2025 20:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc32P36yfz4J3p for ; Wed, 24 Dec 2025 20:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766607149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+92421eGWATnOfx1qnziLVUCsh7KXsmlP2W/PlBaLjc=; b=ub4enCJKLbNk2WrMh5b+OSYOI4uydMIAnmCB7S/XCDEmkp0geO7vM+UZe9G3QfEwQqPuOm kdp0qRNkj27HIeMJhO/Vr7Jf/YsP8zSP+gq+o3BXwhrWq+XE39j64Cn6Off4IkVRpCaEoY eioLblT5La3wX41KobR57x4Uqi5fEoeqOF5+Z/QJowp4uwkK6W5SOxEGX6Q1jmUtJqXawC 9CBirZaiZL7mMCm1izZ9WVjCCC1mFTFfO8WzcFetz4F11XR3/pEMzXr4UQ9u9LMewIEjph QxcqihahHNp34LxwUcbi24aw7VKsGQBHb4i80+9uUtUEiJ1OaNbgXdfSG/CdIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766607149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+92421eGWATnOfx1qnziLVUCsh7KXsmlP2W/PlBaLjc=; b=Nt9HQUfMK5dOc1fHhFuT+o9j/DN3Dd+BbH5mDN69QDRnaWTwAfGKfLn2re985vWkuU5g+P 03hMjH178hZfKEI1iLAGRtUkNnahJgqs3eJwnC1mAYn1ZdQP2RlExArlcx3V1GecVniIR5 6WoDucoeg9gKLXg6LwZBYYkwSrWvePaUQquc71lL/EvOVNE5EqMLZAwarUh2A9egrZeptG FkiwTcKgzF5Io2tExG+i/TncZmt0FfnhhxiYl38oq+EomKOrvsdobGgFibrC6cgmBJuVT5 oEAZnU1FQcn9sxpT+Svh+hxF9k4Y8HyvsUQaAO2Simxe5/n/jp1Squ8MB2osuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766607149; a=rsa-sha256; cv=none; b=lt3Dhf1rG5Gt+Eo8cuFHdvhfQWddBMIcMjEH3d80OZsU3UiQWApH8ITfxjtqSxPGn8yRsJ O8J6/g0CJRXkjH4C9loZ/Y7IxZEM7vrGUiz0M7b/7XwhgTcq71hEXu2VJTotCyPJH/dMUi 6pQNDoVhAFXr4bjgfodpzLJI4t+kKBloPKEmLgBCAiJKB2Cbw+fkRrnjPU+WWMI4FlfYWY 8JAL+rkNxkizWtSxIczGhhWWyPOOm0VN2wM0ylmRedljjouHipcr4B0qzba/gE1WF81xYk Dte0EAFIB8EmMenw0FqOUz4JN+obT6KG/6oYrNCZPK3PRFb3Q5hyJcB1hgurMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc32N6ktbzxP5 for ; Wed, 24 Dec 2025 20:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b58c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 20:12:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 304c24df44d3 - stable/15 - LinuxKPI: Implement vmap_pfn List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 304c24df44d3ff70a26d1a8fd6653c5c4e765165 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 20:12:28 +0000 Message-Id: <694c492c.3b58c.76f857e3@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=304c24df44d3ff70a26d1a8fd6653c5c4e765165 commit 304c24df44d3ff70a26d1a8fd6653c5c4e765165 Author: Vladimir Kondratyev AuthorDate: 2025-12-17 21:31:11 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-24 20:06:08 +0000 LinuxKPI: Implement vmap_pfn Required by i915kms to support recent discrete graphics cards. MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54225 (cherry picked from commit df49fd8efa1a885089488458df0e7e88c9649c90) --- sys/compat/linuxkpi/common/include/linux/vmalloc.h | 3 + sys/compat/linuxkpi/common/src/linux_page.c | 65 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/vmalloc.h b/sys/compat/linuxkpi/common/include/linux/vmalloc.h index 00650a2df9b6..a7f77f090755 100644 --- a/sys/compat/linuxkpi/common/include/linux/vmalloc.h +++ b/sys/compat/linuxkpi/common/include/linux/vmalloc.h @@ -35,8 +35,11 @@ #define VM_MAP 0x0000 #define PAGE_KERNEL 0x0000 +#define vmap_pfn(...) linuxkpi_vmap_pfn(__VA_ARGS__) + void *vmap(struct page **pages, unsigned int count, unsigned long flags, int prot); +void *linuxkpi_vmap_pfn(unsigned long *pfns, unsigned int count, int prot); void vunmap(void *addr); #endif /* _LINUXKPI_LINUX_VMALLOC_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 57ca1401b912..82f3a2a4639f 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -341,6 +341,16 @@ static struct mtx vmmaplock; int is_vmalloc_addr(const void *addr) { + struct vmmap *vmmap; + + mtx_lock(&vmmaplock); + LIST_FOREACH(vmmap, &vmmaphead[VM_HASH(addr)], vm_next) + if (addr == vmmap->vm_addr) + break; + mtx_unlock(&vmmaplock); + if (vmmap != NULL) + return (1); + return (vtoslab((vm_offset_t)addr & ~UMA_SLAB_MASK) != NULL); } @@ -418,6 +428,61 @@ vmap(struct page **pages, unsigned int count, unsigned long flags, int prot) return ((void *)off); } +#define VMAP_MAX_CHUNK_SIZE (65536U / sizeof(struct vm_page)) /* KMEM_ZMAX */ + +void * +linuxkpi_vmap_pfn(unsigned long *pfns, unsigned int count, int prot) +{ + vm_page_t m, *ma, fma; + vm_offset_t off, coff; + vm_paddr_t pa; + vm_memattr_t attr; + size_t size; + unsigned int i, c, chunk; + + size = ptoa(count); + off = kva_alloc(size); + if (off == 0) + return (NULL); + vmmap_add((void *)off, size); + + chunk = MIN(count, VMAP_MAX_CHUNK_SIZE); + attr = pgprot2cachemode(prot); + ma = malloc(chunk * sizeof(vm_page_t), M_TEMP, M_WAITOK | M_ZERO); + fma = NULL; + c = 0; + coff = off; + for (i = 0; i < count; i++) { + pa = IDX_TO_OFF(pfns[i]); + m = PHYS_TO_VM_PAGE(pa); + if (m == NULL) { + if (fma == NULL) + fma = malloc(chunk * sizeof(struct vm_page), + M_TEMP, M_WAITOK | M_ZERO); + m = fma + c; + vm_page_initfake(m, pa, attr); + } else { + pmap_page_set_memattr(m, attr); + } + ma[c] = m; + c++; + if (c == chunk || i == count - 1) { + pmap_qenter(coff, ma, c); + if (i == count - 1) + break; + coff += ptoa(c); + c = 0; + memset(ma, 0, chunk * sizeof(vm_page_t)); + if (fma != NULL) + memset(fma, 0, chunk * sizeof(struct vm_page)); + } + } + free(fma, M_TEMP); + free(ma, M_TEMP); + + return ((void *)off); +} + void vunmap(void *addr) { From nobody Wed Dec 24 20:12:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc32Q2Y9yz6LVrN for ; Wed, 24 Dec 2025 20:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc32Q0znMz4J46 for ; Wed, 24 Dec 2025 20:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766607150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZcL6l+27YeiLNCdOVJuYpzNiVRUzRJd3Yc/N0oXtc3U=; b=JMvX4hsL4eKBPadvQ9Z+ixK77JAkVVno0jI98YWLsJdkUkSW4J+40GZxGAxz+lSyY50hLt rMxQ0Hl4KJVWwZ389hCA+47nT0gJy8pzjQIOhDiNO6cabqDLD9tRVN0IbX+8ZBl0CeAlFH Te1XpRv4iaDxG19DFT7Io7/vhqegsnKXSEMoSDMpLW6cEmU/UmqgwGMbMwoqXSZ8OL4nzz 4AV7K5WhU/rS+61VZ0UceubJHBzz7nBSz6IfIniklZEcHSyqSPCx7Gsx7+9L2ELbqo6qzY wxlry0l1jdLrI5RygSVxRkEKHnQlXaz4hjm13SZlrhpPX5IzQ0C35hzyQ4FaAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766607150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZcL6l+27YeiLNCdOVJuYpzNiVRUzRJd3Yc/N0oXtc3U=; b=nBvge0Wz4KiEe+E/HoShqad66qaeIXKJwnHGLX6Ky3octj8jjLbuPlg5MibSakZZMhWdVW u+DKgZ9ScW6YhULmuTrNLZtTFEsgvfoyX4LmpAFhFf7VM6T0LyQnz/YslYvz0/g/6sf27Z lCWIA32G1SzD876u/lSfFgrQh8V/geNjtaa9huFWNU6BH1ejijdSbCIceP9t2xiRasH25R x6nET0umZJq7pqu0eABnUQ0R+dBCMCKI8F5C2o7nhr+pgW+I04JqnPo+4w4IupyPpsvC+P OgDfty8LQJP0HagIP4WZvYBQ+Xj2iyZ+zrgDpvdgTzD+hWPLRdLGl5/SYBbUQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766607150; a=rsa-sha256; cv=none; b=hFoNo1B3vX6IfotSaJVriZysjNHe7o0E0EecAUaXXBbIVKBUC9Posd7zbHC46hVV3Aa4xy mKyFevFLwxCsKYNnN2DnDw6xvzttcOG5cmc2gvJcjPj1M4c72vlAph5+yggvjSMWCFc/Vx u7+SeWRXdpJ45V1SToPpyq6FrqNnfM2k4V8QTZgVFtv9trFpKdI5S5+tmnYdNeu7Tth02z oAJavEj7o6CD+O+ucEe052RDcUKEbLE2OthE8ha8q2hUrdjKtduvl6iiWfXBvYjCtAj9oU LIJKwoAHSO9snPceBbSn759HCT1eUGzikqeuwnuQeYyWs4VxFwxUW7Z6Hu/RLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc32Q0P5hzxMY for ; Wed, 24 Dec 2025 20:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c60c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 20:12:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 198ef2a31cee - stable/15 - LinuxKPI: bump __FreeBSD_version for vmap_pfn implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 198ef2a31cee7dd256434ad6120d279d9bcc211a Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 20:12:30 +0000 Message-Id: <694c492e.3c60c.c3ef4ca@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=198ef2a31cee7dd256434ad6120d279d9bcc211a commit 198ef2a31cee7dd256434ad6120d279d9bcc211a Author: Vladimir Kondratyev AuthorDate: 2025-12-17 21:31:11 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-24 20:08:44 +0000 LinuxKPI: bump __FreeBSD_version for vmap_pfn implementation --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index d4afa1be7bc5..9f810fb68147 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500504 +#define __FreeBSD_version 1500505 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Dec 24 22:06:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc5Yl3Vpqz6LfBT for ; Wed, 24 Dec 2025 22:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc5Yl2bRdz3BsQ for ; Wed, 24 Dec 2025 22:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766613979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cD3oJCx+iTgl8CH5N6cu25fBQjPWUu+fVwDx/uvlgE8=; b=sYG9orTao43Y/fuVOrQXIB+YXMGM+DRL0ZjIvP/2cjTKuKeqj3UruK9k/L1kb0ejqOHiiu WcFIfcniKuqRbvYtnG0WudcelyEN60EjLf/7lmPT1HfZiCT0rVPmi3W8bys3UL9zGzeRZi 3FYI+uONYbw2lbFoyuAzLzNcJ0ez2HWCDX7v3l7xBm3opealhdP/FhOgfG1Ahn/eCk/FFB Z+BbTGdWdBHApuqsw1bifMflkX9g/FsviU+F2jxn7iv0R+/+cN58/Gv5M4Red29gyhcHbK tqTwg7aoRKEqzmwXdAUqGJxEouX5mOn2mT9aGp7yfDcaqE1vwG54rxFGhLkwvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766613979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cD3oJCx+iTgl8CH5N6cu25fBQjPWUu+fVwDx/uvlgE8=; b=nnjsNFsw0RkSO+3qx4khOTid/mOKa38jElT0dwUuPcufKkTJk/f8rPAXzgu1zJ8FZAGeU0 Uqj2o+7s8t3/AwoQDr6TFhwo9zmLFAE/OSdLxwE45roDDVyWt0ZhCYr+meCcT1UpR1M5cp 5ho5lpx7EsTGC8oTdDHtsG6BORm7QErMubCDSYk7cwQ9qkgd5c46QRmRqYL7Le0J8OkmPe BFv9zPLaa+dZ2F1NmiQU/7YnwvI8r+NslpA39YxiXSGyRfOEdiCXZal4wFC9Cx1ifi7rPg h07TnJD8xVOwU+pBQC89hfO67OB7qemtcis1olEIqd0lct35kaH9CZVW6B3hhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766613979; a=rsa-sha256; cv=none; b=UQYLHkhjtl1nWhQcMU64/9QU29qWA1Y6O0VfByInGQQZoDoG9C4ZGvMRwGFB7SeMV1ACL6 n30YWiN/xdmRmdHn9TBrxdVFOPt2WV3k/gQx+UYKbzYCcoljI3EGqvnMuuAX3eRByjKlvW 4Ijok3uq034GKDmGbF0buINWOf9WWoYihVac7vIfLonlFgpbeV2iGOm7RZAb/vKLJfa/hI XPF9W6RbH82RDPfhdbJHOjSMqIVXa5YgbiVB0Iujyx3ve+goPyGeXHft6wVmo5Ykyu747i uRWQbRB7HTTg1mpCvJt09pn5op3rsfYW4u/Vm4hLcklvomVaxmBG+66sKRiXiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc5Yl1tmwz10R3 for ; Wed, 24 Dec 2025 22:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44bea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 22:06:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 099f69ff5d3d..743334913e5a - vendor/openzfs/zfs-2.4-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.4-release X-Git-Reftype: branch X-Git-Commit: 743334913e5a5f60baf287bcc6d8a23515b02ac5 X-Git-Oldrev: 099f69ff5d3df7988632039db7ad6d183eb34042 X-Git-Newrev: 743334913e5a5f60baf287bcc6d8a23515b02ac5 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 22:06:19 +0000 Message-Id: <694c63db.44bea.93f0d80@gitrepo.freebsd.org> The branch vendor/openzfs/zfs-2.4-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=099f69ff5d3d..743334913e5a 040c533280ad cmd/zpool cstyle issues d06ebddee40f CI: Add smatch static analysis workflow c8ecd63acd63 zpool: fix special vdev -v -o conflict 2e09f166f010 FreeBSD: Fix uninitialized variable error f45622ff422d chksum: run 256K benchmark on demand, preserve chksum_stat_data aa091a17bd57 Linux: bump -std to gnu11 304810208e50 zvol_id: make array length properly known at compile time d12eb47d96d4 config/kmap_atomic: initialise test data cdbe788a395f CI: zfs-test-packages: Add in new repos 2aad3dee23b9 DDT: Make children writes inherit allocator a785ddc5f317 DDT: Switch to using wmsums for lookup stats a41ef3685814 DDT: Reduce global DDT lock scope during writes 68c1df8db391 ZFS: Enable more logs for raidz_001_neg 001ce40cd48c raidz_test: Set io_offset reasonably 6e10a51b749b raidz_test: Fix ZIO ABDs initialization 071369803e47 raidz_test: Restore rand_data protection e1f0baa546b0 FreeBSD: Remove HAVE_INLINE_FLSL use ed87bc593f13 ZTS: Add slow_vdev_degraded_sit_out retry 872266a5f3f0 During CI, use `nproc` instead of `sysctl -n hw.ncpu` a2f768f61fc4 FreeBSD: Fix a potential null dereference in zfs_freebsd_fsync() 5e271995d1e7 Fix interaction of abd_iter_map()/abd_iter_unmap() with HIGHMEM 5946eeb8dfa1 Preserve LIFO ordering of kmap ops in abd_raidz_gen_iterate() 25d755e10848 Fix HIGHMEM/kmap API violation in zfs_uiomove_bvec_impl() 8c1eaea95275 CI: exclude signed-off-by/reviewed-by from 72 char limit f8572e2a9733 Fix a declaration position of the nth_page. 206487b9b145 CI: Fix Ubuntu 22.01 rsend failures 028d66b9ddcb Fix ddtprune causing space leak c9845a13323f Linux: work around use of GPL-only symbol `kasan_flag_enabled` 145c606c6073 Linux 6.18 compat: META (#18039) 663dc86de2be Fix taskq NULL pointer dereference on timer race 74bbdda1effd Fix snapshot automount expiry cancellation deadlock 0bcbee604010 Fix snapshot automount race causing duplicate mounts and AVL tree panic 47319ef7a631 ZTS: Add test for snapshot automount race 42411327cb7a Tag 2.4.0-rc5 2143bff32887 CI: Change timeout values 743334913e5a Tag 2.4.0 From nobody Wed Dec 24 22:44:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc6PR168Vz6Lj2x for ; Wed, 24 Dec 2025 22:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dc6PR0km5z3FKL for ; Wed, 24 Dec 2025 22:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766616251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqk89bqt9nJRZkuNMeLLyA96pk+Wjx5WB/DQ+AEZ4vQ=; b=pKJVcI1/9oIf/Z0nLkDs2OBgT9dLU/QcG4q4Ww3HERUU3+FWhKErqSP1hjXXQHObPl9uOQ qqlN9YGF5uDa4P8TFJZQ+tPGv3nmSv9V3VVxA1ZcA/O/GF0Nt/BuK7x5P2+T6orunRYKSV sdLjFmORAOZNXuTsboNhPAP+wZwCjqZp3TQ7tCyqCWE8U4q/wIa+tNt3lNZSGIZHaxUDZ5 SmY23RJ727mixPTy+osONyYHKOAOZR8gu3gUPp0+In9SB0PdHHcSg05iaJgeIrgxsWUAxS FBom0M8LYC3hGPlfTysvZ+m+CfAyQeUFW4Z5J5SAyPIhLJh15pL6DBDGXQZoxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766616251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqk89bqt9nJRZkuNMeLLyA96pk+Wjx5WB/DQ+AEZ4vQ=; b=pTsUQSTajuq7rh4dOc4aJg54rmsXCsmqlaxY8YIoLu9Rc6wlxT/vN41ymCjLW7GvmbMjAo y+42jlnpuLvXcjIXzEiwe2nePnNYhKDDdGvsJBhhzGz+Sb02qoJet2a/mIbrXeBFMPbvo/ 4OOgeurGxyZ2YfKIR8+iBKR3unYL1itNbh2hQyAIs/j8XegAXZ0vMlKZUgYzmS50FREcDA lBC4L4/pLsZKaIMkJM/mALqPNW24lTkdsDVtx+B83HUJuKw22BB/lEARqfth4for4dgP5x GDoHoblc9U6yoiL/6Y9cwtf7BAPHyLJ4CJb7k0DT28xXIWis2aV5AXeIMEHBcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766616251; a=rsa-sha256; cv=none; b=TaYEctC1UnX46DPlFOohJYIp7/TtEeeU/z4KFiSgt8gDmtTrbfDoT5LJozB6ZSPIyzO26m ZT1NHCE52LpmI69bPXzB+ciXCZrQ+2CDvgOo+eu6jaeI8fWJvqRAEzXCYMM1mTgYJFgVeV XDQm4A3ho7x9EdRa/MjBFO4D51mhO56X08JMqr3il7NlLLGERjg3GGBBPvaF1QFnzyuK9g MoHUh0fQnxuXCq1kswkQJkHC6n2vl5C2E7fMSLqNaaf+dkluYcSwO8Dds1oSuxxH7/F6S6 IuWvjKmKMeFWmDCDpsDNTDUQizTJcb2SlDb95GkIidOhPHYAyHxKDwYGIbb2yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dc6PR0Gbzz1202 for ; Wed, 24 Dec 2025 22:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8d4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 22:44:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: d673dda5af43 - stable/15 - zfs: merge openzfs/zfs@743334913 (zfs-2.4-release) into stable/15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d673dda5af433b87a7240e4293452d5a464cd3f2 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 22:44:07 +0000 Message-Id: <694c6cb7.8d4d.61827d6@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d673dda5af433b87a7240e4293452d5a464cd3f2 commit d673dda5af433b87a7240e4293452d5a464cd3f2 Merge: 198ef2a31cee 743334913e5a Author: Martin Matuska AuthorDate: 2025-12-24 22:07:15 +0000 Commit: Martin Matuska CommitDate: 2025-12-24 22:24:23 +0000 zfs: merge openzfs/zfs@743334913 (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 Notable upstream pull request merges: #17932 c8ecd63ac zpool: fix special vdev -v -o conflict #17941 74bbdda1e Fix snapshot automount expiry cancellation deadlock #17946 f45622ff4 chksum: run 256K benchmark on demand, preserve chksum_stat_data #17960 a41ef3685 DDT: Reduce global DDT lock scope during writes #17961 2aad3dee2 DDT: Make children writes inherit allocator #17975 2e09f166f FreeBSD: Fix uninitialized variable error #17980 a785ddc5f DDT: Switch to using wmsums for lookup stats #17983 028d66b9d Fix ddtprune causing space leak #18004 e1f0baa54 FreeBSD: Remove HAVE_INLINE_FLSL use #18015 a2f768f61 FreeBSD: Fix a potential null dereference in zfs_freebsd_fsync() (already merged) Obtained from: OpenZFS OpenZFS commit: 743334913e5a5f60baf287bcc6d8a23515b02ac5 OpenZFS tag: zfs-2.4.0 .../.github/workflows/scripts/qemu-4-build-vm.sh | 2 +- .../.github/workflows/scripts/qemu-test-repo-vm.sh | 18 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 52 +++ .../.github/workflows/zfs-qemu-packages.yml | 5 - sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 4 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 23 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.h | 2 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 476 ++++++++++++--------- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 8 +- sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 23 + .../openzfs/config/kernel-kmap-atomic-args.m4 | 2 +- sys/contrib/openzfs/config/kernel.m4 | 2 + .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 77 +--- .../openzfs/include/os/freebsd/spl/sys/taskq.h | 2 +- .../openzfs/include/os/linux/spl/sys/taskq.h | 2 +- sys/contrib/openzfs/include/sys/ddt.h | 18 + sys/contrib/openzfs/include/sys/zfs_context.h | 2 +- sys/contrib/openzfs/lib/libspl/tunables.c | 12 +- sys/contrib/openzfs/lib/libzpool/taskq.c | 4 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- .../openzfs/module/os/freebsd/spl/spl_taskq.c | 13 +- .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 2 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 58 ++- sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 33 +- .../openzfs/module/os/linux/zfs/kasan_compat.c | 48 +++ .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 192 ++++++--- sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 10 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 1 - sys/contrib/openzfs/module/zfs/abd.c | 16 +- sys/contrib/openzfs/module/zfs/ddt.c | 94 +++- sys/contrib/openzfs/module/zfs/dmu_objset.c | 3 +- sys/contrib/openzfs/module/zfs/spa.c | 6 +- sys/contrib/openzfs/module/zfs/zfs_chksum.c | 24 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 3 +- sys/contrib/openzfs/module/zfs/zio.c | 137 ++++-- sys/contrib/openzfs/scripts/commitcheck.sh | 4 +- sys/contrib/openzfs/tests/runfiles/common.run | 5 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 2 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 2 - .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../tests/functional/dedup/dedup_prune_leak.ksh | 86 ++++ .../events/slow_vdev_degraded_sit_out.ksh | 26 +- .../tests/functional/raidz/raidz_001_neg.ksh | 2 +- .../tests/functional/snapshot/snapshot_019_pos.ksh | 82 ++++ sys/contrib/openzfs/udev/zvol_id.c | 2 +- sys/modules/zfs/zfs_config.h | 9 +- 48 files changed, 1100 insertions(+), 506 deletions(-) diff --cc sys/contrib/openzfs/.github/workflows/smatch.yml index 000000000000,ac6454244f93..ac6454244f93 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/smatch.yml +++ b/sys/contrib/openzfs/.github/workflows/smatch.yml diff --cc sys/contrib/openzfs/config/kernel-kasan-enabled.m4 index 000000000000,71b2419995b6..71b2419995b6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-kasan-enabled.m4 +++ b/sys/contrib/openzfs/config/kernel-kasan-enabled.m4 diff --cc sys/contrib/openzfs/module/os/linux/zfs/kasan_compat.c index 000000000000,d0faf5caf9a7..d0faf5caf9a7 mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/kasan_compat.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/kasan_compat.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh index 000000000000,ca281cc3fcda..ca281cc3fcda mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/snapshot/snapshot_019_pos.ksh index 000000000000,c8a1a8a7b571..c8a1a8a7b571 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/snapshot/snapshot_019_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/snapshot/snapshot_019_pos.ksh diff --cc sys/modules/zfs/zfs_config.h index 446c5c1a12cd,000000000000..378b79521702 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,895 -1,0 +1,898 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if getgeo() in block_device_operations takes struct gendisk * as its + first arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_generic_drop() exists */ +/* #undef HAVE_INODE_GENERIC_DROP */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + ++/* kasan_enabled() is GPL-only */ ++/* #undef HAVE_KASAN_ENABLED_GPL_ONLY */ ++ +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* Define if ns_type is accessible through ns_common */ +/* #undef HAVE_NS_COMMON_TYPE */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* Define if set_default_d_op() is available */ +/* #undef HAVE_SET_DEFAULT_D_OP */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* have super_block s_wb_err */ +/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* timer_delete_sync is available */ +/* #undef HAVE_TIMER_DELETE_SYNC */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_VAES 1 +#endif + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migratepage exists */ +/* #undef HAVE_VFS_MIGRATEPAGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +#ifdef __amd64__ +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_VPCLMULQDQ 1 +#endif + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* write_cache_pages() is available */ +/* #undef HAVE_WRITE_CACHE_PAGES */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* Define if host toolchain supports XSAVE */ +#define HAVE_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_XSAVES 1 + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* libunwind is llvm libunwind */ +/* #undef IS_LIBUNWIND_LLVM */ + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ + +/* Defined for legacy compatibility. */ +#define SPL_META_ALIAS ZFS_META_ALIAS + +/* Defined for legacy compatibility. */ +#define SPL_META_RELEASE ZFS_META_RELEASE + +/* Defined for legacy compatibility. */ +#define SPL_META_VERSION ZFS_META_VERSION + +/* pde_data() is PDE_DATA() */ +/* #undef SPL_PDE_DATA */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define SYSTEM_FREEBSD 1 + +/* True if ZFS is to be compiled for a Linux system */ +/* #undef SYSTEM_LINUX */ + +/* Version number of package */ +/* #undef ZFS_DEBUG */ + +/* /dev/zfs minor */ +/* #undef ZFS_DEVICE_MINOR */ + +/* Define the project alias string. */ - #define ZFS_META_ALIAS "zfs-2.4.0-rc4-FreeBSD_g099f69ff5" ++#define ZFS_META_ALIAS "zfs-2.4.0-1-FreeBSD_g743334913" + +/* Define the project author. */ +#define ZFS_META_AUTHOR "OpenZFS" + +/* Define the project release date. */ +/* #undef ZFS_META_DATA */ + +/* Define the maximum compatible kernel version. */ - #define ZFS_META_KVER_MAX "6.17" ++#define ZFS_META_KVER_MAX "6.18" *** 28 LINES SKIPPED *** From nobody Thu Dec 25 18:03:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcc6h0ZG0z6LjQQ for ; Thu, 25 Dec 2025 18:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcc6g6bphz3wvH for ; Thu, 25 Dec 2025 18:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766685788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTOm1kzU54OFQ8PiqLh9jqwcFB2qacAKxOcqQRfwfYg=; b=DvKrN5M9zGkmokDZKUnUpLrkMBFjto2SRY5LKTlubUKrCTu31Lig75n/ohikLxh4r+j/Gp 73svvczmoixNb8T/NfJKly/+L4n7AeDKROnEaRv6kAc/JcUocxEvdKodTjJFhowHxn3mwD 4ORtr/weLBO7KvpRRRtR4oPCnWSVMV52hh8c2DO3bDBNdmriWgtz3AoG4WMOlq5qbxO3c3 EVSrw5bkvMjGPi9Xsk+qm0IKlmvMrTtJGBO7b5K2ZFhUQs7hPubfSCzaJ2Didaids+C17L HD92m1n+W658l26WhpaP8O25c05Hl0lBq8Q+TNT1eAqLr324MTXwm93S6J556g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766685788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTOm1kzU54OFQ8PiqLh9jqwcFB2qacAKxOcqQRfwfYg=; b=FvlSK5KCDDa3NOu/Zx/G/rBLcqLrnShYZePQAQAvAt7yCQdfBZ8I7PbPBmaJi2j5T+QB7P byo/pFP+9Oi3dkSoNz0kDHNTmPFA7hiXRYUE3S059HR5DFe9bbS1p4XjYLkUMhWXx5P1bp sL8qhDR5Hb6HzrFYGl+CqesPBaoPKWRxvC6MpNvOrkiC1dLOjg2VAiPjczmPYGM4HaK/hK ZRYj2wbxbpyBaOb6xNf0Qst6Oq2RPDhNLjVJgxTbjOlfgVrU80BFsp/NUFIvGZqiPPd9km WiwDNXRAd+B6aRD5XPtnxIwNPAMDxX9XvQgZUfICru07tOR/iTs4KFiaKhR/Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766685788; a=rsa-sha256; cv=none; b=b1DseGHXO7mFBeRulJPuwQ47NiGXSVHsCaP0CiNClZFE/NQFuL5QVFWfgDAZzUz3kzkZqi eN4sePqyKLrRMSxz/nD3GLUGrvHIi9vxDt525HWF3h/1VDS/U9awyo5sFkSQhrVgWsXBW/ Uv+k0vJN5WKntjQK8PYLrEP0dm/1EWhszB58yTM0A+h+y3wwQC7Ig5U63g00cjFpoN45KA t1q1NTnjYJH0ohl3V+XUe8h9RyeqPBUR4R9m/l7SZlgio93a6TOHwmkNQlQ2dD3FHuasYn FBPjhKHXXw6Up5t6sYWSmK6cFUaUZEJ+WhSdELhpeF0N0bi6sP5Me7nro6XlZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcc6g68d4zdwW for ; Thu, 25 Dec 2025 18:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24b76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Dec 2025 18:03:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 5629b5cf7993 - main - cuse(3): annotate cuse_init() to suppress thread safety analysis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5629b5cf79934e0b94ddbbd93b7756f74fe4050a Auto-Submitted: auto-generated Date: Thu, 25 Dec 2025 18:03:07 +0000 Message-Id: <694d7c5b.24b76.77787eab@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5629b5cf79934e0b94ddbbd93b7756f74fe4050a commit 5629b5cf79934e0b94ddbbd93b7756f74fe4050a Author: Dimitry Andric AuthorDate: 2025-12-25 18:02:27 +0000 Commit: Dimitry Andric CommitDate: 2025-12-25 18:02:40 +0000 cuse(3): annotate cuse_init() to suppress thread safety analysis This avoids warnings from clang 21, similar to: /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 111 | TAILQ_INIT(&h_cuse); | ^ /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 112 | TAILQ_INIT(&h_cuse_entered); | ^ /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] MFC after: 3 days --- lib/libcuse/cuse_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcuse/cuse_lib.c b/lib/libcuse/cuse_lib.c index 3f040d0eeeda..48c72258106d 100644 --- a/lib/libcuse/cuse_lib.c +++ b/lib/libcuse/cuse_lib.c @@ -93,7 +93,7 @@ static struct cuse_vm_allocation a_cuse[CUSE_ALLOC_UNIT_MAX] pthread_mutex_unlock(&m_cuse) int -cuse_init(void) +cuse_init(void) __no_lock_analysis { pthread_mutexattr_t attr; From nobody Thu Dec 25 20:34:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcgSx4K11z6LtYr for ; Thu, 25 Dec 2025 20:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcgSx28DMz3CjM for ; Thu, 25 Dec 2025 20:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766694849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f22e+TipB0NpccHoh/ue4/46U3xS5vKxScRAOp7mhJk=; b=RGTpibIgCCnJvdEyL4LOffocSR6VqnlJh6e/msXVxDfys69DSUsoiTQHYUuQLP6wb01WXf 2l9ethlTHaK0LcGx2w+FeAnqAihvZpSvJ3f8WXJEuko4NIU6M9bRvjCXLAdaJRNxfWie25 ZQwh0RxbmtlGu2xk/7bpHipwD/yxFWKfUWtY7XyQK8afYUHpKBAH9zGonNkoLYhLo7sCHH 0nG9voQoM0A19SkCg9LK77me7JV3bDIn4ZHzQapqZL8kZyUWTSuRcFtmWqMzVEuq+nCBwM jTswKrcsfWHtWmfwbzLtSoFm5Fk60dKBgpQiunSqvlLo2f6+eOlFCWtuRTpIIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766694849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f22e+TipB0NpccHoh/ue4/46U3xS5vKxScRAOp7mhJk=; b=dQ+mkHQnvFffQm2x/fnNTuFIafB1mHNhVzmhYRdxxaJokaHBIkpMQOAHB3HfomprZMdZZX sGEKk8NfaDi4gC6hWzLjnnLmzEG73xK16olLXCmi2fm6anCJCflJ5TM1L24Dyev3np3Z0o Ysa7eTu+nDnVUcKCEbcSwlBI1yukokv2GGxJWhF68K2AQHBJEyPD+V+Z6Ow3w+A7f8EDZW jtsGH9atMzdi2vojzNX3Ngnor/FEpOKFP8TNe7E6MKV3FNDPGc24uJRbPl/4p+yJs4jJ6i qSJG7NbJNdcsnP28zBfp3Io9mShO0yOBbOi3tcvqGF2ND+TasQS7U1b0TRjbJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766694849; a=rsa-sha256; cv=none; b=wF/Q4D9oTjytchLCWvSH+ELECb0Wgp61r/FImVnG0xZDU4nu22AssBvZAIoGx7mgzzfUb7 rNVbqZYh+LFZ15NQFV6Vs5ScFGv1zCUAQ50FVSBSqm8MWcSnngPEJqPbifBIB7PY96yst1 sCHNLNutqvjMWOys3FjcYHsBFgyW/eyQfU31uZ6+FICS/o83FAoOBu+05QzOcv4+Y3JVvu eFtXYjOQ9MnI1eczhn+q7sYyvxToHDah6xk1UxxCcfrILmnFgQwjzdxTaqiRzqjQG1IUIj CUQ/UTQLjK3v5FjS1gfAR7OIj0EVqhiKthWO+jnm2geSCOIG9JfKjwml26QYWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcgSx1WGJzjvC for ; Thu, 25 Dec 2025 20:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b532 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Dec 2025 20:34:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 98c3d868fb5a - main - fsck_msdosfs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98c3d868fb5a7da7356c58e8c51423975bbd078b Auto-Submitted: auto-generated Date: Thu, 25 Dec 2025 20:34:09 +0000 Message-Id: <694d9fc1.3b532.1e5eed17@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=98c3d868fb5a7da7356c58e8c51423975bbd078b commit 98c3d868fb5a7da7356c58e8c51423975bbd078b Author: Dimitry Andric AuthorDate: 2025-12-25 20:28:14 +0000 Commit: Dimitry Andric CommitDate: 2025-12-25 20:34:00 +0000 fsck_msdosfs: avoid warnings about too-long initializer strings Mark `dot_name` and `dotdot_name` as as `__non_string`, to avoid warnings from clang 21 similar to: sbin/fsck_msdosfs/dir.c:466:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 466 | static const u_char dot_name[11] = ". "; | ^~~~~~~~~~~~~ sbin/fsck_msdosfs/dir.c:467:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 467 | static const u_char dotdot_name[11] = ".. "; | ^~~~~~~~~~~~~ MFC after: 3 days --- sbin/fsck_msdosfs/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 19516d882e2a..2d7e4bcdc38f 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -463,8 +463,8 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) return FSOK; } -static const u_char dot_name[11] = ". "; -static const u_char dotdot_name[11] = ".. "; +static const u_char dot_name[11] __nonstring = ". "; +static const u_char dotdot_name[11] __nonstring = ".. "; /* * Basic sanity check if the subdirectory have good '.' and '..' entries, From nobody Thu Dec 25 20:44:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcgjF6mwCz6Lv3c for ; Thu, 25 Dec 2025 20:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcgjF4lKlz3Dr2 for ; Thu, 25 Dec 2025 20:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766695489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cI93+RFKoi0edYjSGZVHKdR2tjua4/FEvt35EiTf4RA=; b=xk8ZRVJE0UDLnLfllysPHulb+QA2sHRAjrbJAk01UXOD0M8V+8ZprrwrOIldW/DdJLygZN QyodocnyNzlFKdWX+bcKQc6U0PR0mbaUaqatBq1qc6j4tnTOO33SM75/0ddpoGUaYhLyus cbYMhntV7myHO2yDR7gP+0uNVvoegMXIa4bOFNj6Cll4W0FqzGPkJQAwQQYJkr6xb2A3fa 7XgM0pND3cUeEJb1hp/XK3BR7Ln4qlUb5nNNFivMHWQ43ViNEeZiU8Mv82dfTp5ozkqURO 78Sl4w/c2WgdBew6ZAm/+hEWNlNMNfapGlW5fEY5M5qu1zc53vQmvIXJhCcHcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766695489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cI93+RFKoi0edYjSGZVHKdR2tjua4/FEvt35EiTf4RA=; b=RJxPva2GN/TdIoNkNi2q8GU5+STj7nw+GIbAaVkNDtdPoqk0Pa2ov6lvSUADZHZSYGVigF 5Pb87X8YN0WMDmp2xyxu1rWwmmEqzfeqUoo89NhBc+q0+X7YLKSf5Voc4MgelxP56CPh2I Xj9/7vtFd+cY0snOf7r2qbwgwMNLGl8oKPqtBPDhi3TNy4zhci85Mvkplctfqo+sCO3pP2 y0TIIanpDaRCGpbNTvp/DqmgRFCHWPyemHXEVeLA8MRV8cj+LF9xIDj8AhrKFqgDwdoCJ6 8YwtreoaHt0O4FoUdynnoB9D699aZI4trtiBGbwS862hoVcVCN0WozRKIiuDvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766695489; a=rsa-sha256; cv=none; b=LtlD6a3fj3zUoZzHfVwwFwYbVz93Fde+oIUXNeYE+calwnsKArIDmNbJPT30hTD0vWe9gu ui8GtuW60GkBlc7/5wXdqaeWPuHsbJyhklClhImY315zp91jSI/65S8BDsfyGu5nHHae4Z 6xRsmr5leLiKtMtlvSe9zvSPIn6erKbljuSFW+wtyIqSU6einxPCSlcJlldFEVw5SePI3v tg7LwTWR+P6WWmabDytoiY17k7zLrXBlgifz3LA7VbAE6KYua4R0lUrAhsP8KAUtic7g7T X0TWUVKbonBylPMyEdclkAGHIwJPHfPbxMhzzm/XDo7a2KRPKNZKc560iER10A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcgjF40Vczk9T for ; Thu, 25 Dec 2025 20:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bb7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Dec 2025 20:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: ecb58f931d45 - main - kyua: Fix prompt of "debug -p" command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecb58f931d45d6fe4e8b60a172415cc387657a6b Auto-Submitted: auto-generated Date: Thu, 25 Dec 2025 20:44:49 +0000 Message-Id: <694da241.3bb7a.5852e2a3@gitrepo.freebsd.org> The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=ecb58f931d45d6fe4e8b60a172415cc387657a6b commit ecb58f931d45d6fe4e8b60a172415cc387657a6b Author: Igor Ostapenko AuthorDate: 2025-12-25 20:41:22 +0000 Commit: Igor Ostapenko CommitDate: 2025-12-25 20:41:22 +0000 kyua: Fix prompt of "debug -p" command --- contrib/kyua/cli/cmd_debug.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/kyua/cli/cmd_debug.cpp b/contrib/kyua/cli/cmd_debug.cpp index c00920c1a3f7..700c4b3ea851 100644 --- a/contrib/kyua/cli/cmd_debug.cpp +++ b/contrib/kyua/cli/cmd_debug.cpp @@ -91,14 +91,14 @@ public: _ui->out("The test failed and paused right before its cleanup " "routine."); _ui->out(F("Test work dir: %s") % eh.work_directory().str()); - _ui->out("Press any key to continue..."); + _ui->out("Press to continue..."); (void) std::cin.get(); } } else if (_cmdline.has_option(pause_before_cleanup_option .long_name())) { _ui->out("The test paused right before its cleanup routine."); _ui->out(F("Test work dir: %s") % eh.work_directory().str()); - _ui->out("Press any key to continue..."); + _ui->out("Press to continue..."); (void) std::cin.get(); } }; From nobody Thu Dec 25 23:55:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dclx02GxRz6M76x for ; Thu, 25 Dec 2025 23:55:16 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dclx001Skz3Ty0 for ; Thu, 25 Dec 2025 23:55:16 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766706916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=18zn+d8rRgWxfEW/71iJ/CTx4SoSnFNzRaxxTc5n96k=; b=cAaHQl9KDT6ZmmV5PbJYnCYFaQKVKHWrNB4An9ov6uB0GJ3Cx2Z6gDPMm0dcYkh8YO+JtK LIzFA3rj3Qyhm8jZwJO1XvRdvTculwDUSQr3/UzVAr6hgLnejF34jxRhlXYOY3/kBr8ECC /cX0Opn8jcu9kNkW84CnoW2k3oX02Z86YsbMms38HDguLzANFefU2dpJAWqjMlGQeK3iYS BoY1vSX4nC+0w0XkN10ty8FQInPW3Dtq2IOWXnzIzfaDkursdolrNMs8BRmtJyJDgQIHrS i9fJjBey11FLwAKDNH2M7TwBzr/qorTiGT4eP6bbDL67jVSALIySh3TjWx7UvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766706916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=18zn+d8rRgWxfEW/71iJ/CTx4SoSnFNzRaxxTc5n96k=; b=cCjOLAAA7CwtADLxVGCj0WXbFoJ1x6iCqNK70N/QSKbEYNxqrnmHWfFRYw/+VOhjPBjKAe QO/Tjhb9N+5+InZUJldI4djHwUYqNST4e3XsglO5yUq7LlbHVUZ+ym+fKrj1JWL/VBg+oJ DMqXqT7e3mYiebU2b2j9eV3Qkk7+m16x+0Zu/0z/HoNV7v0cwBJdeadKjix6ZSNvXdpBuT A6ILEVD2WLg3hvyUD/VFumJIDM0Vi02tyJbz9H+cq73c1/pC0mnV51IhrDCEKzTZQ/Jdl4 VA1pfs6R86Ij+JAh4FJOBV+bhCgGTWQi333wZgkyEplEtEEl0kUrJO/CLhGLaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766706916; a=rsa-sha256; cv=none; b=d+rPlVTDefwAJtxtxm+xXsAxq5gPZL9ldbJMkjsWAmpQi36DLYXkqC+FwVVa61QjQXssIH W9g/uLKFmiosIapwAtt/weqJJavQryy0pQ6qJTIuiM/HKdXkittzitI+Tl7uSXyoWtJInp UoVjVzIOrijV8v1N61diWXQE5jnPAuR+vU7vfe56CC1ug/uHbuWLiAQb6QUoHBkQWMPc5v cYwEMjSP96ko6Fq40EIqKNTNjyIvJOF/x79T7I1VtzCTQXwvpRKv1JtvkIL1MKS7Q6MbGQ kKK+mfe0W90kkTsGtCB6+OthYSnYHxEEcyUvs+gycbRTd2ewELnUNUaapGyg6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dclwz3xK2zwjr for ; Thu, 25 Dec 2025 23:55:15 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-8c168a9c132so63196785a.0 for ; Thu, 25 Dec 2025 15:55:15 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWhbsOOqRLHxPn3GrHI/ZsCoFnDj8fairZ3W+7553NvSe3P0sgFYJYoAUzSI3g/9OtzXslo0SVICMQUfMAIxV0lv2fH@freebsd.org X-Gm-Message-State: AOJu0YwAmNK0yDVc2eN7fuFEpTz8/sN2w7lLme1KmsoZ7anW23f8rg3Y eOkJ6t2D1ttDqMSYjTmH/kplcI8VAoAlEELWD9L6355N75YUf/CuzNReWwyPAoMzFss8gpmEVm6 CUKsa0vX/ZFK0iiGC+n+PX+KHfsQKDho= X-Google-Smtp-Source: AGHT+IFg/3est3YZPxKMFOtxRe4kHJo0cmy6GAwzMSJtes6ALsyGP9XqOjKjwsORl1Pk6Glc3R2EWDPzcd0Mbl3wVAE= X-Received: by 2002:a05:6214:21eb:b0:888:2032:4ad2 with SMTP id 6a1803df08f44-88d84b20362mr254090526d6.8.1766706914823; Thu, 25 Dec 2025 15:55:14 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> In-Reply-To: From: Nuno Teixeira Date: Thu, 25 Dec 2025 23:55:03 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2p1Vl8XmFLdUse5fMR03H3eN1pdoWROojOQBhH7xyfEDKPoVLenXGQGro4 Message-ID: Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000001491c80646cf82cc" --0000000000001491c80646cf82cc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable [At main ecb58f931d45d6] After rebuilding system from scratch and install world successfully, upgrading poudriere jail from same src failed (also did install a fresh jail with same error): # poudriere jail -u -j 16amd64 or # poudriere jail -d -j 16amd64 # poudriere jail -c -j 16amd64 -m src=3D/usr/src and # make -DBATCH_DELETE_OLD_FILES delete-old delete-old-libs # poudriere jail -c -j 16amd64 -m src=3D/usr/src ``` =3D=3D=3D> lib/clang/libllvm (install) install: libprivatellvm.so.19: No such file or directory --- _libinstall --- *** [_libinstall] Error code 71 make[6]: stopped making "install" in /usr/src/lib/clang/libllvm make[6]: 1 error make[6]: stopped making "install" in /usr/src/lib/clang/libllvm --- realinstall_subdir_lib/clang/libllvm --- make[5]: stopped making "install" in /usr/src/lib/clang --- realinstall_subdir_lib/clang --- make[4]: stopped making "install" in /usr/src/lib --- realinstall_subdir_lib --- make[3]: stopped making "install" in /usr/src --- reinstall --- make[2]: stopped making "reinstall" in /usr/src 14.21 real 11.03 user 10.58 sys --- installworld --- *** [installworld] Error code 2 make[1]: stopped making "installworld" in /usr/src make[1]: 1 error make[1]: stopped making "installworld" in /usr/src --- installworld --- make: stopped making "installworld" in /usr/src [00:01:32] Error: /usr/local/share/poudriere/jail.sh:installworld:12:Failed to 'make installworld' ``` I will rebuild same word without WITH_LLVM_LINK_STATIC_LIBRARIES and see how it goes. Thanks, Nuno Teixeira escreveu (quarta, 24/12/2025 =C3=A0(s) 18:45): > Hello Dimitry, > > Just a quick question about users that run current with speed in their > minds, > should WITH_LLVM_LINK_STATIC_LIBRARIES be added to /etc/src.conf too? > > WITH_MALLOC_PRODUCTION=3Dyes > WITHOUT_LLVM_ASSERTIONS=3Dyes > WITHOUT_PTHREADS_ASSERTIONS=3Dyes > WITHOUT_ASSERT_DEBUG=3Dyes > > Thanks! > > Dimitry Andric escreveu (ter=C3=A7a, 23/12/2025 =C3=A0(= s) 21:04): > >> The branch main has been updated by dim: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D8d5a11cd0137d3ad70f6b06e063ea9= 1a776d510a >> >> commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a >> Author: Dimitry Andric >> AuthorDate: 2025-06-18 10:06:25 +0000 >> Commit: Dimitry Andric >> CommitDate: 2025-12-23 21:01:40 +0000 >> >> src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob > > > > -- > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --0000000000001491c80646cf82cc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
[At main=C2=A0ecb58f931d45d6]

After rebuilding system from scratch and install worl= d successfully, upgrading poudriere jail from same src failed (also did ins= tall a fresh jail with same error):

# poudriere jail -u -j 16a= md64
or
# poudriere jail -d -j 16amd64
# poudrie= re jail -c -j 16amd64 -m src=3D/usr/src
and
# make -DBATCH_DEL= ETE_OLD_FILES delete-old delete-old-libs
#=C2=A0poudriere jail -c= -j 16amd64 -m src=3D/usr/src

```
<snip>
= =3D=3D=3D> lib/clang/libllvm (install)
install: libprivatellvm.so.19:= No such file or directory
--- _libinstall ---
*** [_libinstall] Erro= r code 71

make[6]: stopped making "install" in /usr/src/li= b/clang/libllvm
make[6]: 1 error

make[6]: stopped making "in= stall" in /usr/src/lib/clang/libllvm
--- realinstall_subdir_lib/cla= ng/libllvm ---

make[5]: stopped making "install" in /usr/s= rc/lib/clang
--- realinstall_subdir_lib/clang ---

make[4]: stoppe= d making "install" in /usr/src/lib
--- realinstall_subdir_lib = ---

make[3]: stopped making "install" in /usr/src
--- r= einstall ---

make[2]: stopped making "reinstall" in /usr/s= rc
=C2=A0 =C2=A0 =C2=A0 =C2=A014.21 real =C2=A0 =C2=A0 =C2=A0 =C2=A011.0= 3 user =C2=A0 =C2=A0 =C2=A0 =C2=A010.58 sys
--- installworld ---
*** = [installworld] Error code 2

make[1]: stopped making "installwor= ld" in /usr/src
make[1]: 1 error

make[1]: stopped making &qu= ot;installworld" in /usr/src
--- installworld ---

make: stop= ped making "installworld" in /usr/src
[00:01:32] Error: /usr/l= ocal/share/poudriere/jail.sh:installworld:12:Failed to 'make installwor= ld'
```

I will rebuild same word without=C2= =A0WITH_LLVM_LINK_STATIC_LIBRARIES and see how it goes.

Thanks,

Nuno Teixeira &= lt;eduardo@freebsd.org> escre= veu (quarta, 24/12/2025 =C3=A0(s) 18:45):
Hello Dimitry,
Just a quick question about users that run current with speed = in their minds,
should WITH_LLVM_LINK_STATIC_LIBRARIES be added to= =C2=A0/etc/src.conf too?

WITH_MALLOC_PRODUCTION= =3Dyes
WITHOUT_LLVM_ASSERTIONS=3Dyes
WITHOUT_PTHREADS_ASSERTIONS=3Dye= s
WITHOUT_ASSERT_DEBUG=3Dyes

Thanks!

Dimitry Andric <= ;dim@freebsd.org&g= t; escreveu (ter=C3=A7a, 23/12/2025 =C3=A0(s) 21:04):
The branch main has been updated by d= im:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D8d5a11cd0137d3ad70f6b06e063ea91a776d510a
commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a
Author:=C2=A0 =C2=A0 =C2=A0Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-06-18 10:06:25 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2025-12-23 21:01:40 +0000

=C2=A0 =C2=A0 src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob

=C2=A0=C2=A0 =C2=A0
--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org


--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--0000000000001491c80646cf82cc-- From nobody Fri Dec 26 00:22:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcmXW46Bcz6M8XT for ; Fri, 26 Dec 2025 00:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcmXW0bjdz3Z1J for ; Fri, 26 Dec 2025 00:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766708555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JajbeeZU0Oz1mF3URFHH6Ju7WCKogMnRgK/8CQBiPSU=; b=qck/YLnDu2K4OiC5vA2iSbWxk8tVVB/N+k4zUPoTXF+t//ZDYZfAD+woh94Qe7yro3QKv3 5aOqlH7neBoUkd/1ev6TTq4LD0jzODgEZMu/dx9hlhAADtGZ9ZLdayG+YdqKLEJ2wAt0RO twDjV6y7cWhPzT7g4T1D6rKt5ok3AbebaMAJuYl5nmO87T7EVbUJIqdWUgnnMyKwpjfmFP hoWxdbupHgBdTGaz/+wXIFmXwQ11JMSe2TBUx3aeacwGOOmMXsow7SwfbNhXftT5LrR0y8 72YEKp0xUazIQlhekR0pt17DxNV1X5qjBZv3qRyprgXCF8KxosFle4bxct9EyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766708555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JajbeeZU0Oz1mF3URFHH6Ju7WCKogMnRgK/8CQBiPSU=; b=I98+gwEN68mvRHChUc1eorx33CVK5sRhdEhPTVwJsx1xnH0TlksRqv/KzZjeQoax3nB7Ww FAwiX+gGqdlx1m4gaxK5yEyMUvcGyng0ufmHkeHzMiG4qfBj17FGXJ1yWnaQVsrI06KZXS 7J37PQZ4hrJWOFsNjJsVKcXTXFYTidgm0RqMS2IiRAVblVwG09taZyAbVyfH2jt6OEqAv3 wrdtHC+Yxp4oKrgvx33zZrN6hWaB9hgoB7ZnE8scgv7pkThDNbJVlzVH2FV+TBj7/8wE9u RdkpqbXCIszr9SZWCXh8n0kupzcjklURTop/DrB74A0e84DTge77jBBJjke4zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766708555; a=rsa-sha256; cv=none; b=ZiEZFuyMl5VBFnB9OFgschRfo7D8FQoJYevyp8Oxz0jGTSZjcjB+Epk+J0WJqZ3ztmoA9I /U76b+xw8eo0WVPpolTZDB+Lt9Rg3A8I6uij2aU+R8ewgnQFZ4pIET3ZOEldAu4+PVQT+j G6qedBjnvObT4fGw0XgQKVeoelJtytkrtbTZr4GNu9038QSwn0IVEddPg0Dj5na7ZxxQp1 7QPt06pyyyIEeU5iNLja9tf5oodJ2m8f7O/7hVEs+f6RKa7a60kANeN43sxILiTYuYSuTh VUsN3kyMhX3MO/r5xLrpyeC9BqLukOg7DdVB2NgUhgoc5lRMhc3C6H0gmkPmkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcmXW0CBdzrDX for ; Fri, 26 Dec 2025 00:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3306a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 00:22:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ba0a11512237 - main - makefs: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba0a11512237681fc621670023d56195cb8c82ad Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 00:22:35 +0000 Message-Id: <694dd54b.3306a.451e7252@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ba0a11512237681fc621670023d56195cb8c82ad commit ba0a11512237681fc621670023d56195cb8c82ad Author: Dimitry Andric AuthorDate: 2025-12-26 00:22:03 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 00:22:18 +0000 makefs: avoid warnings about too-long initializer strings Mark `direntry::deName` as `__non_string`, to avoid warnings from clang 21 similar to: usr.sbin/makefs/msdos/msdosfs_vnops.c:512:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 512 | { ". ", /* the . entry */ | ^~~~~~~~~~~~~ usr.sbin/makefs/msdos/msdosfs_vnops.c:522:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 522 | { ".. ", /* the .. entry */ | ^~~~~~~~~~~~~ MFC after: 3 days --- usr.sbin/makefs/msdos/direntry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h index 9d6c65dfcc7d..675a70e26474 100644 --- a/usr.sbin/makefs/msdos/direntry.h +++ b/usr.sbin/makefs/msdos/direntry.h @@ -55,7 +55,7 @@ * Structure of a dos directory entry. */ struct direntry { - uint8_t deName[11]; /* filename, blank filled */ + uint8_t deName[11] __nonstring; /* filename, blank filled */ #define SLOT_EMPTY 0x00 /* slot has never been used */ #define SLOT_E5 0x05 /* the real value is 0xe5 */ #define SLOT_DELETED 0xe5 /* file in this slot deleted */ From nobody Fri Dec 26 00:30:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcmjx314Cz6M909 for ; Fri, 26 Dec 2025 00:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcmjx26dfz3ZL9 for ; Fri, 26 Dec 2025 00:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766709045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kyqz1ICUlH8Y5+9DkvfxxOP8+WGaMQEg5vgQQ0+B5Qo=; b=NTImhYvFJtc4X7Vgq8VTZ2COFAW5k9IqX4/d39g+flaZUF7hGAYmloTfPY8Piff45vw5LX tT3FHZDYnWNe2IGjaQci0GmuaB8Tw5ciZ6E2aNu9uDbAjOnrwqbfYgcyq7Eex04OxhcvAv NERvueIdoCvU3bUKAjHsWDf6k6pQJnjo+U6G/A2fo7piJuVdkIJSxpNrQF++Mfg2yFih6l EJyhHEA97AxktmDt3+c0AbsjbHPXvPOI5tj2OhtVWNZj/pwzpZMjWhI1Ruc1zgFq1BBosR BNIiNP15sdQzof9siFOsOZJvCuG+Hffv1LOznOJIVaQdXqvH0vOTgwfmQyE72Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766709045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kyqz1ICUlH8Y5+9DkvfxxOP8+WGaMQEg5vgQQ0+B5Qo=; b=tjZ+aumw18sD3oaInooWgF4lmUN/Bt65g93Tyj6FcfFJr4kxGpwgysxjeUBjmTTuKLqJuS 6Htbiqh7CPtkuASEDvi3W5nSzffHeJfI+elANOjBWLjxO7e9DtfqPhcA19RD7uXNjS8o5I rs/CeAejoWYJrKRCCkMSFcjohlWKjbokBXcTgq2QAAdEc86BiXR2t841DaCZJKD7ePthaT mrw48iQGscmW2NC1LwBAsBnqljO7/K4GRhm8pW/G8m26jEV+wJ+gAvLYUlI7dP/RJ/szot e+6joz33KJRwAQhY2uWHhHcqvlvYd3ENAGUIhHmJOaHqH36ZA5kUER67XdS5NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766709045; a=rsa-sha256; cv=none; b=uCkj1B7XK6NCxDQO7m8VEsT66SgNZMQRATJdLMMPRzk7T31XNbJLNqVGw4PWRx2N/zFPID zjNf3EQFQP1FdnlpNSe7kGXls7J7FFI0rEDXFrmSStHYRPA9IvClsIGaFh4HxcEeKZ/D9q 1GvvQ9U9Mul8Kn9CWjYKgm+OsCnXi41okDymUcINEF845NFznRIu0Cd5ldqoHzojXWKvQf MVsBFVcF04S3i9i4VKL5pBVjhM8Ci6cadh2t/7hALoXDe48+ZIMDkEWITo4SWCqFhkqJV4 fN7qa81rHp6Hty7at3s0dtEfftkX3VLTL/X3B3tnZ2v+Qu2pa7UbYgYckQz0+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcmjx1TYdzqW5 for ; Fri, 26 Dec 2025 00:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 00:30:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a3394b6a23fb - main - m4: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3394b6a23fb66ccb7e588129d2465ef8ea26d30 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 00:30:45 +0000 Message-Id: <694dd735.33f57.28621139@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a3394b6a23fb66ccb7e588129d2465ef8ea26d30 commit a3394b6a23fb66ccb7e588129d2465ef8ea26d30 Author: Dimitry Andric AuthorDate: 2025-12-26 00:30:25 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 00:30:36 +0000 m4: avoid warnings about too-long initializer strings Mark `digits` as `__non_string`, to avoid warnings from clang 21 similar to: usr.bin/m4/misc.c:123:27: error: initializer-string for character array is too long, array size is 36 but initializer has size 37 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 123 | static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MFC after: 3 days --- usr.bin/m4/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 1870323ccb30..3091f2ad1f9e 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -120,7 +120,8 @@ pbnum(int n) void pbnumbase(int n, int base, int d) { - static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static char digits[36] __nonstring = + "0123456789abcdefghijklmnopqrstuvwxyz"; unsigned int num; int printed = 0; From nobody Fri Dec 26 00:57:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcnJc62dbz6MBj1; Fri, 26 Dec 2025 00:57:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcnJc5Hpbz3cgF; Fri, 26 Dec 2025 00:57:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766710640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dy3ZA4CiqilBU0j9QIN23xINIHTrJb3gVzy4ljjicKc=; b=ABUW/r9+jvQpOEBFHlfgGBNQKpYYMf9LNM7KzvrkMm4v1cmNmQwuIpNN7aGG4Zuhcj9esD omWcpJNhpIEDGyV2GTXmK5vxVMHt6kahiM/yq2Tf3XXvcnI21vHylAR+11gEBvYRGT/vk9 pg8ePCrVDwUi/3s/WsWHYrUA4mn/WBhIbfo0i96jdzTLJZqh4yFoMXts1OeRyFmdjPNcGv 0S6XV6SlE5zke4MzykvO5mb4cQzL+vI9PQE0cULaLeuy1qItjyOSJy3TWrdwVgJn0GXkS8 X1/7u94ojYW/F0FjdZHV+3SDfEAEkdWMH8/U0j2tCBvxG6EN5u+z/LECVyr/Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766710640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dy3ZA4CiqilBU0j9QIN23xINIHTrJb3gVzy4ljjicKc=; b=OIckVHhU98+z5qoDvS+8Ino8VCRKL3VaTSoGkliGE9a5jicftD8SzAnHfBKp+FpLnUOaU2 fbEnBLmLlRK83NxdebJQgfN7bdkPSVP/sZantc/43F4oRAd5+0p0Wd25eGJkCuFLLPYsao rQZp3VSKLyT+mixEAPJXgp/4xdRNc3PWjeVdadp3Q/1OiHRz78DYPJoDQjh+ZpQ8sMHJEQ VGWryl/iW4SZlHG/mveUteJqL6mOZ1qEBxHtuXz1dTzH6OFhDZE40NXgj5jkqB6FCjGyZg xCTRCyNqTb55hxfu2V3vCRcpmTrUNSUTkIXvlJLm8km0AtKDsOMoMqxsPZ3mTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766710640; a=rsa-sha256; cv=none; b=dlRCHV7AhbJ/f8g6m3VGv6fmsqh6XFHmQkssxDB3SEtPi2OBvJROY3ULwhOy0fLBm56X0O +PKYBLGsiSB+1TUz7jrta/LgexNojXDZEC6VxirxPn6A/0NLyAa5rkyx2nDh/pjM14+b75 nbjJplha8GIAGGOhc94/R5KCT9hI4KZfIJNZyPHV9+AhPBLiKKWRD3cmIDp7NHA7jKHd5g mX1nUz5Xy4J7wYvHPJG621bB+VIYc+pLzSF+uHPwBtwbjUrzKJLKJx6KyNuagm5Yre9NVT B3v1bX/1PkNYdsFCC8wvXQO9BkWNIEXyFy8yyLR2toubYISdbAPmuGkt+D+HDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dcnJc3t16zyDt; Fri, 26 Dec 2025 00:57:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 1A64B50719; Fri, 26 Dec 2025 01:57:19 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob From: Dimitry Andric In-Reply-To: Date: Fri, 26 Dec 2025 01:57:18 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <17FDDAAA-D518-41FE-8BDE-D8435008A99E@FreeBSD.org> References: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> To: Nuno Teixeira X-Mailer: Apple Mail (2.3826.700.81.1.4) On 26 Dec 2025, at 00:55, Nuno Teixeira wrote: >=20 > [At main ecb58f931d45d6] >=20 > After rebuilding system from scratch and install world successfully, = upgrading poudriere jail from same src failed (also did install a fresh = jail with same error): >=20 > # poudriere jail -u -j 16amd64 > or > # poudriere jail -d -j 16amd64 > # poudriere jail -c -j 16amd64 -m src=3D/usr/src > and > # make -DBATCH_DELETE_OLD_FILES delete-old delete-old-libs > # poudriere jail -c -j 16amd64 -m src=3D/usr/src >=20 > ``` > > =3D=3D=3D> lib/clang/libllvm (install) > install: libprivatellvm.so.19: No such file or directory > --- _libinstall --- > *** [_libinstall] Error code 71 You have to use the same options for installworld as for buildworld. I'm = unsure who you can tell poudriere with -m src=3D/usr/src where it gets = the options from. I would expect it respect src.conf? -Dimitry From nobody Fri Dec 26 07:38:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcyCV34cpz6L8Kh for ; Fri, 26 Dec 2025 07:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcyCV2Pmdz47s5 for ; Fri, 26 Dec 2025 07:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766734710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Hx1NRnABLUgtEb+fS9zM6eO1FQ8hq/XCGZnxjZNUF8=; b=JVO4saOzPzBAntJd5sxA+rzkkI3cR51H7e+9DWjb3UKJPjDeJbw6LA4biyXliVIX28caIX ySEgwEYRVFBnzBfxaKEVt7z1uTltmZ5ltDLINg3X80ADgv6LjClQvTSdSDLbOIBbOvvPwo vdFIEI8xiqomXHeI0YGmzZja20pD43wGTwRCo71hfXk3YhVcfdvfx0KW1qa6K69u/czYfW Xd5ZqiiImlyM9mVRmnsFYiaK3+iCNGjkC0R1UjQAb0il4VBGafJ3b1yIuWqV/DOKcNWxIl hhqknegL90YhTA4nWzSXVk+NrmvPDFa/uRG5upkkGySSOe7ejrdEqW/kp5IH4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766734710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Hx1NRnABLUgtEb+fS9zM6eO1FQ8hq/XCGZnxjZNUF8=; b=ICtwB2SSsMM0Yc78unrs2cjpetQCSqplR1yKI3OidILtDlNldKO/0IOBEAHM29Qql2r2B2 vwDWdWodOxnjtBh5BHJtjpjCcsfZDTNU5VgiXq5c1h7dUO1wGho6ij0+1FE5GD7UdqE1NG 6MP0rnzpPAPjaxJQaLy/CCSohF2WmfY0FVsHpq5t9zmaFEuNM9UHsBLkB+62XT9qhu4C98 y9RqaLeEZcLYYkETsFaxr1yDrZ2w91KCoc8TUqSzoEoiOerNDlxiiLZJftKZvYg8zOTYro cq67ylU2yiHx5DIUn8xTuSmlDZ8zB1OLzHFvlzDTngahlmViLdXFwezQAfUqfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766734710; a=rsa-sha256; cv=none; b=oEqBBE2wCNSa07DhX+9JrcBuDETA025Xv8/kqMZXKLOKMN13ze3wKtxho6URyrMVCBmCJj tapy0vzcxGK9qS98x12SfRDihqpsbUfxxFs6N366qFF/fwPhaKmfyV8jSPd8La6CGGzPhO Nptu6oNCiWShEMxBeXEb+UqnNfPJMRydqpkKEPHlJhtVHwcEmMUvbPnC/CSuViwffMejy6 psVKuhqBMRBW8wKSCWI0GE2FNQXd/CKFmTnZmOZkaZD5Dv9IpIaqOrxR/N2zSnVOmRRQ5v RlA3PndcMnb1fkHJrpUR+WTpfSFQUE1+6Q0S95wpjlZQSc+uzqjORAlcnizk3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcyCV1wkHz12vW for ; Fri, 26 Dec 2025 07:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35269 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 07:38:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jason A. Harmening Subject: git: 04190ace7461 - stable/15 - vnode_if.src: fix function name in locking annotation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 04190ace7461612e3d718984bb5dc4ead5d8ae9b Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 07:38:30 +0000 Message-Id: <694e3b76.35269.42cb3227@gitrepo.freebsd.org> The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=04190ace7461612e3d718984bb5dc4ead5d8ae9b commit 04190ace7461612e3d718984bb5dc4ead5d8ae9b Author: Jason A. Harmening AuthorDate: 2025-11-28 07:34:47 +0000 Commit: Jason A. Harmening CommitDate: 2025-12-26 06:32:47 +0000 vnode_if.src: fix function name in locking annotation getwritevnode->getlowvnode Reviewed by: kib, olce Tested by: pho Differential Revision: https://reviews.freebsd.org/D53988 (cherry picked from commit 38d60d453caad0f7377946d69d05d9421323f23f) --- sys/kern/vnode_if.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 2e63215b2f97..3faefb607f24 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -469,7 +469,7 @@ vop_getwritemount { OUT struct mount **mpp; }; -%% getwritevnode vp = = = +%% getlowvnode vp = = = vop_getlowvnode { IN struct vnode *vp; From nobody Fri Dec 26 07:38:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcyCW59b7z6L8H5 for ; Fri, 26 Dec 2025 07:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcyCW36Wbz47mg for ; Fri, 26 Dec 2025 07:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766734711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYNYPVCA2evFqUEmrh7jOgXWqmD9iKR8BgYCHnCp2UQ=; b=WNWatssPtj/NAWCtQttOjWDwQgCD9hDIKauOe2FrCKl/dFgXWjGF5G3tpgm48VxaLeRgXY QuwIxVXE01UMJTQmFWshMLUMh1ofwqyEhsSzB1g2wXjkKHj/8zIFO38QYXfpbgS53egHmp NWCpwPagS2N4SogQHFd5/ipcWeNIPZ8DbiyoLdOkFQopciIgVR0IFNPQziDdrxJ9Cl+Rgq wZF5slqSDc2oDAsPnTduNrvcSub98cokqh4Xg339R66+DrAs1U2BU6gFdI0zkbEuZxFQb3 pXMcbsu52re5jk8wjwd5NNCgm6BFHGZ+Xbd0B2pPTdZS/IRbafN1CctgDEK4Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766734711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYNYPVCA2evFqUEmrh7jOgXWqmD9iKR8BgYCHnCp2UQ=; b=hJKrMQRF8fyRT35j4U5KYRJwk+a4yyCtYwsWMBT1NkP2kWZsL62WLW4jbOegphyX+162wQ oR/dyOSD5FjspNoHP7UCqjNIfCSH8zl1VaM81Ue4HMQZSjDC1mA3t2t8dzn1sUDLDpbVpE nMDyrZiVTpGa/on1mnkZSWoQfq0OdtB5hBfx6VJfx2nk/5pRUqNa2YDPnMBYpSVBSCa3nW EUUdCs5ne8jo1/QfOdP5gMRQ4DWo10rM0FBmGpUSYbKPffNCDJqMVzvSiLTgwQV8CvLWAn +noeaZjdhvphoZ1HGrwtC5pkgyOhAcE4WxK8j6WLSnHiNrGVBMVvJmoTcHo7bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766734711; a=rsa-sha256; cv=none; b=yEU3ADp4vX8J5l38AzYuUF/9Fq7B38utC8GRw98PRmOwq/fv4hiECMrY0NJe2KCGx4jBoH 4im7YE5mwZ+C7EYXGy2/Np/K1KHnVmBVMm63q9XezvGEVYIb8C1sdBEqetCzUlxnwIBAuB HqStA3WWSVJIO14YS5IRBLSAL1RF2UxnpApYIvW4mDP5fgJFCt+9Mrp8TanlJRRInEd6Wy yDIEdmk8Jfar4XZcu3zgJbOP1yWTrPSCxZJho5qty2wE8EdTTrxSpn1guHhqJNPp3XJDpV LYg+gOAPJtgVPaBlRmH4r0c/3UvaCibycVZp9SNwO3Y4nKRLPoLwqEslpNAEuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcyCW2h5Rz148Y for ; Fri, 26 Dec 2025 07:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32fea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 07:38:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jason A. Harmening Subject: git: 177e0097b93f - stable/15 - unionfs: Implement VOP_GETLOWVNODE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 177e0097b93fbcb470c90fc20b7121531f304da4 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 07:38:31 +0000 Message-Id: <694e3b77.32fea.34868fb0@gitrepo.freebsd.org> The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=177e0097b93fbcb470c90fc20b7121531f304da4 commit 177e0097b93fbcb470c90fc20b7121531f304da4 Author: Jason A. Harmening AuthorDate: 2025-11-28 07:36:24 +0000 Commit: Jason A. Harmening CommitDate: 2025-12-26 06:34:13 +0000 unionfs: Implement VOP_GETLOWVNODE This function returns the vnode that will be used to resolve the access type specified in the 'flags' argument, and is useful for optimal behavior of vn_copy_file_range(). While most filesystems can simply use the default implementation which returns the passed- in vnode, unionfs (like nullfs) ideally should resolve the access request to whichever base layer vnode will be used for the I/O. For unionfs, write accesses must be resolved through the upper vnode, while read accesses will be resolved through the upper vnode if present or the lower vnode otherwise. Provide a simple unionfs_getlowvnode() implementation that reflects this policy. Reviewed by: kib, olce Tested by: pho Differential Revision: https://reviews.freebsd.org/D53988 (cherry picked from commit 5c025978fc3649730329994eecc56ada119e6717) --- sys/fs/unionfs/union_vnops.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ sys/kern/vfs_default.c | 3 +-- sys/sys/vnode.h | 1 + 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 8e6b11548a36..602d5fdfcb97 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -2115,6 +2115,49 @@ unionfs_getwritemount(struct vop_getwritemount_args *ap) return (error); } +static int +unionfs_getlowvnode(struct vop_getlowvnode_args *ap) +{ + struct unionfs_node *unp; + struct vnode *vp, *basevp; + + vp = ap->a_vp; + VI_LOCK(vp); + unp = VTOUNIONFS(vp); + if (unp == NULL) { + VI_UNLOCK(vp); + return (EBADF); + } + + if (ap->a_flags & FWRITE) { + basevp = unp->un_uppervp; + /* + * If write access is being requested, we expect the unionfs + * vnode has already been opened for write access and thus any + * necessary copy-up has already been performed. Return an + * error if that expectation is not met and an upper vnode has + * not been instantiated. We could proactively do a copy-up + * here, but that would require additional locking as well as + * the addition of a 'cred' argument to VOP_GETLOWVNODE(). + */ + if (basevp == NULL) { + VI_UNLOCK(vp); + return (EACCES); + } + } else { + basevp = (unp->un_uppervp != NULL) ? + unp->un_uppervp : unp->un_lowervp; + } + + VNASSERT(basevp != NULL, vp, ("%s: no upper/lower vnode", __func__)); + + vholdnz(basevp); + VI_UNLOCK(vp); + VOP_GETLOWVNODE(basevp, ap->a_vplp, ap->a_flags); + vdrop(basevp); + return (0); +} + static int unionfs_inactive(struct vop_inactive_args *ap) { @@ -3010,6 +3053,7 @@ struct vop_vector unionfs_vnodeops = { .vop_getattr = unionfs_getattr, .vop_getextattr = unionfs_getextattr, .vop_getwritemount = unionfs_getwritemount, + .vop_getlowvnode = unionfs_getlowvnode, .vop_inactive = unionfs_inactive, .vop_need_inactive = vop_stdneed_inactive, .vop_islocked = vop_stdislocked, @@ -3049,5 +3093,6 @@ struct vop_vector unionfs_vnodeops = { .vop_unp_bind = unionfs_unp_bind, .vop_unp_connect = unionfs_unp_connect, .vop_unp_detach = unionfs_unp_detach, + .vop_copy_file_range = vop_stdcopy_file_range, }; VFS_VOP_VECTOR_REGISTER(unionfs_vnodeops); diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 71fe0e62d076..e04f328c0b37 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -77,7 +77,6 @@ static int dirent_exists(struct vnode *vp, const char *dirname, static int vop_stdis_text(struct vop_is_text_args *ap); static int vop_stdunset_text(struct vop_unset_text_args *ap); static int vop_stdadd_writecount(struct vop_add_writecount_args *ap); -static int vop_stdcopy_file_range(struct vop_copy_file_range_args *ap); static int vop_stdfdatasync(struct vop_fdatasync_args *ap); static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); static int vop_stdread_pgcache(struct vop_read_pgcache_args *ap); @@ -1426,7 +1425,7 @@ vfs_stdnosync(struct mount *mp, int waitfor) return (0); } -static int +int vop_stdcopy_file_range(struct vop_copy_file_range_args *ap) { int error; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 9e0f02465067..8bcf2d43ff51 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -915,6 +915,7 @@ int vop_stdunp_bind(struct vop_unp_bind_args *ap); int vop_stdunp_connect(struct vop_unp_connect_args *ap); int vop_stdunp_detach(struct vop_unp_detach_args *ap); int vop_stdadd_writecount_nomsync(struct vop_add_writecount_args *ap); +int vop_stdcopy_file_range(struct vop_copy_file_range_args *ap); int vop_eopnotsupp(struct vop_generic_args *ap); int vop_ebadf(struct vop_generic_args *ap); int vop_einval(struct vop_generic_args *ap); From nobody Fri Dec 26 07:38:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcyCX5wxsz6L83F for ; Fri, 26 Dec 2025 07:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcyCX4C15z47mh for ; Fri, 26 Dec 2025 07:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766734712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhazMNIsfjAxcR9QgTEt/edt8O40s+GDvBj0gXxpDYQ=; b=Shfm1WmLP/LfS7jI9Tc7PlwFgJGBp9bDNLoJSPuo1bt4S6Ek+X3H2gder2D64tk98Iui+5 PZ8R//pOgOM/FSG8fndyDgfiuGKsoon4yXHkk555H8PwJUKzhtOxyPBVSfxAn8QvwL0wBW 6ke7dzTNh8vL3vqdZ6KlM+ucd43eWQiXJVe3eT+wJjxZ0lddNc/HpGBxCkcdHS1I7qJ1Gx XYzQwSzidgAItSABOyujp3OegrL5X757u9w0m0LK2Mgb0K9b/qwFKvmCYTYKq7MANMu3sg f/8RApZVYIuiYqctpjmOfhWrFG3wvPX8PHADmh1tCSE7AudJpXx0p2KT9HfESA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766734712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhazMNIsfjAxcR9QgTEt/edt8O40s+GDvBj0gXxpDYQ=; b=VIP4zxY8KsVBbBOK/xbb+0GVsJc6ED3+FkOyio9ZmIcXxHgfpRg47mR0axLunwWxznz4oS 3lx2xoqq25hbcWUEz8lNp+rrYX+ykBbxdmi3WKDbzIU+QfQOsmeEf0onsexS/kCRHcJcB7 V2Hz1R+sLH3cOXQntO0Ty/+ZiElsW//iZtURYOFlr5BKatBMcagb4VQMNR/qB9AuY7bvuc cu8at/qsRSvD/pW6+5elgBmQDTVOB8npGy6DxqvHyrSGtyoP5CNviEnF9Blc2NL5SaLaOE Qi+90VTbzEgtnyCxtkPwK41FyRMiTAhvEhbbOYs2ox17vhrr+BHOHFnAYvPmdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766734712; a=rsa-sha256; cv=none; b=YwiGSdlixbhF4l/3VVWNiRMmYwAnYnglPXax/FYZSENQkBu8qZAPV0KdPUe89UcrvDjPaY kk+/PqifZlBFc7OvtZhTC/Kg73IowHxDIFVcFrSWHs/nqqkHwhxZyHr5kvnucFRDEUGcRh oqOQXPT46uD3AFt1Dl7nwAfXzkjOD60/wAU5LhJrCq4GdEBYFfZixQbzATEMW3u4xqq2HQ tjzhi421mIyp4XuZeIds0Sdtw6kRhGrZkJ/d4oZL8hY3Ub/M07tjIxQC6rh+0RZ8+St/Xo HBXJQfilNhyCBWXxE9aeIuEe15GES+g/kvKnLoF29dNDQyVC4qEUW21q4wBuBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dcyCX3WxJz13Vp for ; Fri, 26 Dec 2025 07:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35a42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 07:38:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jason A. Harmening Subject: git: da6f395119a5 - stable/15 - unionfs: detect common deadlock-producing mount misconfigurations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: da6f395119a5eb1ed1dad56874c1c55a5721e220 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 07:38:32 +0000 Message-Id: <694e3b78.35a42.3693b1f7@gitrepo.freebsd.org> The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=da6f395119a5eb1ed1dad56874c1c55a5721e220 commit da6f395119a5eb1ed1dad56874c1c55a5721e220 Author: Jason A. Harmening AuthorDate: 2025-11-29 07:53:16 +0000 Commit: Jason A. Harmening CommitDate: 2025-12-26 06:38:06 +0000 unionfs: detect common deadlock-producing mount misconfigurations When creating a unionfs mount, it's fairly easy to shoot oneself in the foot by specifying upper and lower file hierarchies that resolve back to the same vnodes. This is fairly easy to do if the sameness is not obvious due to aliasing through nullfs or other unionfs mounts (as in the associated PR), and will produce either deadlock or failed locking assertions on any attempt to use the resulting unionfs mount. Leverage VOP_GETLOWVNODE() to detect the most common cases of foot-shooting at mount time and fail the mount with EDEADLK. This is not meant to be an exhaustive check for all possible deadlock-producing scenarios, but it is an extremely cheap and simple approach that, unlike previous proposed fixes, also works in the presence of nullfs aliases. PR: 172334 Reported by: ngie, Karlo Miličević Reviewed by: kib, olce Tested by: pho Differential Revision: https://reviews.freebsd.org/D53988 (cherry picked from commit 0247b4018de2c341ac59a585362c10044cea86ad) --- sys/fs/unionfs/union_vfsops.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 9342317ad08e..fd48a520f911 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -73,6 +73,8 @@ unionfs_domount(struct mount *mp) { struct vnode *lowerrootvp; struct vnode *upperrootvp; + struct vnode *lvp1; + struct vnode *lvp2; struct unionfs_mount *ump; char *target; char *tmp; @@ -276,11 +278,32 @@ unionfs_domount(struct mount *mp) */ VOP_UNLOCK(ump->um_uppervp); + /* + * Detect common cases in which constructing a unionfs hierarchy + * would produce deadlock (or failed locking assertions) upon + * use of the resulting unionfs vnodes. This typically happens + * when the requested upper and lower filesytems (which themselves + * may be unionfs instances and/or nullfs aliases) end up resolving + * to the same base-layer files. Note that this is not meant to be + * an exhaustive check of all possible deadlock-producing scenarios. + */ + lvp1 = lvp2 = NULL; + VOP_GETLOWVNODE(ump->um_lowervp, &lvp1, FREAD); + VOP_GETLOWVNODE(ump->um_uppervp, &lvp2, FREAD); + if (lvp1 != NULL && lvp1 == lvp2) + error = EDEADLK; + if (lvp1 != NULL) + vrele(lvp1); + if (lvp2 != NULL) + vrele(lvp2); + /* * Get the unionfs root vnode. */ - error = unionfs_nodeget(mp, ump->um_uppervp, ump->um_lowervp, - NULLVP, &(ump->um_rootvp), NULL); + if (error == 0) { + error = unionfs_nodeget(mp, ump->um_uppervp, ump->um_lowervp, + NULL, &(ump->um_rootvp), NULL); + } if (error != 0) { vrele(upperrootvp); free(ump, M_UNIONFSMNT); From nobody Fri Dec 26 09:30:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hx13t6z6LHkH for ; Fri, 26 Dec 2025 09:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0hw5RpJz3MLh for ; Fri, 26 Dec 2025 09:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741440; h=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=7eXxPvTyzzvfboq7yMY5+hGVTVGr9zFJUIMuX3YSOKc=; b=jf4CufDIz3xOkKlnb/zTnYanitFk1l5lOw8aka3mQ2W3kmyL/a/yzi/NvFdEHnFEsHoYCW NTgJO2JlVYZ2oRvVukjfTu40Mhi3MBgETTrotJf9Ja1pvZGZXK2ITk2WwqmAdTasFWOQQg 2quxGhY49jKgmEBeo3Sycs5Lo1r7anDtE6M5T0leJevd24GVZXyvu9LGz++YSt65ZOCVmO rqsq4iJ/ly2CahnE7r1us+IgUydvnFMyrKmbmOMa0bhVZT0aRthxmi5tLvTw1YA4SEgrff Qqzw/bIULOOcfyp87h/di/lnbwIhnphr+4F3QosuWayMkY5Gsk7QVQ1lAQc1Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741440; h=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=7eXxPvTyzzvfboq7yMY5+hGVTVGr9zFJUIMuX3YSOKc=; b=xLiSYDdJYVXxbwvfXD7nXuTOgubRQuJqhZCiLwl9O/lEaVyhf623rjUibwe/zGoMD1QqGA CgwLefoicdCNxiYKUrQIFMhHs2BQbKE7MUHZKXe4iLYgp62MlK0bqjAyCIAjn6fDFHzRIr ZZNvoEd5Sr0GqBLPjHuUogEpmPZXdl30e43yQAWoG6QKIeQRmVrdT0JKtjRf9KkdV97cEk /KIDf5R59PcndPrfGy4J6Ulptern2dWCdcwiicXxQR7VPFkQHx2kqprPb9jnTHORFbQoo2 m5VI0BGKWfA1CKTHjM6HnPRwRCDO1OFOjaM3uHT8XQS5U37m1LhKRuqmx9USWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741440; a=rsa-sha256; cv=none; b=Fu7YQZlGN0dSBOxYHAMbU8MJ/wHdftxK1fMG4NTyTnEnedLtRMhfmgjN2ynTq/NDmmtIcL Cy4CSeR4T+bWe3e0PS9lbeFWSQxA61Ei31WWIPWbhvOK5tc1XUMBX3RDJbw5ywaxDae/oA Rf0rzrN0NxMDxwAMf5H9GEUSgpXpXZC4AJDgX+MRE2yZWGYYmEThyl1dxjHasMaI2fSq4b hZQHheXv5auqMWBUaxDLpdtGRMQ2AdCucoJm4KazX2G+2+nowLOcCQ6IH1nPBqWlhil6rx Q4yZIqAAZi0ZHW2fBFhQDKjYA1aAeGTxslaX8QI90WWUV2X/oUp+igmeN8yUNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hw4hv2z16SC for ; Fri, 26 Dec 2025 09:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8690 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: bcd1e5fb540f - stable/14 - mac_ipacl: Use IfAPI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bcd1e5fb540ffed26b25f520a69e092423f8ccaa Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:40 +0000 Message-Id: <694e55c0.8690.279c009@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd1e5fb540ffed26b25f520a69e092423f8ccaa commit bcd1e5fb540ffed26b25f520a69e092423f8ccaa Author: Justin Hibbits AuthorDate: 2023-08-25 16:44:17 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 mac_ipacl: Use IfAPI Use `if_t` instead of `struct ifnet *`, and if_name() accessor. Sponsored by: Juniper Networks, Inc. (cherry picked from commit b820820ece099a73511d7daec407d78f38185a9b) --- sys/security/mac_ipacl/mac_ipacl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/security/mac_ipacl/mac_ipacl.c b/sys/security/mac_ipacl/mac_ipacl.c index 69802845252a..eed3eddace89 100644 --- a/sys/security/mac_ipacl/mac_ipacl.c +++ b/sys/security/mac_ipacl/mac_ipacl.c @@ -315,7 +315,7 @@ SYSCTL_PROC(_security_mac_ipacl, OID_AUTO, rules, static int rules_check(struct ucred *cred, - struct ipacl_addr *ip_addr, struct ifnet *ifp) + struct ipacl_addr *ip_addr, if_t ifp) { struct ip_rule *rule; int error; @@ -342,7 +342,7 @@ rules_check(struct ucred *cred, continue; if (strcmp(rule->if_name, "\0") && - strcmp(rule->if_name, ifp->if_xname)) + strcmp(rule->if_name, if_name(ifp))) continue; switch (rule->af) { @@ -395,7 +395,7 @@ rules_check(struct ucred *cred, #ifdef INET static int ipacl_ip4_check_jail(struct ucred *cred, - const struct in_addr *ia, struct ifnet *ifp) + const struct in_addr *ia, if_t ifp) { struct ipacl_addr ip4_addr; @@ -415,7 +415,7 @@ ipacl_ip4_check_jail(struct ucred *cred, #ifdef INET6 static int ipacl_ip6_check_jail(struct ucred *cred, - const struct in6_addr *ia6, struct ifnet *ifp) + const struct in6_addr *ia6, if_t ifp) { struct ipacl_addr ip6_addr; From nobody Fri Dec 26 09:30:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hy2Pfzz6LHpP for ; Fri, 26 Dec 2025 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0hy19DNz3LyT for ; Fri, 26 Dec 2025 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741442; h=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=eRiRWPsKf/q+sZZ3msncAmxqlcAnUQhWTpgk9kHtZis=; b=Mr+mX8JPBY27J91LjgTTZQ1AQ72crhEOZg58kwgL8/5QdSATQnfiLkcTdbEgD2p/MntQSY LJN3iYIQfVQKE/H0M6rVyCAibYnhoXas9TFfBcN4a7ZkxdJfV7Irf4rnH408EloP7zyHIA C0N8M1WHOZ8pUp2xEuARf1BQteKBf6BUtmuQ845d78HvoUBA9PNoCkWmbIR/jYWdYr+4+f ZmHDUlzhYMmQh2CJ8xtSjBKhml3Fmq4T8OumHAFGzBcDNmrK33EEziEEaeH8TmWzGEF//K VNCVojxWbPJwScKEdeNzyn4liR0uaCro5vmFmba6vVlabtRp/pczzAw//cBabw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741442; h=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=eRiRWPsKf/q+sZZ3msncAmxqlcAnUQhWTpgk9kHtZis=; b=O8BdLWW5h9auUXIHZVJ36jVR+JomPak6u2DEPoyuDPo/JZVNPMJC0vUIBQvLVNhpRTVo4n W2/EKRefGV6mX2Hzr6XGACU+CI7MTk9YoGzGB9N7+Tx5ozwwy/dd9Tf/uvJEfDftfJHhWn sza2haYjaGja2UrDt144FyASmCIpQeyfpNXB7SvtoIXJn0ldwENj6gVpcjeEBLldkFbavf j4rk9TmeOCy5pabUNPWBlKRcI+JNFCAAoRJ/lZckPfrnDghhvLyLDNHk2fWrR8E4rNJv5D T+5GpO5/X0YQPkT8K4+ZEQGtTlVjdLpOqCYhoFEduHDwMaVPb9PIFrplS43Mpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741442; a=rsa-sha256; cv=none; b=nk7AQEb1MLYq1XbMfBhPnTM+Gh3doQ5CNSW5QbBZEq9IL/NQRwYkt4tPNuWVlBvYSc2YBy UZUMFLB3+V/M9BJdYgWBuNsnlwHQ3hyEUseMLy1JRWRy9TP2uHO7Cy686Sk96i2V39yOXJ tBJPImio9u40apUWU/62jexRkwby52DQ9xi281c+fzVCdedYQsiNHYnc6L5hH54gL2QXw0 mdkjGuvAiC7vnxsE5882Ji4NLR7AcsQpyn+QEetr8R+yF1MqgtXP16M0P5D/iIv9l3BNZQ d109lTNdcdAuva0BHqQQL6YLeRLh0UvGVe43JNpY9MUw15+9zjpzQwhsUhoj6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hx5WMRz16pW for ; Fri, 26 Dec 2025 09:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8804 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: 2fef1a6ef9f0 - stable/14 - netlink: Don't directly access ifnet members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fef1a6ef9f095df5ed8f1cd8766878fb960c86b Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:41 +0000 Message-Id: <694e55c1.8804.4b2cc628@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2fef1a6ef9f095df5ed8f1cd8766878fb960c86b commit 2fef1a6ef9f095df5ed8f1cd8766878fb960c86b Author: Justin Hibbits AuthorDate: 2024-10-31 15:09:48 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 netlink: Don't directly access ifnet members Summary: Remove the final direct access of struct ifnet members from netlink. Since only the first address is used, create the iterator and then free, without fully iterating. Reviewed By: kp Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42972 (cherry picked from commit b224af946a17b8e7a7b4942157556b5bc86dd6fb) --- sys/netlink/route/iface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index d98385a4c23e..6fd99cf61e2d 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -322,11 +322,13 @@ dump_iface(struct nl_writer *nw, if_t ifp, const struct nlmsghdr *hdr, */ if (if_getaddrlen(ifp) != 0) { struct ifaddr *ifa; + struct ifa_iter it; NET_EPOCH_ENTER(et); - ifa = CK_STAILQ_FIRST(&ifp->if_addrhead); + ifa = ifa_iter_start(ifp, &it); if (ifa != NULL) dump_sa(nw, IFLA_ADDRESS, ifa->ifa_addr); + ifa_iter_finish(&it); NET_EPOCH_EXIT(et); } From nobody Fri Dec 26 09:30:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hz1FXvz6LJ3Q for ; Fri, 26 Dec 2025 09:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0hy6BMhz3MT9 for ; Fri, 26 Dec 2025 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741442; h=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=GpdFZL55nhCpu/iJxfRtFOfAdh/Pg2IZy8vsgUmA7xI=; b=J9ue87a3PGNZ3M/Z0ZHw/5P/8m8DDO0OzksqiQxGe7Cna+jUBicxZx+SRLCZaWPw5EnJNi C1sZAhqRVOM/bk/Kbdibb0AlJQ/EjTkCMGtslDey6kbgOWKFWnb20hfb6llRDjB3itbD8X V1E+o3vBnuSlr/93wtr3CRdcVLORsYeHydai3wTV9Hu8G92wshJneG89iXuKAltiNa8Cjc PXZTaxKyKVyBypDspxydQPp951EN1w1ect3zYIATJmh4uMRr1WCKUe0KQ8H837/48ciCCj 8N7lBSPx2m6IBwbk4eYJduoFwkAHSED34kB23SBbsHIVh6jqxZmarQ0dnnS1MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741442; h=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=GpdFZL55nhCpu/iJxfRtFOfAdh/Pg2IZy8vsgUmA7xI=; b=xlx+VbsRwKDOVbxWUd3cif4J6yifNskWrcgQCtd0qus45uqUDchLudOMJUa2dXF/pAAlJh f4I5dyJhC/lS7cqEXYGto9a80PlJUv7ba9qbqnqnCoa8Xg99lMVO9CbkaDECvDCbXXfhDq iivJ0pg04SY4iZCc4clcprJZfjcXD4XvKtzfzUkEmExHZZqNXzJeqEubA77k3d9klX8Cbe ddnAkVc92UmX9P5rJ4QbkOfAg8ObAlhqp3nhD5VdTbrRTeM0rtNP2cqejfmKwdWpJjSxrK d8JaZ1h0+VEek5T8aQk+wNNTzUukqemugFWyvuAe4bXblOHV9zVIq/5mTmSy7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741442; a=rsa-sha256; cv=none; b=IyNCTd+Q/YG0+L9t884KOOk+2heDJPro142eJ5oA5HraSszKdY12KVwdYrRk31HZA/UZBw EcO8T5Yz30Er/Id+JWl5DUV6+aZOmCeR+CWIXl/2shekHfB2AQbmeX/BehPa7Ft//FNc2E mc0SWMqSR1iWNosgInQR6wIyiRIsMgDBiJGEOdAC7c1/mKQWDmI2FaqNgAqmQQTBXuayUe IYDy7ffdvwFmgTJP+yEf7lgZnJq8fUOrIHmzTQydK9rHrwddFkXLWpuI7c5AzEY0ujJq9F Qa1NcOAizvWEtLtLKpNe7cgR7pM2m0N2cZEXAJc5NEtfowA4EdGKZSzdrO7gSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hy5lBxz16pZ for ; Fri, 26 Dec 2025 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3edfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: 63b0b8bd791a - stable/14 - bnxt: Use IfAPI accessors where able List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 63b0b8bd791a63070effca0b4d37a34cd52955da Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:42 +0000 Message-Id: <694e55c2.3edfb.35eff0d8@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=63b0b8bd791a63070effca0b4d37a34cd52955da commit 63b0b8bd791a63070effca0b4d37a34cd52955da Author: Justin Hibbits AuthorDate: 2024-10-31 14:04:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 bnxt: Use IfAPI accessors where able Summary: Don't directly access ifnet members, it's a private structure. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D47353 (cherry picked from commit 84d7ec4c657f406c6cbd29baf32c8e057b663d17) --- sys/dev/bnxt/bnxt_re/bnxt_re.h | 4 ++-- sys/dev/bnxt/bnxt_re/ib_verbs.c | 6 +++--- sys/dev/bnxt/bnxt_re/main.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/bnxt/bnxt_re/bnxt_re.h b/sys/dev/bnxt/bnxt_re/bnxt_re.h index 56b3c8c0488c..fe7a27f4e216 100644 --- a/sys/dev/bnxt/bnxt_re/bnxt_re.h +++ b/sys/dev/bnxt/bnxt_re/bnxt_re.h @@ -946,8 +946,8 @@ int bnxt_re_setup_cnp_cos(struct bnxt_re_dev *rdev, bool reset); static inline enum ib_port_state bnxt_re_get_link_state(struct bnxt_re_dev *rdev) { - if (rdev->netdev->if_drv_flags & IFF_DRV_RUNNING && - rdev->netdev->if_link_state == LINK_STATE_UP) + if (if_getdrvflags(rdev->netdev) & IFF_DRV_RUNNING && + if_getlinkstate(rdev->netdev) == LINK_STATE_UP) return IB_PORT_ACTIVE; return IB_PORT_DOWN; } diff --git a/sys/dev/bnxt/bnxt_re/ib_verbs.c b/sys/dev/bnxt/bnxt_re/ib_verbs.c index 8d43fa96c048..0383a16757aa 100644 --- a/sys/dev/bnxt/bnxt_re/ib_verbs.c +++ b/sys/dev/bnxt/bnxt_re/ib_verbs.c @@ -299,7 +299,7 @@ int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num, if (port_attr->state == IB_PORT_ACTIVE) port_attr->phys_state = IB_PORT_PHYS_STATE_LINK_UP; port_attr->max_mtu = IB_MTU_4096; - port_attr->active_mtu = iboe_get_mtu(rdev->netdev->if_mtu); + port_attr->active_mtu = iboe_get_mtu(if_getmtu(rdev->netdev)); port_attr->gid_tbl_len = dev_attr->max_sgid; port_attr->port_cap_flags = IB_PORT_CM_SUP | IB_PORT_REINIT_SUP | IB_PORT_DEVICE_MGMT_SUP | @@ -2118,7 +2118,7 @@ static int bnxt_re_init_qp_attr(struct bnxt_re_qp *qp, struct bnxt_re_pd *pd, qplqp->max_rd_atomic = dev_attr->max_qp_rd_atom; qplqp->max_dest_rd_atomic = dev_attr->max_qp_init_rd_atom; } - qplqp->mtu = ib_mtu_enum_to_int(iboe_get_mtu(rdev->netdev->if_mtu)); + qplqp->mtu = ib_mtu_enum_to_int(iboe_get_mtu(if_getmtu(rdev->netdev))); qplqp->dpi = &rdev->dpi_privileged; /* Doorbell page */ if (init_attr->create_flags) { dev_dbg(rdev_to_dev(rdev), @@ -2691,7 +2691,7 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, /* MTU settings allowed only during INIT -> RTR */ if (qp_attr->qp_state == IB_QPS_RTR) { - bnxt_re_init_qpmtu(qp, rdev->netdev->if_mtu, qp_attr_mask, qp_attr, + bnxt_re_init_qpmtu(qp, if_getmtu(rdev->netdev), qp_attr_mask, qp_attr, &is_qpmtu_high); if (udata && !ib_copy_from_udata(&ureq, udata, sizeof(ureq))) { if (ureq.comp_mask & BNXT_RE_COMP_MASK_MQP_EX_PATH_MTU_MASK) { diff --git a/sys/dev/bnxt/bnxt_re/main.c b/sys/dev/bnxt/bnxt_re/main.c index e6c6f754ea47..3d26d21f3fc7 100644 --- a/sys/dev/bnxt/bnxt_re/main.c +++ b/sys/dev/bnxt/bnxt_re/main.c @@ -4168,8 +4168,8 @@ static int bnxt_re_netdev_event(struct notifier_block *notifier, dev_info(rdev_to_dev(rdev), "%s: Event = %s (0x%lx), rdev %s (real_dev %s)\n", __func__, bnxt_re_netevent(event), event, - rdev ? rdev->netdev ? rdev->netdev->if_dname : "->netdev = NULL" : "= NULL", - (real_dev == netdev) ? "= netdev" : real_dev->if_dname); + rdev ? rdev->netdev ? if_getdname(rdev->netdev) : "->netdev = NULL" : "= NULL", + (real_dev == netdev) ? "= netdev" : if_getdname(real_dev)); if (!test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags)) goto exit; From nobody Fri Dec 26 09:30:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd0j01MMTz6LHkK for ; Fri, 26 Dec 2025 09:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0j000MXz3MCm for ; Fri, 26 Dec 2025 09:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741444; h=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=+6uFjCBCHNk63/bv1oFpyt+D4Vq6hmOKakOwVdSJgg4=; b=s13SwhYgU3F0At49xFnAw+Wa0tes0oFUmBydJlhntJSSTCr3dRypZ63Cjg8TNdrUMxDFWf Tg/ic6uUkL2rDgqyRZABMjEC5iMw1mqsLtVhMh26B33/xWXtwS9Zo9nWIebM8fe2xG7cr8 EdF6WhXr3+GIr3W9+EkQlUdT2mGhYrq7oSljHpf4jIs4FDBXApOTLUwgtKJD6Yd6xBtiFC WS70uQz8bymooTk3ZU4PLAzk9tfkIPsuIX1CfiN8EMsKWqu+khSYfFlL+v+XadqILqh+s8 Ao+us4WXRbuYhBQwQYDfAo6gegsVqTvIWsbX+j8S6cjHeai8LbTIHbwViR6Nnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741444; h=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=+6uFjCBCHNk63/bv1oFpyt+D4Vq6hmOKakOwVdSJgg4=; b=X3L4kw8IxG5EhlBfyhW/SEQb3Xv1aVvZRIZhCC6oCrwO1NPUHdSaRplYqvdoR2cjMeYFvd hDc2u4JHB/dQBHxMX+gOEIfGXr7ThciNRnLvFh/TBD2qc++HB8tu4+Dk3c531WPX1lP2Ce EhoOQApZ8xKEZEahK7C6XPXKp36j2wbC9NX2Nd6HgR9Mq8ITZT/4DL6JBMqvvX24nY5Q3U aqGsdnj94Npm5qsGqKzJmh8vGugYwXQgFsPRCxiRsQriOg2/wopPtASms4q3sT7nrsF7GZ LybgxbR7L3OvY39kjv1SeqnA6SWFgs/T8QNCkeJjSBlQzSLoWRyNkmD2nRPG6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741444; a=rsa-sha256; cv=none; b=Ldi4rXBSlakiDwKvZrVZ1ZGk8BFZJrBSZ75GQVSU5CtNS45O2cYrpoqAbAnUEthLFc/G7s /d37kvGuyfvze7arHstlYNzc8exO5OwLG7GugA/UHIeRFz3dgkfXvSxo8ePZ4a5c8eQkfL 40n+ytiMfvUefkJOpNDjhjRX01rKIRnQGfH2vgVWxwLQYnLsS9YCoQeOoD8mpm/6DbuCi+ WNRXoqpVvQAWWL7jNR8UeLKbhb1EDEXZvJfVJePf+Uh7Q9BBblFhhJTssQKh+cZbq9FR7E 6A1Qx3J4euEGhkWG3aW/7vloWG/0W5XPKQsolFTBZiKlBGNt5QCwhjJ1fqJsvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hz6YL0z16nV for ; Fri, 26 Dec 2025 09:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f64c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: 16d50efd575e - stable/14 - qlnx: Convert recent changes to IfAPI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16d50efd575e288b608ae2e8f50d908f39704ac7 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:43 +0000 Message-Id: <694e55c3.3f64c.43ab25ba@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=16d50efd575e288b608ae2e8f50d908f39704ac7 commit 16d50efd575e288b608ae2e8f50d908f39704ac7 Author: Justin Hibbits AuthorDate: 2024-11-08 20:22:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 qlnx: Convert recent changes to IfAPI Sponsored by: Juniper Networks, Inc. Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D47533 (cherry picked from commit 1eaecc214ea2bfde84f4194c1d0e20b18117343f) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 32b893480401..9963f472c615 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2622,6 +2622,7 @@ static int qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) { int ret = 0, mask; + int flags; struct ifreq *ifr = (struct ifreq *)data; #ifdef INET struct ifaddr *ifa = (struct ifaddr *)data; @@ -2675,15 +2676,16 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) QL_DPRINT4(ha, "SIOCSIFFLAGS (0x%lx)\n", cmd); QLNX_LOCK(ha); + flags = if_getflags(ifp); - if (if_getflags(ifp) & IFF_UP) { + if (flags & IFF_UP) { if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { - if ((if_getflags(ifp) ^ ha->if_flags) & + if ((flags ^ ha->if_flags) & IFF_PROMISC) { - ret = qlnx_set_promisc(ha, ifp->if_flags & IFF_PROMISC); + ret = qlnx_set_promisc(ha, flags & IFF_PROMISC); } else if ((if_getflags(ifp) ^ ha->if_flags) & IFF_ALLMULTI) { - ret = qlnx_set_allmulti(ha, ifp->if_flags & IFF_ALLMULTI); + ret = qlnx_set_allmulti(ha, flags & IFF_ALLMULTI); } } else { ha->max_frame_size = if_getmtu(ifp) + @@ -7055,12 +7057,14 @@ qlnx_set_rx_mode(qlnx_host_t *ha) { int rc = 0; uint8_t filter; - const struct ifnet *ifp = ha->ifp; + const if_t ifp = ha->ifp; + const struct ifaddr *ifa; struct sockaddr_dl *sdl; - if (ifp->if_type == IFT_ETHER && ifp->if_addr != NULL && - ifp->if_addr->ifa_addr != NULL) { - sdl = (struct sockaddr_dl *) ifp->if_addr->ifa_addr; + ifa = if_getifaddr(ifp); + if (if_gettype(ifp) == IFT_ETHER && ifa != NULL && + ifa->ifa_addr != NULL) { + sdl = (struct sockaddr_dl *) ifa->ifa_addr; rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, LLADDR(sdl)); } else { @@ -7077,10 +7081,10 @@ qlnx_set_rx_mode(qlnx_host_t *ha) ECORE_ACCEPT_MCAST_MATCHED | ECORE_ACCEPT_BCAST; - if (qlnx_vf_device(ha) == 0 || (ha->ifp->if_flags & IFF_PROMISC)) { + if (qlnx_vf_device(ha) == 0 || (if_getflags(ha->ifp) & IFF_PROMISC)) { filter |= ECORE_ACCEPT_UCAST_UNMATCHED; filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - } else if (ha->ifp->if_flags & IFF_ALLMULTI) { + } else if (if_getflags(ha->ifp) & IFF_ALLMULTI) { filter |= ECORE_ACCEPT_MCAST_UNMATCHED; } ha->filter = filter; From nobody Fri Dec 26 09:30:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd0j15gTQz6LJ0k for ; Fri, 26 Dec 2025 09:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0j10g9lz3MWl for ; Fri, 26 Dec 2025 09:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741445; h=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=Z1zB3D61LHH/28NQdlKNfPyfHeKh5CcBoZLdiPHGFn8=; b=EM7HzJBB/KjYYsBLnVO8/JdLLz+vvHc3WAFZDB6ZaSWbmykzLlTWQ2KIJ/Ls8hViRbefAI pf+yz93ufnGJddC+LUbp204rCBPoJL/fwQ/8mMGMiZmB4k51ABL38JuElW83CBoT+KKhRs SChi+SS0anDyvB4txEoQR3vtqPKyQRSd/023kOxz0hGzgPUriMSfTTagqLfAnEB+o9rwFv JdqBlQLC44XPhV5RCNqYIMh+HZeN1vg45F0jL6pH7z+LX2CIryenc8oceYJrBoI/kt9ruS Os0lPBFmbc6A0UbAbgqtTZlVWp3kof87KxwAjTtpERoc3VqJ4pE7OZQcGMUogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741445; h=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=Z1zB3D61LHH/28NQdlKNfPyfHeKh5CcBoZLdiPHGFn8=; b=EhfrRh+YooOWlA3usw+us5oIQqXzLLFdQTpQrlbPntVVa7udxrjzlvW+wV8gy34jEz+GA5 9UfkAZeILxdK9kEFCBhn6g/vEKs4Yd01Xwdpr2COSKzlHVlKI2H7fGhaQtjwgD+goRTubt 3nJ9sTox2wcFTZso2XOWfTReY3qkq+Hx7tFe3LyTxp7pT/o8FKTCw60BMixKDddfmFqgJG rXG2yZkUmENI0bVWJQUxr7VpEVHnCoQ3Pm8fdiEvyF539DFRt5JzlBx9ku6h0V3zlgH65s QZpEtIReI1TsizW7q+3zdNwVSWZu/0DSDbkfzxvTXFBegUTfs40hMoTCoSrRXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741445; a=rsa-sha256; cv=none; b=mkU76C2C8x7mDEGIQ5cz0PqO3wsm5qzNVG68flfw6VWPCHEK1uPsKexGT8Qaxk6fqyqv07 9zojn7Vs+kdkDnnIpoyetTNjhmTrPmQ6EFKYC6aca41pDzP/65YeUokf7sAPM52BvVNjKT B2RHoZCMdIUZ5AkqBuc0tx4ylzrTtCVNSE2f9cxBSIe4tte94QWY4yAjiR1TL2ErRFhJmC 6wUsfxAcxcKG4fFfLWDgkTZouOI8F5rMIRF4+gEUPo3v4xMZU8xkUJmU4nbgHOio6jXX+B 500ZIpMayJaYvJaCYFgJDbhty0XgGiRc8egtcL+OVICRkZn8O1j8eTth+wQlHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0j073zPz16pc for ; Fri, 26 Dec 2025 09:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f458 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: f95ddf7441b3 - stable/14 - LinuxKPI: Use IfAPI to get LLADDR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f95ddf7441b3596913da2d99cafda518ec8c2e1b Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:44 +0000 Message-Id: <694e55c4.3f458.6b326c9c@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f95ddf7441b3596913da2d99cafda518ec8c2e1b commit f95ddf7441b3596913da2d99cafda518ec8c2e1b Author: Justin Hibbits AuthorDate: 2024-11-12 15:01:00 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 LinuxKPI: Use IfAPI to get LLADDR Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D47525 (cherry picked from commit 57609cb2de149a3c99c43e98d37cfa4784958f73) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index c1eb6d6200ae..5bc32b456b5d 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3720,7 +3720,7 @@ lkpi_vif_iflladdr(void *arg, struct ifnet *ifp) } vif = arg; - IEEE80211_ADDR_COPY(vif->bss_conf.addr, IF_LLADDR(ifp)); + IEEE80211_ADDR_COPY(vif->bss_conf.addr, if_getlladdr(ifp)); NET_EPOCH_EXIT(et); } From nobody Fri Dec 26 10:47:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd2Q41YSGz6LNqT for ; Fri, 26 Dec 2025 10:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd2Q40nX1z3VZb for ; Fri, 26 Dec 2025 10:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEONzRBL32f+y3O8G+f9kilojwregbuUvHufISNJgbY=; b=vJp6GPN25/ZS0Sd+Qq78lgzV4WBiQXlIRCgEREwg7HTVCpFdAaWhnCAz9xnJDq/CN6rLle WM456fOv7Jl+LGq3DFYgWZf0XbgSuJqk5zCBMjNsQgnQrWAWY0CPodF3dTp0FCiD84QWRG g8qmWVvkqgM4wC5wvt/ijVW+Tg76TuZYRxxaf+BbWP06v9r7JrC8u/CgANWZkbv5I4K+UX Op/OG8PYMdEmilYw6HAiXQpmqFcqP3Imi85Y9FF7nbErnhHH5JGj/0HJlt8sFXn4H/zOMq SxCojjeCh8v3ZfBt20c1ewcQNfQqtWPl1V8D+I3u9RHiAexf+HoxUQ4gyJIg7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEONzRBL32f+y3O8G+f9kilojwregbuUvHufISNJgbY=; b=iL8Ql5keQbuK2lDqMuJanoeocnh2c+NciE1zsG/rP0LyDHJr+uAad5pm5Y794L0cJ7u9cv 0wlxcyoHeiLEAA19EY9vzdLSGqQE4xh6X8T317JnzCaQywvwP4aMwYQ2cDBSr/E79cWbOf vD6lzCndTVctpbgk7kTAuTgeu3wvnBXMHwQeVe92BkpHh0hxK5evKJEyoI/9FwQnK3nOuq Bu7kYLP9Fgx2aJPFYHtVMWIzI24xyQA2zVEwxPgefotR2N3F0+WchGToxhOJin2hNJIQjn SqOPJax4F/JORDbojqSqmj9jFJreZcXF3+9G89Nh/BNY2a131MR2Y+p/UWCkWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766746076; a=rsa-sha256; cv=none; b=OoaAGPGorbG2A77fqnA+j/ALf6kyxC7MkA7zJWNiWnR9RTxWplBbkI5d+x8xhY+Z8Qc/+A xqvomsxcQkGJBrkZ01bYUzXSRR1/dyWd09tqYDqYMR3te0KULyYIfh6F4iy4r5vWAEGcMi 3M4IfckhnzQuH2VqR9F/5Z6tTSphE7ZG51+IT+UomCeNQJSkM9/ndKizt3TDYbJ181KX29 yHqQJdBqZCS+MIHf2TLpe/ezkIX8FyrYDlkK27TKIcePF7P0aJjYbtFRqAQxMzQ6Dotbus yx9cNmMZcEeshCniLcKAaO2eAWTAd46QNDrIQkSb77TWOXcKZoyhsrGXQGb01w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd2Q40JPMz18HB for ; Fri, 26 Dec 2025 10:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ea33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 10:47:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 535fac0b9574 - stable/15 - bhyve.8: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 535fac0b9574c031820ea756756efa130da2f743 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 10:47:56 +0000 Message-Id: <694e67dc.ea33.55951e76@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=535fac0b9574c031820ea756756efa130da2f743 commit 535fac0b9574c031820ea756756efa130da2f743 Author: Michael Osipov AuthorDate: 2025-12-21 16:41:41 +0000 Commit: Michael Osipov CommitDate: 2025-12-26 10:47:46 +0000 bhyve.8: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54332 (cherry picked from commit 5819f8b285fc55a75e5dea56ffe73b376525150c) --- usr.sbin/bhyve/bhyve.8 | 66 ++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 27e067f50394..483462e0b98b 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 28, 2025 +.Dd December 23, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -224,7 +224,7 @@ This specification only works when loaded with UEFI mode for VNC. When using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), this option isn't needed. When using a VNC client that doesn't support QEMU Extended Key Event Message -(e.g. tightVNC), the layout defaults to the US keyboard unless specified +(e.g. TightVNC), the layout defaults to the US keyboard unless specified otherwise. .It Fl l Cm help Print a list of supported LPC devices. @@ -486,7 +486,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a TPM module, a fwcfg type, and the debug/test device. +optionally, a TPM module, a fw_cfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -636,10 +636,10 @@ Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Ss SCSI device backends @@ -658,10 +658,10 @@ are: Initiator ID to use when sending requests to specified CTL port. The default value is 0. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or not support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Ss 9P device backends @@ -691,10 +691,11 @@ Use the host TTY device for serial port I/O. .It Ar tcp=ip:port Use the TCP server for serial port I/O. Configuring this option will start a TCP server that waits for connections. -Only one connection is allowed at any time. Other connection try to connect -to TCP server will be disconnected immediately. Note that this feature -allows unprivileged users to access the guest console, so ensure that -access is appropriately restricted. +Only one connection is allowed at any time. +The TCP server will immediately close new connections while an existing +connection is active. +Note that this feature allows unprivileged users to access the guest console, +so ensure that access is appropriately restricted. .El .Ss TPM device backends .Bl -bullet @@ -753,10 +754,10 @@ is provided, that file is also mapped in the boot firmware guest address space, and any modifications the guest makes will be saved to that file. .Pp -Fwcfg types: +fw_cfg types: .Bl -tag -width 10n .It Ar fwcfg -The fwcfg interface is used to pass information such as the CPU count +The fw_cfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware. Supported values are .Ql bhyve @@ -771,13 +772,13 @@ is used, bhyve's fwctl interface is used. It currently reports only the CPU count to the guest firmware. The .Ql qemu -option uses QEMU's fwcfg interface. +option uses QEMU's fw_cfg interface. This interface is widely used and allows user-defined information to be passed to the guest. It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest. Some operating systems such as Fedora CoreOS can be configured by -qemu's fwcfg interface as well. +QEMU's fw_cfg interface as well. .El .Ss Pass-through device backends .Sm off @@ -813,10 +814,10 @@ as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -824,7 +825,7 @@ Guest memory must be wired using the .Fl S option when a pass-through device is configured. .Pp -The host device must have been reserved at boot-time using the +The host device must have been reserved at boot time using the .Va pptdevs loader variable as described in .Xr vmm 4 . @@ -920,7 +921,7 @@ standard PCI devices with BAR addressing, but may also implicitly decode legacy VGA I/O space .Pq Ad 0x3c0-3df and memory space -.Pq 64KB at Ad 0xA0000 . +.Pq 64 KiB at Ad 0xA0000 . The default .Cm io option should be used for guests that attempt to issue BIOS calls which result @@ -1005,7 +1006,7 @@ Serial number with maximum 20 characters. .It Cm eui64 IEEE Extended Unique Identifier (8 byte value). .It Cm dsm -DataSet Management support. +Dataset Management support. Supported values are: .Cm auto , enable , and @@ -1027,14 +1028,15 @@ Configuration options are defined as follows: .Bl -tag -width 10n .It Cm nmrr Nominal Media Rotation Rate, known as RPM. -Value 1 will indicate device as Solid State Disk. -Default value is 0, not report. +A value of 1 indicates that the device is a solid state drive, i.e., +non-rotational. +Default value is 0. .It Cm ser -Serial Number with maximum 20 characters. +Serial number with maximum 20 characters. .It Cm rev -Revision Number with maximum 8 characters. +Revision number with maximum 8 characters. .It Cm model -Model Number with maximum 40 characters. +Model number with maximum 40 characters. .El .Ss HD Audio device backends .Bl -bullet @@ -1158,7 +1160,7 @@ or a similar boot loader before can be run. Otherwise, the boot loader is not needed. .Pp -To run a virtual machine with 1GB of memory, two virtual CPUs, a virtio +To run a virtual machine with 1 GiB of memory, two virtual CPUs, a virtio block device backed by the .Pa /my/image filesystem image, and a serial port for the console: @@ -1169,11 +1171,11 @@ bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ .Pp To do the same on arm64: .Bd -literal -offset indent -.Ed bhyve -c 2 -s 0,hostbridge -s 1,virtio-blk,/my/image -o console=stdio \\ -o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin -m 1G vm1 +.Ed .Pp -Run a 24GB single-CPU virtual machine with three network ports, one of which +Run a 24 GiB single-CPU virtual machine with three network ports, one of which has a MAC address specified: .Bd -literal -offset indent bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ @@ -1183,7 +1185,7 @@ bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ -H -P -m 24G bigvm .Ed .Pp -Run an 8GB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI +Run an 8 GiB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI CD-ROM, a single virtio network port, an AMD hostbridge, and the console port connected to an .Xr nmdm 4 From nobody Fri Dec 26 10:48:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd2RD19lWz6LNv8 for ; Fri, 26 Dec 2025 10:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd2RC69VXz3W6p for ; Fri, 26 Dec 2025 10:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sbslg5yy+IlxtFfi9ngL+38KeLUfXtivOL8B9S4wFk4=; b=mOTdlh81dEEzOa7FcTTWZwa8reobjjzsSMILQvussRpxSVdYu6/VqkGz8HlGSai3tyn++J LRk+Q7+5Bk0qByZVuHJWf/bN7HIoAMPTvi8nP3EwAbU8vMPKRjmihPTA6KDHroOrH75+2h IAOmtLMrDPbNBx5NA+7rOv8HANGkObEYXFZ+LKY+HB9SEl9EC4I52fjSe1b5m5yFYCf7+l CvCHfNOcwUyBwl8Ks87r1ty8v46BJfM01w+HGfk9iqsvBRJPG4IMqkiNorukPWtQxCucKS C6C7vKv1dx+gDAXptsssFljlfO1csmUbv33xg4rH9em5Tor7EMFjhRkb24gBqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sbslg5yy+IlxtFfi9ngL+38KeLUfXtivOL8B9S4wFk4=; b=NBZ/2p2FlOFIRMuUqIOV3ByALr3MzfjCbV7O6zsGxPd8XfcbdzOektHHFtAom0Mhqw0B3j DJUlsry/JYx7s8gsNkAfpxwQaM4pEffIo6aeWGrv0JlTOAPr6XkZ/KJWkP0gy5nPcU9vcp SdPmi+azhuoBxadsYvUwqU0lWgHBOpWuQUcQLhbvNco2h+j6mzTh2cAukG91P1EaxT8TnE ZIlgCmRRBzy6QG1vBl2kcoBkq0ZxrOnd7lvbkTUxsOwvSorgbkWqxHw9yIsUMAswKNS833 j2sTf4K4afKMX4hNR5RUcb5YMWCWFXkxZr3LFirXWnxMtI4X38jD6H/Va9MQag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766746135; a=rsa-sha256; cv=none; b=tIBpvxGErrsQKCN5/cHRzFjr3Bcz9t0O02rkWv3Bt5Kqmz+2kWjN4MKikRB8DQdwvckRFX vCd+jMeousqPkqU+pFnwWTATlX//yWKQy2ANjLVap7nHxMbs/ABBZAMKfg/6bCAK9lf5KY uf51Oy8ZluWBdMAEAsUNj52SFCMFYBvWyA7VKNxMOIeIH/gvEWQr7Ih6eOcoyP+ffcGTvz wS94OV4pX1xHH67A4deMjQx0bLZsh4081uIruvkeuvBaQAFyodCixYWAA5IqIoWan1HqG7 Eg1uySs27trdjQiwPEKO3EOtzLSNrRjFydLFR6hFCaN7kLeZq5BCPEV0VxFYAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd2RC5RB2z18HF for ; Fri, 26 Dec 2025 10:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e2ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 10:48:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 3e5025ea3a5f - stable/14 - bhyve.8: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e5025ea3a5f46d74bc1b9a2f793e25694e744c1 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 10:48:55 +0000 Message-Id: <694e6817.e2ca.69db476d@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5025ea3a5f46d74bc1b9a2f793e25694e744c1 commit 3e5025ea3a5f46d74bc1b9a2f793e25694e744c1 Author: Michael Osipov AuthorDate: 2025-12-21 16:41:41 +0000 Commit: Michael Osipov CommitDate: 2025-12-26 10:48:19 +0000 bhyve.8: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54332 (cherry picked from commit 5819f8b285fc55a75e5dea56ffe73b376525150c) --- usr.sbin/bhyve/bhyve.8 | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 90f34b3314f8..9f2934e27c6d 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 20, 2023 +.Dd December 23, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -374,7 +374,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a TPM module, a fwcfg type, and the debug/test device. +optionally, a TPM module, a fw_cfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -509,10 +509,10 @@ Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -532,10 +532,10 @@ are: Initiator ID to use when sending requests to specified CTL port. The default value is 0. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or not support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -611,10 +611,11 @@ address space, and any modifications the guest makes will be saved to that file. .El .Pp -Fwcfg types: +fw_cfg types: .Bl -tag -width 10n .It Ar fwcfg -The fwcfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware. +The fw_cfg interface is used to pass information such as the CPU count +or ACPI tables to the guest firmware. Supported values are .Ql bhyve and @@ -628,10 +629,13 @@ is used, bhyve's fwctl interface is used. It currently reports only the CPU count to the guest firmware. The .Ql qemu -option uses QEMU's fwcfg interface. -This interface is widely used and allows user-defined information to be passed to the guest. -It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest. -Some operating systems such as Fedora CoreOS can be configured by qemu's fwcfg interface as well. +option uses QEMU's fw_cfg interface. +This interface is widely used and allows user-defined information to +be passed to the guest. +It is used for passing the CPU count, ACPI tables, a boot order and +many other things to the guest. +Some operating systems such as Fedora CoreOS can be configured by +QEMU's fw_cfg interface as well. .El .Pp Pass-through device backends: @@ -667,10 +671,10 @@ Add as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -678,7 +682,7 @@ Guest memory must be wired using the .Fl S option when a pass-through device is configured. .Pp -The host device must have been reserved at boot-time using the +The host device must have been reserved at boot time using the .Va pptdevs loader variable as described in .Xr vmm 4 . @@ -793,7 +797,7 @@ standard PCI devices with BAR addressing, but may also implicitly decode legacy VGA I/O space .Pq Ad 0x3c0-3df and memory space -.Pq 64KB at Ad 0xA0000 . +.Pq 64 KiB at Ad 0xA0000 . The default .Cm io option should be used for guests that attempt to issue BIOS calls which result @@ -876,7 +880,7 @@ Serial number with maximum 20 characters. .It Cm eui64 IEEE Extended Unique Identifier (8 byte value). .It Cm dsm -DataSet Management support. +Dataset Management support. Supported values are: .Cm auto , enable , and @@ -899,14 +903,15 @@ Configuration options are defined as follows: .Bl -tag -width 10n .It Cm nmrr Nominal Media Rotation Rate, known as RPM. -Value 1 will indicate device as Solid State Disk. -Default value is 0, not report. +A value of 1 indicates that the device is a solid state drive, i.e., +non-rotational. +Default value is 0. .It Cm ser -Serial Number with maximum 20 characters. +Serial number with maximum 20 characters. .It Cm rev -Revision Number with maximum 8 characters. +Revision number with maximum 8 characters. .It Cm model -Model Number with maximum 40 characters. +Model number with maximum 40 characters. .El .Pp HD Audio device backends: @@ -1028,7 +1033,7 @@ or a similar boot loader before can be run. Otherwise, the boot loader is not needed. .Pp -To run a virtual machine with 1GB of memory, two virtual CPUs, a virtio +To run a virtual machine with 1 GiB of memory, two virtual CPUs, a virtio block device backed by the .Pa /my/image filesystem image, and a serial port for the console: @@ -1037,7 +1042,7 @@ bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ -l com1,stdio -A -H -P -m 1G vm1 .Ed .Pp -Run a 24GB single-CPU virtual machine with three network ports, one of which +Run a 24 GiB single-CPU virtual machine with three network ports, one of which has a MAC address specified: .Bd -literal -offset indent bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ @@ -1047,7 +1052,7 @@ bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ -A -H -P -m 24G bigvm .Ed .Pp -Run an 8GB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI +Run an 8 GiB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI CD-ROM, a single virtio network port, an AMD hostbridge, and the console port connected to an .Xr nmdm 4 From nobody Fri Dec 26 10:49:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd2RJ5x6Hz6LNnt for ; Fri, 26 Dec 2025 10:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd2RJ3DZfz3W58 for ; Fri, 26 Dec 2025 10:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+4YvAWrVHMspcvzh4dg9n5kARcTi7uFEusYml1bWFXo=; b=Q/gUv0MbsLRjigD522jiwio4LtVPJGj8ysRlsNsO49xagsvK9c7/XttaXvKDomr4HeTrKg 71yAz5NwP5gHZj8C/Ov6hmY8rPlbaU3DvdyxOSYEOOEGJgoX8oxGM0IECk1lTTWTs0jGMk wbd/RTC49OvhpWYNT8RmcKL//XlVjSM6nlgnQE2NfpxbI4KZmaH3BlMAjkdtIlc8vTRyui gUMqZbEcAK0sOGq5TSZxKtb8OvIGtfhh7Z+tLLLlLyI9uYQY7BWKK86yYug0e1x1CyWUTo ns5AmiVTi0fGH8YN7TJge/mbs91rjlBRujiZnsxYzsWrAVC4lHbrKXO7E+idQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+4YvAWrVHMspcvzh4dg9n5kARcTi7uFEusYml1bWFXo=; b=yMw8WTPe91exboMbBieS5NTGbFcEtcyIcjJnhPrqbM6xfZux2Y0vACDQu9vACXmO/1IjJj A0gOprvatGi/lkeP4LIoXwMIe+wmViJspBMlBc1yfQ7imluCzTfrI6PEaqNtnhfv0DKsGj 3YPcFInZimoR+0dh7Ny16cYxs9RfylDFI0I4TkbhTGKFE+wFnh9rFnPjtwDH6FA661ZyOu Pn3H1fcCuzHsIFk8Y5/cw0xfSHNlnsfUcUXLrrvxdpL985Du3FjgfCvHMhefVuNWSfq1Cv JUJu6j6DpNzgqOBo+jqB4kfEa8HvPQxOWMGfxySN7u5mn13Pk5zbwl0FmN8RYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766746140; a=rsa-sha256; cv=none; b=KsnCAerhtawQddTA9x15XZov56EqnYxHxzYlsc7O21hUoG91az/AkoUoUuT+IWH+6mL98K dFsevdVOeTtBj9jwKSaccE15qJy2ZSCTN93B0mVkkEfTRNl4t9X1xGvq1mkujSbO9D2D5X Z0kT4LBQshJqrnve8YXkAG6GqUJEpOIhKGQuW1e4GUpGkpPfb+2rNj0pUehAReIwyTjZiQ Bwrl6u9nSvloV7OXC1dhy0BDqC6fqZIxBQpG9nf6EUkauiPhxYfXNkeboQ09j25KCPON96 kJPSWxpp74SP070bBUNbFDBzECmEPXUo/sgWBRhQBR8eprgtsn3x87bYM7Zdqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd2RJ2R93z17wQ for ; Fri, 26 Dec 2025 10:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f1c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 10:49:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2e7699355f08 - main - pf: don't reject route-to'd too-large packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e7699355f08258365fb5f65d11ac297e20f78de Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 10:49:00 +0000 Message-Id: <694e681c.f1c3.69a3facd@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e7699355f08258365fb5f65d11ac297e20f78de commit 2e7699355f08258365fb5f65d11ac297e20f78de Author: Kristof Provost AuthorDate: 2025-12-26 09:58:59 +0000 Commit: Kristof Provost CommitDate: 2025-12-26 09:58:59 +0000 pf: don't reject route-to'd too-large packets If we're sending a packet via pf_route()/pf_route6() we check for packet size and potentially generate ICMP(6) packet too big messages. If we do, don't consider this a rejected packet. That is, return PF_PASS and set the mbuf to NULL rather than returning PF_DROP. This matters for locally generated packets, because with PF_DROP we can end up returning EACCES to userspace, causing the connection to terminate. Instead, with PF_PASS and a NULL mbuf this is translated to PFIL_CONSUMED, which does not return an error to userspace. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 755b87bcfeb7..8219aacd20de 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9371,7 +9371,8 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, ifp->if_mtu, pd->af, r, pd->act.rtableid); } SDT_PROBE1(pf, ip, route_to, drop, __LINE__); - action = PF_DROP; + /* Return pass, so we return PFIL_CONSUMED to the stack. */ + action = PF_PASS; goto bad; } @@ -9693,7 +9694,8 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu, pd->af, r, pd->act.rtableid); } - action = PF_DROP; + /* Return pass, so we return PFIL_CONSUMED to the stack. */ + action = PF_PASS; SDT_PROBE1(pf, ip6, route_to, drop, __LINE__); goto bad; } From nobody Fri Dec 26 10:49:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd2Rp0nhwz6LNMC for ; Fri, 26 Dec 2025 10:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd2Rp05Ytz3WfX for ; Fri, 26 Dec 2025 10:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5nI1hnz5fJC+ELfd5le3PdnvM5MPuYCv14Y5nn+B2Q=; b=Xol2ZND1SPRp/ZzLbvE8chSVpLb6H/duPbjaKltc1csQWH5pIAfqiNKkAPwb+1HR7fjZS3 Ngyr3DG52b11kfTka4Ur/deD9Rdxfd5ca7fAVBxnm63uBkP2BoKzUNZp1FNAQcQczicFVX xV9/rBYC40Mq89jGdg97dyG+CRevf1tsrx1YVrcvfi0FhQ/5aQsxLuwIox1dzSvXCrMuug wMOkY+7E69E2JP3VJPDz1jdyu+r72wFv3wPxEiZrz69pp4gWAvUubmjpIoSoQVIn/Wr8aw DHsLdKqmbjRBN3+FMfnyOGJX2IRjMwcrW1URWDEVQsDjsZ7AtdaLbQXaCMkXkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5nI1hnz5fJC+ELfd5le3PdnvM5MPuYCv14Y5nn+B2Q=; b=Qw03ycyr3gAPOxybUm8bEBlYZBqvSuSDpVzzERg4iq49ZnXjc0PGXtl92NS9jG0HVvPvoD WjYjc/RvkSaZ33n0ZxWIqGDcfnlVIoN5QUBFiM/nx+fT22YKnWrTxhUcsW3XQ06OWokhYH zJEC402Co3cXBxSL8CcWt/EsScvPeJr9GDiDfJiQkr9M766hlIMjQyewRu6GI2JNvOYKqR kuClW6RszxdMAY4/sJwqGa/f5lH99qZfuJgXuWfC8Gek24w7EvlsnBg92XO4x+9nWKxav1 1vV5odLSYf5mOd3WYHA3oLDMAJLRkfiqesbd0TiustCo0/wCbJT24mImZwwcPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766746166; a=rsa-sha256; cv=none; b=SSzSHvdA2e3dKhoLgSrQj6WydK2p0fWJr/+na3Ahk/61Thp6Kn/wAklsqmeLaCXRqVp0SS NSowB1ScGUe3IJ6ec0TM8ZEsYvE9ftPIkydnMkBv4YjbXeQn9iLKtjAx99DgaVi8aiLiX6 sMBEG46igBaeURBEIWuRPfqDDICrI7aY9C05dBajbAwhQ40oAxpl9h9YesaU6hoGKDYfxK p0Dy5KGnPaRSU8NmkIbrqnQKAQ1gq7niLlIbGA5Cr8Id4ZGiJ3rJFomUJfwdubMvQvAhnz sBi6EOukjrwX/If6VoCV7ohv4x5k6Buq0M3sQ5gqv2M8nQal0++a6by8Aple8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd2Rn6hNDz18Vs for ; Fri, 26 Dec 2025 10:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f9f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 10:49:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 9aca11b4b14a - stable/13 - bhyve.8: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9aca11b4b14abe47dbc605e0bb9ba2282047e7f2 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 10:49:25 +0000 Message-Id: <694e6835.f9f3.2bd92c9b@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=9aca11b4b14abe47dbc605e0bb9ba2282047e7f2 commit 9aca11b4b14abe47dbc605e0bb9ba2282047e7f2 Author: Michael Osipov AuthorDate: 2025-12-21 16:41:41 +0000 Commit: Michael Osipov CommitDate: 2025-12-23 19:40:26 +0000 bhyve.8: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54332 (cherry picked from commit 5819f8b285fc55a75e5dea56ffe73b376525150c) --- usr.sbin/bhyve/bhyve.8 | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 12b77554f404..f3cec8e121a5 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 12, 2023 +.Dd December 23, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -372,7 +372,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a fwcfg type and the debug/test device. +optionally, a fw_cfg type and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -489,10 +489,10 @@ Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -512,10 +512,10 @@ are: Initiator ID to use when sending requests to specified CTL port. The default value is 0. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or not support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -559,10 +559,11 @@ address space, and any modifications the guest makes will be saved to that file. .El .Pp -Fwcfg types: +fw_cfg types: .Bl -tag -width 10n .It Ar fwcfg -The fwcfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware. +The fw_cfg interface is used to pass information such as the CPU count +or ACPI tables to the guest firmware. Supported values are .Ql bhyve and @@ -576,10 +577,13 @@ is used, bhyve's fwctl interface is used. It currently reports only the CPU count to the guest firmware. The .Ql qemu -option uses QEMU's fwcfg interface. -This interface is widely used and allows user-defined information to be passed to the guest. -It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest. -Some operating systems such as Fedora CoreOS can be configured by qemu's fwcfg interface as well. +option uses QEMU's fw_cfg interface. +This interface is widely used and allows user-defined information to +be passed to the guest. +It is used for passing the CPU count, ACPI tables, a boot order and +many other things to the guest. +Some operating systems such as Fedora CoreOS can be configured by +QEMU's fw_cfg interface as well. .El .Pp Pass-through device backends: @@ -615,10 +619,10 @@ Add as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -626,7 +630,7 @@ Guest memory must be wired using the .Fl S option when a pass-through device is configured. .Pp -The host device must have been reserved at boot-time using the +The host device must have been reserved at boot time using the .Va pptdevs loader variable as described in .Xr vmm 4 . @@ -721,7 +725,7 @@ standard PCI devices with BAR addressing, but may also implicitly decode legacy VGA I/O space .Pq Ad 0x3c0-3df and memory space -.Pq 64KB at Ad 0xA0000 . +.Pq 64 KiB at Ad 0xA0000 . The default .Cm io option should be used for guests that attempt to issue BIOS calls which result @@ -804,7 +808,7 @@ Serial number with maximum 20 characters. .It Cm eui64 IEEE Extended Unique Identifier (8 byte value). .It Cm dsm -DataSet Management support. +Dataset Management support. Supported values are: .Cm auto , enable , and @@ -827,14 +831,15 @@ Configuration options are defined as follows: .Bl -tag -width 10n .It Cm nmrr Nominal Media Rotation Rate, known as RPM. -Value 1 will indicate device as Solid State Disk. -Default value is 0, not report. +A value of 1 indicates that the device is a solid state drive, i.e., +non-rotational. +Default value is 0. .It Cm ser -Serial Number with maximum 20 characters. +Serial number with maximum 20 characters. .It Cm rev -Revision Number with maximum 8 characters. +Revision number with maximum 8 characters. .It Cm model -Model Number with maximum 40 characters. +Model number with maximum 40 characters. .El .Pp HD Audio device backends: @@ -956,7 +961,7 @@ or a similar boot loader before can be run. Otherwise, the boot loader is not needed. .Pp -To run a virtual machine with 1GB of memory, two virtual CPUs, a virtio +To run a virtual machine with 1 GiB of memory, two virtual CPUs, a virtio block device backed by the .Pa /my/image filesystem image, and a serial port for the console: @@ -965,7 +970,7 @@ bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ -l com1,stdio -A -H -P -m 1G vm1 .Ed .Pp -Run a 24GB single-CPU virtual machine with three network ports, one of which +Run a 24 GiB single-CPU virtual machine with three network ports, one of which has a MAC address specified: .Bd -literal -offset indent bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ @@ -975,7 +980,7 @@ bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ -A -H -P -m 24G bigvm .Ed .Pp -Run an 8GB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI +Run an 8 GiB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI CD-ROM, a single virtio network port, an AMD hostbridge, and the console port connected to an .Xr nmdm 4 From nobody Fri Dec 26 12:45:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd51C0LPRz6LXgc for ; Fri, 26 Dec 2025 12:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd51B4Zw4z3jfm for ; Fri, 26 Dec 2025 12:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766753102; h=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=5bRztQdWjN/4dKyMwN8kiwGMxCaZBxa65Ng/HCc2SVU=; b=vjhXw13TJnYGpEzMlh2dw/XbGygMah6IbPWQ/1K5g4ehzo3O5rN7HFtbAl///1owUCA+RQ BvE3De6futXU8amle/Zs/VR+COkoAYksilT2Eecq//C/FtU9XkSjlK/8tUPXOPWB3Fat3E FcVXTInpYGC0KKPqlnSzJUB0tmXzLo68f8+QHtK9EipU76WjXd2jhwyxBEom3Ndac4pLJo K1NdlPFhg1GDnTAZN2+XQzkFAd6gzLJWJhU8xGsGRMhbQz6bmvAmDvHFBKK50lOidr4agz 0y9Bd/4VXPZGy6WFEX9AMBQZ3fV/nbs7Q5lEnovvj4boClZdKlnlZ7wtv9axMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766753102; h=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=5bRztQdWjN/4dKyMwN8kiwGMxCaZBxa65Ng/HCc2SVU=; b=xY44shASn1WDzFUNqZRYFzNDe3jtYYdmXJrgiXMrPqCbxU8jJWVny4cAfdbmikoB438Q2b Qpwz5Z5EEz03iWIiw/pxvUasv9IIhYnvWIaW/8VkK9XHTZ3F/yq9HXGfQGJKZ09DZukswB UvOJPFij91MBiJ4GlW8yduk5zvTnPIOg8tclcLEvX86JgUnl8opTrjEtNhyWONI6Km4H5b F+HiBNcZDPZu1OBUqlOFFN16fuSFPcp5bBWyJgK0qUPe+16xl8Zxf5pEyiTrCY9mj0MKCD VZWulQlWv6EFihjt8s2DYcPcJpNKnho7tVzGyS8htUQQsDqtWjGju0GDssnrCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766753102; a=rsa-sha256; cv=none; b=i1w9QCbRptTJp7npQ85YFWZqNgfZRngtD6Y2rs4bUpnszYVHcwQPEHr3hYIqTBcwSJcAU2 6zJI5si9VDdQKf4YXoIPXVKcBJTp6OUG1Hc31x9JUEm/yYyhnOwvDUUxKlTB8vR44xYEn5 J398JhVPKIZP/MCCIZ6UUkLbWoV7uH6N8QIrs5TGazJmRON8uEBvxKhHAn6dsYGUBugrYS kgFNkRZRZcduGYUwZ5LCtw4TECUhHkVjlcFMHeMw1fNVXAC9BXIiwTrePL9Bum41LlL460 3D6p/korsP8yTo76rFutoW+a5QgOP2FrfgQVyzVrM5FYfM/uLmo6L9gn3O1Ycg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd51B3Jf3zl for ; Fri, 26 Dec 2025 12:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 12:45:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Simon Wollwage From: Kristof Provost Subject: git: eaa424e3bde8 - main - snmp_pf: remove errno usage after pfctl_get_status_h change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaa424e3bde88f005c91f87a799c1905f1a5ebf5 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 12:45:02 +0000 Message-Id: <694e834e.30a7d.557e5bfc@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eaa424e3bde88f005c91f87a799c1905f1a5ebf5 commit eaa424e3bde88f005c91f87a799c1905f1a5ebf5 Author: Simon Wollwage AuthorDate: 2025-12-26 10:47:26 +0000 Commit: Kristof Provost CommitDate: 2025-12-26 10:50:37 +0000 snmp_pf: remove errno usage after pfctl_get_status_h change pfctl_get_status_h() does not set errno, so don't log it. PR: 291936 Reviewed by: kp --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index b62ecf791500..f01218bee5f8 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1288,8 +1288,7 @@ pfs_refresh(void) pfs = pfctl_get_status_h(pfh); if (pfs == NULL) { - syslog(LOG_ERR, "pfs_refresh(): ioctl(): %s", - strerror(errno)); + syslog(LOG_ERR, "pfs_refresh(): pfctl_get_status failure"); return (-1); } From nobody Fri Dec 26 13:27:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd5yS0kxnz6LZwT for ; Fri, 26 Dec 2025 13:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd5yR5Mm4z3mfC for ; Fri, 26 Dec 2025 13:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766755663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FNS3iq4NP+ABxVAx44KGsrPf6uW5S1x9d3yMwe3p+vo=; b=L3mbwlvKCJLOuOzDm2d5SxZrznTzH6zE7N0hAsbHup/IM+gZ2NGQQvYKAJYHMwPMYQRo8t +iXCblqcmROP4BPNlDFOgGShla0GOs0VlDPVqIimYpb1B0KPGc8YGm6juRwWKkE9jrfWpe 6vgPzZsYMG+9GyG4fbhFe6gjiAl9nFioLlUL2qOMs/gEUJw3zVFwP1REeyPZFm876vata6 /w+5dn3vhpYxLGcUYHANOoWHxdCSedZlHDTWlWWaz39qdSHNdqnufbSM4p6YcTwpRO8REC cljAtSRexTuMEJtR/NwdF5BJr8JP3An4N+bplTprG1nejbrhrtqxR3cmXz3p/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766755663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FNS3iq4NP+ABxVAx44KGsrPf6uW5S1x9d3yMwe3p+vo=; b=jsywjONdB502GmZnxe/ps8Ws0vAoJRSh4UjmCZrKC2o8serVEzvwvaB2gRSfJiT+NKZdkj zdNU1Ippj2rHIvlstT0MjJAh+CaANTeUlYv9m98kFIaZ/A33ovMNjTz1pCrQJUBw2zrxtT nwbuWEN1WHvwZbWZ165AImur0ts2LrsZuWeP633/pm11Op7FMNxeh7AdgiFSFwILBhqk4k 5yVQYsBnuQ6cbrZXrWrq3girL40fG+wM1i6auhD+ZvFzgPaVc6K36Vw1Efb/J+fSRaGHl0 k2RwLWBmA7yak4wV6nmZ3jP0I9yBsWuutaw8kxduP5NmiLnzm7Gooa9tup9n7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766755663; a=rsa-sha256; cv=none; b=H1K20RWm+z3lrwczuItHBDhDpX4xrF3G62uoCMpGluF/MvRYLn+xE4sNXie223gMtXKt1V i0+kNhmpt79KEFEfupcHBZnOntQqILa/k717B1olcjjC0UT7/OkMkM9RmVxbvQaHms46H+ U64+SGaBJMyTdW5a65XLM/zK5+fDz3leOrx/CVNLAjp0/25aAJfwJCm3JIPsv7+HS6/Grn d2XlOQcivtoqGjxOp2mXBX2fLJg13MRgXIFPllIWhrjdrk3+mH2nxh4xdvPZ+0lndC+NUq bChUIgdYNYeh440Ts5sqt7us56ziY9C82y4LvI8IGRbSvgh16xp8FXsymcrp/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd5yR404hzsp for ; Fri, 26 Dec 2025 13:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36cd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 13:27:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3054e22e4524 - main - bsnmpd: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3054e22e4524df24908d7e9379681c1ccf829b93 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 13:27:43 +0000 Message-Id: <694e8d4f.36cd8.4453ffde@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3054e22e4524df24908d7e9379681c1ccf829b93 commit 3054e22e4524df24908d7e9379681c1ccf829b93 Author: Dimitry Andric AuthorDate: 2025-12-26 13:27:08 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 13:27:23 +0000 bsnmpd: avoid warnings about too-long initializer strings Mark `UTC` as `__non_string`, to avoid a warning from clang 21 similar to: usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c:339:29: error: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] --- all_subdir_usr.sbin --- 339 | static const char UTC[3] = "UTC"; | ^~~~~ MFC after: 3 days --- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c index 354ea2ece83a..3957e03a0fe3 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c @@ -336,7 +336,7 @@ static char * snmp_date2asn_oid(char *str, struct asn_oid *oid) { char *endptr, *ptr; - static const char UTC[3] = "UTC"; + static const char UTC[3] __nonstring = "UTC"; int32_t saved_errno; uint32_t v; From nobody Fri Dec 26 13:38:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd6Bk4xpnz6LbwT for ; Fri, 26 Dec 2025 13: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd6Bk4FnVz3nmR for ; Fri, 26 Dec 2025 13: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=1766756302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWTb2npC/+9M+fBUz7UhheYwFPCSLbsgTkj4JCMKEpU=; b=PZJLkWkU7vAXoKYj4rxN9+gzL/yvFpj+v9MSXuZLlneJSHfhdd6SsXZvoffXcaSrXBlAZP kTSZBQwCDbH/TUnsbdumPRG1s2E2stmMzO/3VwRnOmyztC0Muu0Mr2LIlFbvI/mwD1Bi9n b8zJYmSZPuqjMrtN0nXN5UCKsO1lyIMazT6bCL/Ki3XwSmaAEko7l0nydGXXJU0XH9Kn+K +Vw2KGtX/7GUFPIZs7janlZAR0Pm8/QLS5GG73aOT4vkK60XMR9HnhFOLwLomND9zzLziF 2o5YSIfhjfubIC9hdz3Sod5RATKP17h4ms6YAdQ/A2F9hY3RnccF/AYMPmyQzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766756302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWTb2npC/+9M+fBUz7UhheYwFPCSLbsgTkj4JCMKEpU=; b=mLvPoxqbt5BFd9+vv9t0LuRboNvsmP9n8C+hbHJKeCP2gm5cyBPCbNgBMWOqNuA9Gvdxc3 ZmfZQ2yH5AjcIzldLFbyOhwnSma76sbaBXUFbnt8tar69Xt769Yq1SBmNXckogBrhyczd6 djbt5FxpDWiq+TaiLoiioE7LAOm/XcIuIQHAN65ZKxPkObTPY+JiQHpNvukl7DE5v+ouyG A+7MhzPjYWUMhEu3Wzo8woPBP+xD/Zk+6rZg6Gtoxp5GriMaLdjU0fd4DMXMKmBmOpeKJ0 JXiigAm0Nr3sdVwVUfQKdBmQVzcAmpSJNUJ2MlPsUT0uw6eKDk1+Hl1z8Akh6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766756302; a=rsa-sha256; cv=none; b=l2lIS/mM+8sstMgi29L/4jYzzLciiOYYzzWCYpV1sGH4AROfJ/5vJDySLNbC3r7PVw1OpL 8xYL5BMJysXzV3EhMmFoK3EnmZOWuUE8GLaKvyNALOFnj8XYeYSI8iUWH4GQ/+gVBpa65t VTI3HCLvTDhHxfGTvxAt1aI4ac/+MjYiT/tfEj3KdQ2hlpnqt89BfZvxqZxJZgJ7uT0sLj wKHtIyzCMJ3Qr9CcEwd2ETPESYcItcmuo7Y4CkedQJLJ7EhxexjoBZGnbqBun8ppJ31lkm eeafNRrM1QsS3DuiQdLJzckI3EWGfB8NJTLcJ4Go7sXEyU3+mQ0aQ/BYjacA4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd6Bk3gzbz1Cv for ; Fri, 26 Dec 2025 13:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37cac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 13:38:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: cd880010c49a - main - pmcannotate: avoid accessing uninitialized local variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd880010c49a5d4ec529f4204d4e88cd27727255 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 13:38:22 +0000 Message-Id: <694e8fce.37cac.105dfcc5@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cd880010c49a5d4ec529f4204d4e88cd27727255 commit cd880010c49a5d4ec529f4204d4e88cd27727255 Author: Dimitry Andric AuthorDate: 2025-12-26 13:37:47 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 13:37:53 +0000 pmcannotate: avoid accessing uninitialized local variables Initialize `tbfl` and `tofl` to NULL, and check whether they are non-NULL before calling remove(3) on them, to avoid warnings from clang 21 similar to: usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tbfl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:57:9: note: expanded from macro 'FATAL' 57 | remove(tbfl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:12: note: initialize the variable 'tbfl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tofl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:58:9: note: expanded from macro 'FATAL' 58 | remove(tofl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:19: note: initialize the variable 'tofl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL MFC after: 3 days --- usr.sbin/pmcannotate/pmcannotate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c index 5958ff615e4b..6f3e121b4729 100644 --- a/usr.sbin/pmcannotate/pmcannotate.c +++ b/usr.sbin/pmcannotate/pmcannotate.c @@ -54,8 +54,10 @@ if ((ptr) != NULL) \ perror(ptr); \ fprintf(stderr, ##x); \ - remove(tbfl); \ - remove(tofl); \ + if (tbfl != NULL) \ + remove(tbfl); \ + if (tofl != NULL) \ + remove(tofl); \ exit(EXIT_FAILURE); \ } while (0) @@ -702,6 +704,8 @@ main(int argc, char *argv[]) uintptr_t tmppc, ostart, oend; int cget, asmsrc; + tbfl = NULL; + tofl = NULL; exec = argv[0]; ofile = NULL; bin = NULL; From nobody Fri Dec 26 14:32:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7PB3wnpz6LggL for ; Fri, 26 Dec 2025 14:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd7PB0Bhzz3sBM for ; Fri, 26 Dec 2025 14:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766759550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DcB2ZMq7R7Og8IrpPlsGXAWxgG7yku2q8bmuVU6+rgo=; b=xcJSvVEvIAgBlbVCaJA4WU0zCvZFwe7hpZkA4516gnwSLcCiPgoVjocCCo/w5zraxKaf6c PvQe9OXzJ7GPiVGLD9tP/Ikw7mEH4MQUN01xRmv3DjIXVC4abxgC+1zoUEw0UWk6tlt7Rn B+gxrstHe1GLnUARf7TdKOj5XwIVrzRnzXk63TMOOW22aeBhttdCfHuEO/ltY7Z2dVkkmD yAy59yGUxP8XPQ6wmZQY6hOANtejx3eo3OLgsfQibamMl+FK1iT0ItS6lrnJr7OaRbF5Kq /ElkoQtUL8RXed3FUAc1H1oUlwF2nJXxtTqc+BDsfB70y+dXjK78vBdEmbislw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766759550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DcB2ZMq7R7Og8IrpPlsGXAWxgG7yku2q8bmuVU6+rgo=; b=I9y+aUMsYRcs9S7ICrradIOp/z1ECXc5Iy5LGBZD5BS4azW+1NjqQklXMcYtAg4mhRXiU2 aDiQyVlER4w9gb4iI6H8VJl64OAjRwOlO8kFZLLAdFFp/i+WVfMX6xDvYw4YMotgMe/14b 3k7YzhJEK1QrD0p27JrpoW9lhKKZwUyKGz/vpLyWaI5QTMChHyLyqKD6XlQSMS+7PDxB4X lUgyjmcdGNbsdjHpGjql2052rId1LmkKZcyZhx9a9VVkqL+CrMhCRmu8xaMFPn7EW7OTfb C0MGMK2le68s2fkZ7ldoVSXnSfYsZ5fOsrLi+lNyzweWF4YOv1UoAoXRaJpyEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766759550; a=rsa-sha256; cv=none; b=nwgow2pYtyT4jmlF6YhwztgO64ptXstDOVAxjjSmlaalcCObKwDoOHwRaw+nbTDMPwxeAx acZT05rIqO4s9x34T8GOpY58zPGbn4XoEeXODY8/Y2BVdNQLEM76h5IsAhiv4KCk2mu+kU uTJeGDe0YkGIC1axkExMgrMyOSRnhyL60Gbx+frELKQPgordh3r92EsGopUBzmdsdRBvNa FKwKqyQkSX8y0wqNXRak/QSfRyOFmPhNTORKFp6/iwtmPh5EdFKmOLpX+l7gIa7udwgwgF ENHAqgFFvrJr9imiIg12F5vDPCKEah0eWv0QTlGlbddmcFmWVqH2+WhwSgJ1dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd7P962qMz1nn for ; Fri, 26 Dec 2025 14:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cfe6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 14:32:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e2c93ed09f25 - main - sys/font.h: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2c93ed09f259ed049923bdaa9b697b3586e2f1a Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 14:32:29 +0000 Message-Id: <694e9c7d.3cfe6.7a265e1e@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e2c93ed09f259ed049923bdaa9b697b3586e2f1a commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a Author: Dimitry Andric AuthorDate: 2025-12-26 14:31:43 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 14:32:09 +0000 sys/font.h: avoid warnings about too-long initializer strings Mark `font_header::fh_magic` as `__non_string`, to avoid a warning from clang 21 similar to: /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error: initializer-string for character array is too long, array size is 8 but initializer has size 9 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 763 | .fh_magic = FONT_HEADER_MAGIC, | ^~~~~~~~~~~~~~~~~ /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27: note: expanded from macro 'FONT_HEADER_MAGIC' 109 | #define FONT_HEADER_MAGIC "VFNT0002" | ^~~~~~~~~~ MFC after: 3 days --- sys/sys/font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/font.h b/sys/sys/font.h index fb5fbbc9e557..d486dbc3a011 100644 --- a/sys/sys/font.h +++ b/sys/sys/font.h @@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t; #define FONT_HEADER_MAGIC "VFNT0002" struct font_header { - uint8_t fh_magic[8]; + uint8_t fh_magic[8] __nonstring; uint8_t fh_width; uint8_t fh_height; uint16_t fh_pad; From nobody Fri Dec 26 14:49:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7n95gCwz6LhRF for ; Fri, 26 Dec 2025 14:49:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd7n958KSz3t7t for ; Fri, 26 Dec 2025 14:49:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766760589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sNrYBCEnBy9zLdLMgPOyA6pM1Wg+rw/EsYjvz0AmDMQ=; b=gz7ulxQ3EIGj2tDe1UMxdHTWKadURGd1uQri+x9Fcs7pqqy6UWXheORGmkRGQDv2Zd0E0T 9vcxUtdqQcmJm0PKSqaJS+A4QSU6NlwZEBGghDo74XFEeOi41SRfL7zfR4l78txXohFTWv nImEmTM3sFxFNyxKZk0VtS2Q82wza1Pi1oT/UNJKwtCymNud72E4Uwy8oyfiqMHtiske4X yg5xhGwQibk2p+eMAoYVtYWiAhYDcAnQj7iE0nL6tbOxw4HBbEL4pblRg5yQEvbOv9Ger1 0/bHlPGdTKWNIfBTVG+4UqrX6A+qlvbAbInajakchqTGAUemfqEi8bkEgI8s+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766760589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sNrYBCEnBy9zLdLMgPOyA6pM1Wg+rw/EsYjvz0AmDMQ=; b=YR1029nUbkt2Aic3T0IKGI9VC+Afj/PQbPM2s6iJVRNWWBzZmFc2DywLlwuPZKDWh7Ipzr l603XuCd/W9D/ohzjZ8c85O5NFGe9chYdu3QFcTdi/hlbeOT/Yuoy4fcobZdUvIa4t56KN U5TZBGYc+w3gMDBMmVQt2rEX6nPNcN0SXCEunL+9f7jtrkMY6+1sj99TM5c6ARUWREPD/C tFQWntrlYzTBWJ80FuBNCY9txztxJQOV6CWYJVoQ1FNC9b8yURoQseENzLN/r//Q4faFXN GgHaHzMnzwurflwNCbjSV0UtfJL3JhZf/skb7I37ZPhRzw0b4hmcV5PNC69hYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766760589; a=rsa-sha256; cv=none; b=n+udBl8Ces52XoGeMKz0N/C0f6iopXUjYyPVVnm1BMCIhrtnkuxYC9l1DZ1eCMBGHzR0Zf awnwfQ4o1+3Ro0CnWNIdiFZVPCkcMdZ9cURQIEB142zeB4FNfMvaJFdtSl10keHs3bdxB4 /CU6gNSDtVgjTQdgzXwmXFV6BN9CuyybtgIDkhIIZ9tYRt9KzuhNgnb19S62yZBxpfvMLV 7F37fLy6tnEP0e7u88NXKXtpoMV3O7lg9he3feFLxmrueJxyqW4a+B/AMkGCVO7wpiKogK HRkUxDgI6481RmekA4zkeWgPqrh4F4q88X9OBkup4X9gzCjfA7GgPhjisJod8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dd7n94B81z20X for ; Fri, 26 Dec 2025 14:49:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-4ee28771052so10754171cf.1 for ; Fri, 26 Dec 2025 06:49:49 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCW8EcAB91maTJZRUXGmFsAbN4IzHBlt0b3DFL5Z1U35lt8fsPF9G1bA+DsG9u62mghlrH9yvTBXjlgyHcu1p8Xsl57P@freebsd.org X-Gm-Message-State: AOJu0Yz1Gy1LrNVtgtLGQgR/XsO9SLn05UGFnmbxotx/voYHZVrOPKRP 1v+7qoTpb0eD5VF1Fj4M66w45Rn5T932CspH1pZEVHHWkH9nm2ZFvX+EDQBf0GY/lgluMcCbkX9 jI2xRg3sNu1quFsbYmzL4jxjuSzd9U4s= X-Google-Smtp-Source: AGHT+IGPeuEvw7OsptB2WriimpjBc4EiExZH1q4tEqTEHO6rrH3ujq8UuMVWQbd+pNkAAvqkmssE0y9+bf/TsOPMEoA= X-Received: by 2002:ac8:7c49:0:b0:4ed:b409:ca27 with SMTP id d75a77b69052e-4f4abde36bemr250832201cf.10.1766760588647; Fri, 26 Dec 2025 06:49:48 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <694e9c7d.3cfe6.7a265e1e@gitrepo.freebsd.org> In-Reply-To: <694e9c7d.3cfe6.7a265e1e@gitrepo.freebsd.org> From: Nuno Teixeira Date: Fri, 26 Dec 2025 14:49:36 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2qolrvoDP_lFGHpWTFhFfcN09pXHodSQbymIhTHmA04-ZtgVcUoS5lnN98 Message-ID: Subject: Re: git: e2c93ed09f25 - main - sys/font.h: avoid warnings about too-long initializer strings To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000004a20fd0646dc01a2" --0000000000004a20fd0646dc01a2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Dimitry, I've just spoted by luck that world fails at this commit: Building /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/usr.sbin/zic/_debuginstall In file included from /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:32: /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/font.h:111:22: error: expected ';' at end of declaration list 111 | uint8_t fh_magic[8] __nonstring; | ^ | ; Cheers, Dimitry Andric escreveu (sexta, 26/12/2025 =C3=A0(s) 14:3= 2): > The branch main has been updated by dim: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3De2c93ed09f259ed049923bdaa9b697b= 3586e2f1a > > commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a > Author: Dimitry Andric > AuthorDate: 2025-12-26 14:31:43 +0000 > Commit: Dimitry Andric > CommitDate: 2025-12-26 14:32:09 +0000 > > sys/font.h: avoid warnings about too-long initializer strings > > Mark `font_header::fh_magic` as `__non_string`, to avoid a warning fr= om > clang 21 similar to: > > /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error: > initializer-string for character array is too long, array size is 8 but > initializer has size 9 (including the null terminating character); did yo= u > mean to use the 'nonstring' attribute? > [-Werror,-Wunterminated-string-initialization] > 763 | .fh_magic =3D FONT_HEADER_MAGIC, > | ^~~~~~~~~~~~~~~~~ > /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27: > note: expanded from macro 'FONT_HEADER_MAGIC' > 109 | #define FONT_HEADER_MAGIC "VFNT0002" > | ^~~~~~~~~~ > > MFC after: 3 days > --- > sys/sys/font.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/sys/font.h b/sys/sys/font.h > index fb5fbbc9e557..d486dbc3a011 100644 > --- a/sys/sys/font.h > +++ b/sys/sys/font.h > @@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t; > > #define FONT_HEADER_MAGIC "VFNT0002" > struct font_header { > - uint8_t fh_magic[8]; > + uint8_t fh_magic[8] __nonstring; > uint8_t fh_width; > uint8_t fh_height; > uint16_t fh_pad; > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --0000000000004a20fd0646dc01a2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Dimitry,

I've just spoted by l= uck that world fails at this commit:

Building /usr/obj/usr/src/amd64= .amd64/tmp/obj-tools/usr.sbin/zic/_debuginstall
In file included from /u= sr/src/usr.bin/vtfontcvt/vtfontcvt.c:32:
/usr/obj/usr/src/amd64.amd64/tm= p/legacy/usr/include/sys/font.h:111:22: error: expected ';' at end = of declaration list
=C2=A0 111 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint8_t =C2= =A0 =C2=A0 =C2=A0 =C2=A0 fh_magic[8] __nonstring;
=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^
=C2=A0 =C2=A0 =C2= =A0 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;

Cheers,

Dimitry Andric <dim@freebsd.org> escreveu (sexta, 26/12/2025 =C3= =A0(s) 14:32):
T= he branch main has been updated by dim:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3De2c93ed09f259ed049923bdaa9b697b3586e2f1a
commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a
Author:=C2=A0 =C2=A0 =C2=A0Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-26 14:31:43 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2025-12-26 14:32:09 +0000

=C2=A0 =C2=A0 sys/font.h: avoid warnings about too-long initializer strings=

=C2=A0 =C2=A0 Mark `font_header::fh_magic` as `__non_string`, to avoid a wa= rning from
=C2=A0 =C2=A0 clang 21 similar to:

=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: = error: initializer-string for character array is too long, array size is 8 = but initializer has size 9 (including the null terminating character); did = you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-= string-initialization]
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 763 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0.fh_magic =3D FONT_HEADER_MAGIC,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0^~~~~~~~~~~~~~~~~
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sy= s/font.h:109:27: note: expanded from macro 'FONT_HEADER_MAGIC'
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 109 | #define FONT_HEADER_MAGIC=C2=A0 = =C2=A0 =C2=A0 =C2=A0"VFNT0002"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0^~~~~~~~~~

=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 3 days
---
=C2=A0sys/sys/font.h | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/font.h b/sys/sys/font.h
index fb5fbbc9e557..d486dbc3a011 100644
--- a/sys/sys/font.h
+++ b/sys/sys/font.h
@@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t;
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 FONT_HEADER_MAGIC=C2=A0 =C2=A0 =C2= =A0 =C2=A0"VFNT0002"
=C2=A0struct font_header {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fh_mag= ic[8];
+=C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fh_mag= ic[8] __nonstring;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint8_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fh_wid= th;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint8_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fh_hei= ght;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint16_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 fh_pad;



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--0000000000004a20fd0646dc01a2-- From nobody Fri Dec 26 14:53:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7s05dTHz6Lhxf for ; Fri, 26 Dec 2025 14:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd7s02Q2Qz3v3L for ; Fri, 26 Dec 2025 14:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766760788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxQNTlEUUmo+ceYW62dUXqopB1E+scR/5uWY2l5eSus=; b=Kw5uomvJgqk5gf9b9eLqjZS1ORGGUy2VKbQkG8D9JbYgw9FhqDKJ67WQHSLBiJN29S/cjs 39f36JwLc8RiGG1u4ilbzbnDMVVFYiGRqHUMpgls/61ggvnblvHSQe6NbCH9DRtyhYZcPq 2PUb4dnPZDm8qn62yS40g4KsaUiu1DMosXb9GZttDFN2ycqAGPQ1ooIT8x3emheXoAeDs6 aMmPX+/7wxYV1NDn5Nb7VrbuFzj4p+8QNoqELo0VEx4CLm8midA0Skb0osI0CKcU9CCHCl qZe6JK01rwNNLHCcA+aCU3D5bHRHt4UgWPFWqQez+PAJkYvGTfsHACCe8y1ssQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766760788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxQNTlEUUmo+ceYW62dUXqopB1E+scR/5uWY2l5eSus=; b=Qw7TDeisstzWWAXzqQhfxXefeB9RsyVyEkcZNh/HOa94QrGC8hJ0IH6zbb9Y9pxK4UxuqU aLfpaCCaq18xVxC1y6Y0f+XwhkHq3fC6DM5kBAoyB7kv6Q8f25Y/lVXvuY7f6jsbyTdkTV NmoCw1uxJPEmc6B4RrOkOdRnqzXYydkfeKSGE6k3vGEFLWFS+ltUbx+P+grV19qdJ5mRHL nFk2xlL4+znhiufw5nVdmBLpK5Pemzrp9pAEfbkv7HZREoqnvUf96KS6oHs7adjVeEx/lO dbA33TqEe6Ruh5940RUk+o/+sHZ8Lr7bMcD/tA14gRx7JHuhw/KdPs0nBctOog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766760788; a=rsa-sha256; cv=none; b=Jy5MiB03Bt3HSk+yWotQrBVEO1VzLp/sxEPqHlIIiyDs3RQ1Hgfo4eTy5bxXdTGZbLFvLj o+Ihycr6KtIjL3Tor1o16CtZf4OzoKDj2vGD50JEiOQjduQQiYHwcJIDadKbVGToodEgWp DFNTYGsYXNfsmY3G9kqVodaiKS1/KCOQLMFTlbfScTwRAX/A44l7+KerkUSnqgc+kQzej/ 7W4az/dOQgHsWjpy+LqFJVD31wt327+5cI2NH2aKtNjSH3KKcQxdXSYc+iLLofOW4QPWDu UH44/pWqlYw1tFMTt0QyUT2XTuQ+i/FSpdDcbXLj/ub2ZfopVkputeG4aRlHWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd7s021Yrz31M for ; Fri, 26 Dec 2025 14:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fdc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 14:53:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 66604463e737 - main - bhyve_config.5: Fix consistency and terms in manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66604463e737f4754ae6268171031ceefc226837 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 14:53:08 +0000 Message-Id: <694ea154.3fdc0.7f0570a5@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=66604463e737f4754ae6268171031ceefc226837 commit 66604463e737f4754ae6268171031ceefc226837 Author: Michael Osipov AuthorDate: 2025-12-26 12:12:03 +0000 Commit: Michael Osipov CommitDate: 2025-12-26 14:52:47 +0000 bhyve_config.5: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54370 --- usr.sbin/bhyve/bhyve_config.5 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 3dd24ca5fe69..b511d5ef6bfd 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 21, 2024 +.Dd December 26, 2025 .Dt BHYVE_CONFIG 5 .Os .Sh NAME @@ -135,10 +135,10 @@ All variables will be persistent even on reboots of the guest. Generate ACPI tables. .It Va acpi_tables_in_memory Ta bool Ta true Ta .Xr bhyve 8 -always exposes ACPI tables by FwCfg. +always exposes ACPI tables by fw_cfg. For backward compatibility bhyve copies them into the guest memory as well. This can cause problems if the guest uses the in-memory version, since certain -advanced features, such as TPM emulation, are exposed only via FwCfg. +advanced features, such as TPM emulation, are exposed only via fw_cfg. Therefore, it is recommended to set this flag to false when running Windows guests. .It Va destroy_on_poweroff Ta bool Ta false Ta Destroy the VM on guest-initiated power-off. @@ -284,7 +284,7 @@ Intel e82545 network interface. VGA framebuffer device attached to VNC server. .It Li lpc LPC PCI-ISA bridge with COM1-COM4 16550 serial ports, -a boot ROM, and, optionally, a TPM module, a fwcfg type, +a boot ROM, and, optionally, a TPM module, a fw_cfg type, and a debug/test device. This device must be configured on bus 0. .It Li hda @@ -494,7 +494,8 @@ or .Dq hd . .It Va nmrr Ta integer Ta 0 Ta Nominal Media Rotation Rate, also known as RPM. -A value 1 of indicates a device with no rate such as a Solid State Disk. +A value 1 of indicates that the device is a solid state drive, i.e, +non-rotational. .It Va ser Ta string Ta generated Ta Serial number of up to twenty characters. A default serial number is generated using a hash of the backing @@ -574,12 +575,12 @@ Settings for the COM3 serial port device. .It Va com4 Ta node Ta Ta Settings for the COM4 serial port device. .It Va fwcfg Ta string Ta bhyve Ta -The fwcfg type to be used. +The fw_cfg type to be used. Supported values are .Dq bhyve for fwctl and .Dq qemu -for fwcfg. +for fw_cfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. .It Va pcireg.* Ta integer Ta Ta @@ -656,7 +657,7 @@ IEEE Extended Unique Identifier. If an EUI is not provided, a default is generated using a checksum of the device's PCI address. .It Va dsm Ta string Ta auto Ta -Whether or not to advertise DataSet Management support. +Whether or not to advertise Dataset Management support. One of .Dq auto , .Dq enable , From nobody Fri Dec 26 14:53:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7sg2d0Fz6Lj8V; Fri, 26 Dec 2025 14:53:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd7sg1qNPz3vgd; Fri, 26 Dec 2025 14:53:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766760823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Gi5T95f7Aig06rMsi5OelR0KLq4TjsiAgQCvAoZojQ=; b=Q4E2oyvFNOGzoPQFLFR8f/FeMxQR/KExneIrZDzRCK0ufQDYgxBJd0j1v8ykFGJ17AQk1X N+FR6OuILmFd2r89VD2xw7mV5vCc+JN5a8jKzy1KqkPSr++WrqMWlBeGiaBRl5QPYMazBU RVzshwLNk71m5pJYjY4Qj93N9xARPOJztQn7vuAozZdBvIShcMpHaklb8b9ejR30oq4vQn PZvzaBnXS1rclTlHtPOsDJJJ52G5JA5Z8ERtzVmZGBo52xrHil+52W9E4mtsTiQ0A9UuFn 9JX1yfrKNWydOeMBkKzgqGm/G9MveSea9cPVHAnhnNhqtvenZgqd2THsr968fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766760823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Gi5T95f7Aig06rMsi5OelR0KLq4TjsiAgQCvAoZojQ=; b=D2jsGnzqyinxgcKMD7yZKp5BLcrQGsDwcl7yuetTB+qhPS3ACCvQlSwl2o2kjPfMGuBovo +aBY42pJMoPhPmxPsljAqv6KD0kMki/2HLx/Pa2cVPaZ9MkL65T3OJV+fVK9I+3ocFlVe0 p4ifLersilemUgJ5MXIaq6BAzLGSaYF2spZMMWMkypILWRwFoBow0d8ZGlbIXdU8Om7fAs feRaI2G4sI03h1EtUywixg9IQFav1ki0K9j7fmg8PlB2PBFXCW8Y30ErEC+z2z0SxGg3VO ayxM4A5/tAm/XTQipbhOZfITPXiNJODevBMefhMw9s4pLwCfo2fsH783k7Dw/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766760823; a=rsa-sha256; cv=none; b=WGf+ILzMGtImEHjkcTPLS2dRCvd/FKgdZCfCDUw8Mnexc+J/Gt0WKm+ia53Qg6vJcfnH2g kvh9Yn38TIVxvIG42Rvx+iwMHJvJvwnS/5X/hg6KTAN/lwXxrHcOG+HhqkqTN+YUNfr1qK LqM14tfFoq7IdBfVdaewVg6ALyStSAKeRqaQlqj/faAimMwgYVXyz9LE6TLmUzK9mr4NhF jg6g5883RJT5ecph9JTqdg7HFh5ognHKyUI4T7i8hfwMaM86/HD6S0bMPZ2GZAJpfuluy1 mVBHJQ2M+YzOwX6D+0nMIbA04JMNK3hUFiS2Gh3bRd3bFjf0SYWgqHinUMsalQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dd7sg0Kfnz20h; Fri, 26 Dec 2025 14:53:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 1592951468; Fri, 26 Dec 2025 15:53:42 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: e2c93ed09f25 - main - sys/font.h: avoid warnings about too-long initializer strings From: Dimitry Andric In-Reply-To: Date: Fri, 26 Dec 2025 15:53:41 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <5FAF9BAC-37B2-4B13-9146-65401C067BAE@FreeBSD.org> References: <694e9c7d.3cfe6.7a265e1e@gitrepo.freebsd.org> To: Nuno Teixeira X-Mailer: Apple Mail (2.3826.700.81.1.4) On 26 Dec 2025, at 15:49, Nuno Teixeira wrote: >=20 > I've just spoted by luck that world fails at this commit: >=20 > Building = /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/usr.sbin/zic/_debuginstall > In file included from /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:32: > /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/font.h:111:22: = error: expected ';' at end of declaration list > 111 | uint8_t fh_magic[8] __nonstring; > | ^ > | ; Strange, I did a full buildworld and it worked just fine? Are you using = any special configuration settings? -Dimitry From nobody Fri Dec 26 14:59:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd80q4g44z6Lj7X for ; Fri, 26 Dec 2025 14:59:55 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd80p5LFQz3w0c for ; Fri, 26 Dec 2025 14:59:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.161.50 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-65d132240acso3853928eaf.1 for ; Fri, 26 Dec 2025 06:59:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766761193; x=1767365993; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BPhdsS6ulKo9HCnLTZsgHh24LLEzfs0EawHXlY4CT4A=; b=bu7hLehQD13vIshfn6mJuVeyp1NwgLWZNqtKSz+mric7MTatSuYPTSqfo2cYNfoRfS JeHrq3tRtBlfG3CZwVdLUevEKwQkY0TymflqcspvuEYPPdTumwk5GoV84sguGwDMBcyT Q754JzlIYReyIVfS6oCSqcM/6K2ZTzxKwQ1hSdrwOjUP8oIW1q9cSY1Ti9q9/Tu32gMC 9i7qK2H7dGC3H9XdCSK6HQ0wQDrdcBKJ5gLxN5bqyzYFEnXRRoaXmJXJMC8THKzikCwP jDmJtqEuHWfXwql7wwnyt96qEg0bug6GxADAEG6ZdKHFGci9VLzipTMaJLUX9oyeOKNw gTeA== X-Forwarded-Encrypted: i=1; AJvYcCWbnJjK7n/Ceyfr+5kBOej7uMVZnGt9GsnJWgETDFNLSgsFZkJoWIzspa0UlWIOC+JcQbQCHynGgt5B8ciSmgtd10gD@freebsd.org X-Gm-Message-State: AOJu0Yzyzgoyg0wUMG0LN6I8JM/W7fjbNfAN38l2iUe9VCb6fL6gLMfy GV6aZXh348KjaKIJt+ytk80VH3HR/IwurGZjk0PnYh1ioam6IX5TEesa1xck0mpdkbWb2kWk5pF 2AsywSQFFYpauJWGDsAPEixtwNJpp/kk= X-Gm-Gg: AY/fxX70U+6dpikC2vuAYPQSxeyCLRhW8EPKit8raDSWMoenMeMBQMR0SPoLG2nK6wy T/q8eAAouHZ26s51AOZwdpmmByILxpQatz0qF8EtKGYCXutSmOX+X0gMLRkzCUXh3sL+KWFrl4M IJbQX+GiDgjVQlwBZo7U7sm1NhYeT935UNO/DY+Ksote0kmToXfy8OPNhqh2fn2o4Jub6KHh0YK CL5oIGbbzkYrYdh3mOQeWv4tvgCMUflmHbKKxR8Xgxn/u1CWahgFV0M+qq+tebgopn6OQCSZ5yU 8W2gM8UMilcJlwoP0Gc0fuLSf3CAxNBXOgEZWkopKiFexOwRIe9eW81lUtnMJA== X-Google-Smtp-Source: AGHT+IHvlsxUaGZPBucWGB3a7oiK6SbXXeUpbniUxjNNZtO9IYixLx+d5s0kNwyLdqYo115U0ga/V86WRJRCDImjKGQ= X-Received: by 2002:a05:6820:2225:b0:65d:4d:422c with SMTP id 006d021491bc7-65d0eb22dcamr10025858eaf.78.1766761193272; Fri, 26 Dec 2025 06:59:53 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202505241814.54OIEgPR025138@gitrepo.freebsd.org> <86ecoq7hh3.fsf@ltc.des.dev> In-Reply-To: <86ecoq7hh3.fsf@ltc.des.dev> From: Ed Maste Date: Fri, 26 Dec 2025 09:59:42 -0500 X-Gm-Features: AQt7F2o_KL26PwFz_BL1ZBDan-8yzKcGou3YNZ_fQ-_dm7voT70XvnqiUaXvUy4 Message-ID: Subject: Re: git: cd240957d7ba - main - netinet: Disallow connections to INADDR_ANY To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: - X-Spamd-Result: default: False [-1.75 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.38)[-0.382]; NEURAL_HAM_MEDIUM(-0.37)[-0.366]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.161.50:from]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MISSING_XM_UA(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.161.50:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4dd80p5LFQz3w0c On Fri, 19 Dec 2025 at 08:02, Dag-Erling Sm=C3=B8rgrav wr= ote: > > Ed Maste writes: > > commit cd240957d7ba43d819e9d59c6f6517fe915102c7 > > Author: Ed Maste > > AuthorDate: 2024-11-25 14:07:11 +0000 > > Commit: Ed Maste > > CommitDate: 2025-05-24 18:13:09 +0000 > > > > netinet: Disallow connections to INADDR_ANY > > > > Previously connect() or sendto() to INADDR_ANY reached some socket = bound > > to some host interface address. Although this was intentional it wa= s an > > artifact of a different era, and is not desirable now. > > > > In 417b35a97b76 markj added support to disallow connect() to INADDR= _ANY. > > Take the next logical step and disable it by default. > > It is still possible to connect to IN6ADDR_ANY. IMO we should either > allow both or disallow both. Yes, review open in https://reviews.freebsd.org/D54306. I still need to verify that there are no regressions in the test suite though. From nobody Fri Dec 26 15:10:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8DZ3Tf0z6LjvH; Fri, 26 Dec 2025 15:10:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8DZ30QTz3wvL; Fri, 26 Dec 2025 15:10:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766761806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4mj5QBvzRebNj/tjk3etbP7upEWy1QfiviPg+55sq3M=; b=ybi0Cly0XrkNoj/RoPfkywxkEUod3NqhVhsDhveGc3DcB2JoGwuGgy3SV9Cxgjj0Rhyy9/ UTL5A0zQVXI2vl0nefH/BNDLwiQyW9t13i/CAJEIUiyqrCR8RsoCE9rB6LqBsBZ9ArbgBM rYsUv2WHNBIgDaVYa1ZhenbYWVTtUEkdJSDURdW433ccGtd/NDoD/mBOJ1DE9JNNUAv9pA 9eCkJSyJZckMU04EVsswRrg6YzYF4lLE2aVl84LX8zkkS94BtbmxuYzxH0ufz09qq3td11 iWEZX/TKjmdu4Rl7I52JxK1cTqkpoealDRZWdlB9oXrxr/DX5k7O/uSdjI6WZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766761806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4mj5QBvzRebNj/tjk3etbP7upEWy1QfiviPg+55sq3M=; b=N1TyyG6hssxYTkLfHbfex8+gHRRmUmnIMq81tNQRQSncQJcUb225GlbDXfY8aHdA93qvsX XKOXhdD9wK1gIN8NwY+/292Sgee+8yumRQ+LGmg9zMtS4/BOuFD1KEsx9g5hOpLI27x/nT rl2BH+r9oflZQfweFR8jYD4UgCmNULF3qCVKEZP+mgfMtkk5v/Ski+XI2qdyo7P3D0aLn4 5+iAa3PmdbAQpW3O1QNmVwRqbsEn8Qtfe82Gw2KPW/REbZk8aX/NcecAB7QCmlXpLah1eI wRsc5HR7wEVBMN8Igb6Ny3gWoPB1yKyCI/Mwa3JKrrCYteINmhLqD4NzYV/Evw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766761806; a=rsa-sha256; cv=none; b=BHBBSdILuGHAzW/9JEJee0WTVi/QCMffFUbRoFNfpx0l5Y0UcQXTfNRIJ6nT0n7WRS0bnB qAHnOAVcqcn5mWpEaAgveJVaP/4n71ETaDgk8tGVwMD1bjUM+FZ5aPd2muzUgda5JzDf2T MXATsjgTvvRexl8SRj0SgUW36dIWjJ2e1jR0f8Nr/HWTUPNRJbebtPMU1zvFLqmb5qUPwl VPkVRuPdkwsE3PhjP/TGe/fXvD0tOOOjcpQwDsN+ONIKbAkEgTR+oN1p2cj1nvPIId6WbJ d8i4/BGGt4IkqUN4wEuAijrNNl0jM4d25+gqg0HRETudRoYJjLI64blspbSxEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dd8DZ1ZYGz2nF; Fri, 26 Dec 2025 15:10:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3EEF1514B2; Fri, 26 Dec 2025 16:10:05 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: e2c93ed09f25 - main - sys/font.h: avoid warnings about too-long initializer strings From: Dimitry Andric In-Reply-To: <5FAF9BAC-37B2-4B13-9146-65401C067BAE@FreeBSD.org> Date: Fri, 26 Dec 2025 16:10:05 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1552440A-518D-4F08-9019-7006EC3ADCF7@FreeBSD.org> References: <694e9c7d.3cfe6.7a265e1e@gitrepo.freebsd.org> <5FAF9BAC-37B2-4B13-9146-65401C067BAE@FreeBSD.org> To: Nuno Teixeira X-Mailer: Apple Mail (2.3826.700.81.1.4) On 26 Dec 2025, at 15:53, Dimitry Andric wrote: >=20 > On 26 Dec 2025, at 15:49, Nuno Teixeira wrote: >>=20 >> I've just spoted by luck that world fails at this commit: >>=20 >> Building = /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/usr.sbin/zic/_debuginstall >> In file included from /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:32: >> = /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/font.h:111:22: = error: expected ';' at end of declaration list >> 111 | uint8_t fh_magic[8] __nonstring; >> | ^ >> | ; >=20 > Strange, I did a full buildworld and it worked just fine? Are you = using any special configuration settings? Oh I see, commit 802c6d5d61d1 on 2025-12-16 introduced the attribute. = For some reason, the vtfontcvt bootstrap build is using = from the source tree, but from the host system. This is = weird, I will have to look into it. If I cannot resolve it quickly, I = will revert for now. -Dimitry From nobody Fri Dec 26 15:29:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8fh2J3Kz6LlCt for ; Fri, 26 Dec 2025 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8fh1p6Fz416f for ; Fri, 26 Dec 2025 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766762956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jj1TecA1tOkTg4V/lrTrj20Wmc/GPTfBllEx0yBaYQQ=; b=TJDTLTzR4OA0AWEgPbWMxrdM0ij9ZKqvrz+wcjHJJx4A16k+Ub+QT0AS3JhDXxocDUv/hH TilyROtjNfYsxTuLL0NWDWUATA0qHpL4JQK2pRei6TcaTCOukJgFaG2xqZY1DD54VnYYOa 79rmBNOdLekMCAHpDNF4F4kNEhlMIRXea8JXaPxSYM+w4jsGFy3Hqt4U+FNzRLI21edsfo 8FPRngHULw8JwfchdvRJ6yOXLJVl34XWuuJacEVFvW/ug8Wr4gb7LMjg7G3yV7t9X9ow4p p0BUUb7xrc5nBDvnabUOwPDGj97N0xiLHPeLWsCVLFAvzXDfPVxvOo5QmgvBzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766762956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jj1TecA1tOkTg4V/lrTrj20Wmc/GPTfBllEx0yBaYQQ=; b=rqysrrvuJD95wD5EiwH4jQwcb5ZrkKaz+2aYosf0bAjJXHr1fPNaj/ciEJRvgcWzS3IeoP L0fx84RpQblrFQB8S3WafhMDJIsFFO/vXQJIyNIqXTtlYM6G2GPzvEPY3MCDlMEEvqTAxZ 9Ft+91b9UleqrzSFichnI1klg879yvkzpC1PmToc8m/QW9dPnb2nXRlnM6wFs0WYExq/iQ ax1DP7vn5xYlFNfW3fHHix6bxNx+vo2KesKeMB627/1rjR5HeMhRizTHBpDY8niQtFTLNT pfyiqQjAJZuX2xdBDGt6dvCwBJ18ib4k19aLiS3M4k0tpuD7byFeMRc4LTxzJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766762956; a=rsa-sha256; cv=none; b=n2oUl/uYcsU3Y1mYbOZiwX+VgIvcKg2Wl6f84Y0TO8nXvbtGlF7ZIkW8Rqo6xrVoOcq88D LGdPc5P+oIVH4/81rCaU2uBCQ4IKuER7RubU8ZotXTZhvc2d6NSz/A+/86sZ0pSjbmIHDT ql5GEVxIurIXOPWkSbJRqBg1NSSFmZQQnemrZhXoIFc1JQWv5xeMGRLC/bhWcJwmcwNYa/ FQ7/Z10Kz8eJOCVYBYcdwuFdHzbaZ37NDjJp5nmz09CgIHFZU/NOqS5+Cj5JOgXKnkTq+H BVkNSxZPKgsXqNx7ukrnXhTWLqSPk1pPDHSCAcwVOhoS1Lk799De3pmQG6ietw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8fh1LW1z3Y8 for ; Fri, 26 Dec 2025 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9f30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1c9ff80f0635 - main - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c9ff80f06350fa44b7e50ce09ad665ab0082abb Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:29:16 +0000 Message-Id: <694ea9cc.9f30.1d45a192@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1c9ff80f06350fa44b7e50ce09ad665ab0082abb commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb Author: Dimitry Andric AuthorDate: 2025-12-26 15:26:13 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 15:26:13 +0000 tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it This is needed to let the legacy stage compile against newer versions of sys/font.h, which transitively includes sys/cdefs.h, and requires the new __nonstring macro from it. Fixes: e2c93ed09f25 MFC after: 3 days --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index a701c12a9b5c..2c6237c4dd7d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -351,6 +351,10 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h +# Needed to build most of the things below, which include sys/cdefs.h either +# directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h + # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/_nv.h SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ From nobody Fri Dec 26 15:40:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8vx6FrMz6LlmJ for ; Fri, 26 Dec 2025 15:40:45 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8vx3LMfz42S4 for ; Fri, 26 Dec 2025 15:40:45 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q4CNPKfqr9sRUzFM0roP+Ct2qCjoCnqvmoxc+tiD7yU=; b=PsBZ3YJJ2+Gc+1X8kIeUhMlTygWGew/xRwaXnxoKO4BTiRjeclwV7jeCisV2JjXlSuedft 4/FL/ZeZl2ehs4N+D7Arri6O0ujMdL8wtw03JXyBsNZhLVroueHXuGn7Ku1aL35Cf8GCTf PwqUMce5ZexO8for0HJH9fhbrDC6J4LlNp5WUixa4JInYcV2WccTAGlaipdIvjIKS508Bu 7a5zv05x+Pn30QXny7Wzj1FF5NlUwDQKPc0cnXjFPq1UTv8vDPV9Lhgnm/87nhId91baTu jm9tmF1TExraqtczzJZPkaoZZrxZhc/Ayjy9m9ASeeqmR4NKVRNgj5yCNbzpTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q4CNPKfqr9sRUzFM0roP+Ct2qCjoCnqvmoxc+tiD7yU=; b=IlK3K13cbjWOskdp4msOo4BcmlII8Mu8cOvB1DJ7uPOmrWbbo2cqNc3nV99xwfaXfOPQHi 5V2MxOOo7SaeRw0Ojz3d1f6F3ECncBY2qj6lQvmIOQfkW9MScGsU/p4bWF+MwTjUXmt5M6 5RL8Aq7NSrjPY5ETQa31D/DNM/HWFp7slCEOGX6YL8hSMOjuAOKXA3/CZal4rz3lsyZG28 dos3kFNOLulspaZIC8GwSFBe8ZcNX7op78yG9W8XqcmGkb/NGZ0EZ0qX630izGYPOsFpNd zCZ0wrMoiSgXIAm4nGqHTgKd/qh561JeNULMoivHfFo3HKs9/yBhXCsB0isHsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763645; a=rsa-sha256; cv=none; b=xTns8LfM0THZPBGZn5lzJojBx24IDbdS9J6QonfBUnXFsF45RYf8WclF5R0rSa8FY2kLtJ EiXovYI35Q8fW70v+kk1+mBkpMdcB0u3D8b8qHhPvVtwRHdNI2vR4DgdGrtj1H1JfmIPXR sBpd72A+xFYJHgzxZcrUgQvq81MAHKSgYTzaTbX1kd02/0CNivzrLwVw7imGNYsodU5rfK MV247OxMDbMc6EiTtYg4yczWcPFfdWGyabSTljAiSllCFjp9k5ZzEQRfyccbUYg60Xu8Gt yMwWXDw2h5Qk6Rehs4O0OWK+6LkAMVDuMGo5U0nQK2+FzSAHIrsSAj6rtN9CMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dd8vx2Wfwz2l4 for ; Fri, 26 Dec 2025 15:40:45 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4ee05985e97so5750841cf.0 for ; Fri, 26 Dec 2025 07:40:45 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXgInzaADci/RXJ7O+BHH/FToeimpDgs3yb+xhcC2vujEdlNHdtQAme2bgTcQmW0Jj8JrOmtyZ5QkRIGfUgDIPKEekX@freebsd.org X-Gm-Message-State: AOJu0YwkNPeEgE1HnbbuTh3ioCR6aDrvEj5hf8mzKEun1h5QtsvEguP/ jRqlx24K6t04VXOrqC3RpQRtHE6Y9JMSbTqQd0CynfWiemoJ9HrCen5My/QQBtWXUkDp1Jtq4db 1S/wbRD6zENFdg8I8MHm0QQFL/VBEOrQ= X-Google-Smtp-Source: AGHT+IGM0vKVDB1KmUMSW/ynZGH4o14KH5RSkgpuMzYTi2mDdYW4l3Sa0uAThr9WxBgJmSvqnt/End0acVExzS8hkZg= X-Received: by 2002:ac8:5d07:0:b0:4ef:be12:7b28 with SMTP id d75a77b69052e-4f4b4600b59mr249620281cf.9.1766763644907; Fri, 26 Dec 2025 07:40:44 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <694e9c7d.3cfe6.7a265e1e@gitrepo.freebsd.org> <5FAF9BAC-37B2-4B13-9146-65401C067BAE@FreeBSD.org> <1552440A-518D-4F08-9019-7006EC3ADCF7@FreeBSD.org> In-Reply-To: <1552440A-518D-4F08-9019-7006EC3ADCF7@FreeBSD.org> From: Nuno Teixeira Date: Fri, 26 Dec 2025 15:40:33 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2qNwHyvUJDKiVyITtmhSS6ZlVWgvKaymdaJInxxkHo1420LF365wIssWdQ Message-ID: Subject: Re: git: e2c93ed09f25 - main - sys/font.h: avoid warnings about too-long initializer strings To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000074f5450646dcb736" --00000000000074f5450646dcb736 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Here my config: # cat /etc/src.conf WITH_MALLOC_PRODUCTION=3Dyes WITHOUT_LLVM_ASSERTIONS=3Dyes WITHOUT_PTHREADS_ASSERTIONS=3Dyes WITHOUT_ASSERT_DEBUG=3Dyes WITH_LLVM_LINK_STATIC_LIBRARIES=3Dyes # cat /etc/src-env.conf WITH_META_MODE=3Dyes Cheers, Dimitry Andric escreveu (sexta, 26/12/2025 =C3=A0(s) 15:1= 0): > On 26 Dec 2025, at 15:53, Dimitry Andric wrote: > > > > On 26 Dec 2025, at 15:49, Nuno Teixeira wrote: > >> > >> I've just spoted by luck that world fails at this commit: > >> > >> Building > /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/usr.sbin/zic/_debuginstall > >> In file included from /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:32: > >> /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/font.h:111:22: > error: expected ';' at end of declaration list > >> 111 | uint8_t fh_magic[8] __nonstring; > >> | ^ > >> | ; > > > > Strange, I did a full buildworld and it worked just fine? Are you using > any special configuration settings? > > Oh I see, commit 802c6d5d61d1 on 2025-12-16 introduced the attribute. For > some reason, the vtfontcvt bootstrap build is using from the > source tree, but from the host system. This is weird, I wil= l > have to look into it. If I cannot resolve it quickly, I will revert for n= ow. > > -Dimitry > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000074f5450646dcb736 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Here my config:

# cat /etc/src.conf
WITH_MALLOC_= PRODUCTION=3Dyes
WITHOUT_LLVM_ASSERTIONS=3Dyes
WITHOUT_PTHREADS_ASSER= TIONS=3Dyes
WITHOUT_ASSERT_DEBUG=3Dyes
WITH_LLVM_LINK_STATIC_LIBRARIE= S=3Dyes

# cat /etc/src-env.conf
WITH_META_MODE=3Dyes

=
Cheers,

Dimitry Andric <dim@freebsd.org> escreveu (sexta, 26/12/202= 5 =C3=A0(s) 15:10):
On 26 Dec 2025, at 15:53, Dimitry Andric <dim@freebsd.org> wrote:
>
> On 26 Dec 2025, at 15:49, Nuno Teixeira <eduardo@freebsd.org> wrote:
>>
>> I've just spoted by luck that world fails at this commit:
>>
>> Building /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/usr.sbin/zic/_= debuginstall
>> In file included from /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:32: >> /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/font.h:111= :22: error: expected ';' at end of declaration list
>>=C2=A0 111 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0fh_magic[8] __nonstring;
>>=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 ^
>>=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 ;
>
> Strange, I did a full buildworld and it worked just fine? Are you usin= g any special configuration settings?

Oh I see, commit 802c6d5d61d1 on 2025-12-16 introduced the attribute. For s= ome reason, the vtfontcvt bootstrap build is using <sys/font.h> from = the source tree, but <sys/cdefs.h> from the host system. This is weir= d, I will have to look into it. If I cannot resolve it quickly, I will reve= rt for now.

-Dimitry



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--00000000000074f5450646dcb736-- From nobody Fri Dec 26 15:43:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zS30LNz6Lm2B for ; Fri, 26 Dec 2025 15:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zS0qXVz43MT for ; Fri, 26 Dec 2025 15:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s/88WIVwLCWb8Zn2UGRtHx/oSh7Y1wFmSwRYbU5GExE=; b=cbOvOhAin3Xkvt980Ir61/c/zCU5U9teGT+scHtgar6mXO5qZ4sUquw/sn7ez7MDmgBfNo L6/2NosHFSvxO+Gh7I3qy5bnfEXT8Y15zGyiQp37UA2uwFurmRnmM+pCzrevAk7PR9ai4s /5/gKCLzsHzFcRlUotdA6xBFfEoFl2k5DM0Z8w5OuCfR+bJYvgd/USzyoLT62bm90H0VKJ 7kXddblM+FSf+5+gkgKtFnX9ljQi+7SSEZ9cWcXJ3Q2zPFUg4t4cQPcn9miTTxFPa5Nvur 8lROZo5FKYvJ6xUoohQ9fMLEV3lM8B9uZ4mTDU8RBAeXzOUWq2Bna2HwWk3wmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s/88WIVwLCWb8Zn2UGRtHx/oSh7Y1wFmSwRYbU5GExE=; b=bPho78iRZB+6H77gI1+YctTQCEmDqokRrHQMBAX4IassKtXGoi/ZRlQHMrlzz84pRadphs UZFY9AKzfq2bJ6mxyoTuI83WNqTd49frQ83IkU5CGuDxPm5C1h4cnNNG7ZkJDvCJpQvH54 H8AdZ+4f/62sST51OKN6j6kja3m4Uw/ivuYmP65GGRMrm+p9pPU24alAlk9OqcyXbrKgXX c6SVWMTQpZ5e4cepl2Pz+wcZK3AtssdRlC6iEi77oFwZqlSDyy0AJeCMZ9YbU5Ypp7LObS 1XbxIa9Dh72TPVKKzQ9M+TSDp/qKTrpen8KLdI15CErJ9AW3e5XeQ11kr7z0Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763828; a=rsa-sha256; cv=none; b=MnPi2a+iVzb8eK8Z+VnSMsP04jWwpfuY/+ZhrNLOVEOxsv+9qROo2LSMaiDBVD7qFtR7mD GJZaFfWXokFQzVoH31uGpd8cp1cuDOx4aH3mebI46m0atLqZr0he9S1HoHxHYbLmfwtGKL IBQJckbCzHCN0x55JQ+3GGQIiWQ+ZL+XWbZxd9PD58ZmvnTqHfP0LyYJLyg/b1NBSJngLD A1/6C7iS8yrP2tZFFmWvOP4HYVHXnQ4bynHZN1a6c/oRa3FoR3pNTMuCCcJzddKgRMs1YR 8Qw2fmtskJjJgHopYLLVekehMsTndtYL33h59LFCZ+YqvAGqKizJWABhZxW9jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zS0NNJz4Yd for ; Fri, 26 Dec 2025 15:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bcdb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6b2e4da44300 - main - acpidump: Extend the decoding of entries in the EINJ and ERST tables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b2e4da4430029b16591c64aaef78bcd1644cedc Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:48 +0000 Message-Id: <694ead34.bcdb.52aad23d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2e4da4430029b16591c64aaef78bcd1644cedc commit 6b2e4da4430029b16591c64aaef78bcd1644cedc Author: John Baldwin AuthorDate: 2025-12-26 15:35:59 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:35:59 +0000 acpidump: Extend the decoding of entries in the EINJ and ERST tables - Decode the Action, Instruction, and Flags fields for these tables - Omit the Flags field if it is zero - Omit the Value field for instrunctions that do not use it Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54308 --- usr.sbin/acpi/acpidump/acpi.c | 206 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 193 insertions(+), 13 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 026795118832..0b125b5591ba 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -623,16 +623,89 @@ acpi_handle_bert(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } +static const char * +einj_action(UINT8 Action) +{ + static char buf[32]; + +#define ACTION(name) \ + case __CONCAT(ACPI_EINJ_, name): \ + return (__STRING(name)) +#define ACTIONV2(name) \ + case __CONCAT(ACPI_EINJV2_, name): \ + return (__XSTRING(__CONCAT(V2_, name))) + + switch (Action) { + ACTION(BEGIN_OPERATION); + ACTION(GET_TRIGGER_TABLE); + ACTION(SET_ERROR_TYPE); + ACTION(GET_ERROR_TYPE); + ACTION(END_OPERATION); + ACTION(EXECUTE_OPERATION); + ACTION(CHECK_BUSY_STATUS); + ACTION(GET_COMMAND_STATUS); + ACTION(SET_ERROR_TYPE_WITH_ADDRESS); + ACTION(GET_EXECUTE_TIMINGS); + ACTIONV2(GET_ERROR_TYPE); + ACTION(TRIGGER_ERROR); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Action); + return (buf); + } + +#undef ACTION +#undef ACTIONV2 +} + +static const char * +einj_instruction(UINT8 Instruction) +{ + static char buf[32]; + +#define INSTRUCTION(name) \ + case __CONCAT(ACPI_EINJ_, name): \ + return (__STRING(name)) + + switch (Instruction) { + INSTRUCTION(READ_REGISTER); + INSTRUCTION(READ_REGISTER_VALUE); + INSTRUCTION(WRITE_REGISTER); + INSTRUCTION(WRITE_REGISTER_VALUE); + INSTRUCTION(NOOP); + INSTRUCTION(FLUSH_CACHELINE); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Instruction); + return (buf); + } + +#undef INSTRUCTION +} + static void -acpi_print_whea(ACPI_WHEA_HEADER *w) +acpi_print_einj_entry(ACPI_EINJ_ENTRY *entry) { + ACPI_WHEA_HEADER *w = &entry->WheaHeader; - printf("\n\tAction=%d\n", w->Action); - printf("\tInstruction=%d\n", w->Instruction); - printf("\tFlags=%02x\n", w->Flags); + printf("\n\tAction=%s\n", einj_action(w->Action)); + printf("\tInstruction=%s\n", einj_instruction(w->Instruction)); + if (w->Flags != 0) { + printf("\tFlags=%02x", w->Flags); + if (w->Flags & 0x1) + printf(""); + printf("\n"); + } printf("\tRegisterRegion="); acpi_print_gas(&w->RegisterRegion); - printf("\n\tValue=0x%016jx\n", w->Value); + printf("\n"); + switch (w->Instruction) { + case ACPI_EINJ_READ_REGISTER: + case ACPI_EINJ_WRITE_REGISTER: + case ACPI_EINJ_NOOP: + case ACPI_EINJ_FLUSH_CACHELINE: + break; + default: + printf("\tValue=0x%016jx\n", w->Value); + } printf("\tMask=0x%016jx\n", w->Mask); } @@ -640,7 +713,7 @@ static void acpi_handle_einj(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_EINJ *einj; - ACPI_WHEA_HEADER *w; + ACPI_EINJ_ENTRY *w; u_int i; printf(BEGIN_COMMENT); @@ -649,18 +722,125 @@ acpi_handle_einj(ACPI_TABLE_HEADER *sdp) printf("\tHeaderLength=%d\n", einj->HeaderLength); printf("\tFlags=0x%02x\n", einj->Flags); printf("\tEntries=%d\n", einj->Entries); - w = (ACPI_WHEA_HEADER *)(einj + 1); + w = (ACPI_EINJ_ENTRY *)(einj + 1); for (i = 0; i < MIN(einj->Entries, (sdp->Length - - sizeof(ACPI_TABLE_EINJ)) / sizeof(ACPI_WHEA_HEADER)); i++) - acpi_print_whea(w + i); + sizeof(ACPI_TABLE_EINJ)) / sizeof(ACPI_EINJ_ENTRY)); i++) + acpi_print_einj_entry(w + i); printf(END_COMMENT); } +static const char * +erst_action(UINT8 Action) +{ + static char buf[32]; + +#define ACTION(name) \ + case __CONCAT(ACPI_ERST_, name): \ + return (__STRING(name)) + + switch (Action) { + ACTION(BEGIN_WRITE); + ACTION(BEGIN_READ); + ACTION(BEGIN_CLEAR); + ACTION(END); + ACTION(SET_RECORD_OFFSET); + ACTION(EXECUTE_OPERATION); + ACTION(CHECK_BUSY_STATUS); + ACTION(GET_COMMAND_STATUS); + ACTION(GET_RECORD_ID); + ACTION(SET_RECORD_ID); + ACTION(GET_RECORD_COUNT); + ACTION(BEGIN_DUMMY_WRIITE); + ACTION(GET_ERROR_RANGE); + ACTION(GET_ERROR_LENGTH); + ACTION(GET_ERROR_ATTRIBUTES); + ACTION(EXECUTE_TIMINGS); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Action); + return (buf); + } + +#undef ACTION +} + +static const char * +erst_instruction(UINT8 Instruction) +{ + static char buf[32]; + +#define INSTRUCTION(name) \ + case __CONCAT(ACPI_ERST_, name): \ + return (__STRING(name)) + + switch (Instruction) { + INSTRUCTION(READ_REGISTER); + INSTRUCTION(READ_REGISTER_VALUE); + INSTRUCTION(WRITE_REGISTER); + INSTRUCTION(WRITE_REGISTER_VALUE); + INSTRUCTION(NOOP); + INSTRUCTION(LOAD_VAR1); + INSTRUCTION(LOAD_VAR2); + INSTRUCTION(STORE_VAR1); + INSTRUCTION(ADD); + INSTRUCTION(SUBTRACT); + INSTRUCTION(ADD_VALUE); + INSTRUCTION(SUBTRACT_VALUE); + INSTRUCTION(STALL); + INSTRUCTION(STALL_WHILE_TRUE); + INSTRUCTION(SKIP_NEXT_IF_TRUE); + INSTRUCTION(GOTO); + INSTRUCTION(SET_SRC_ADDRESS_BASE); + INSTRUCTION(SET_DST_ADDRESS_BASE); + INSTRUCTION(MOVE_DATA); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Instruction); + return (buf); + } + +#undef INSTRUCTION +} + +static void +acpi_print_erst_entry(ACPI_ERST_ENTRY *entry) +{ + ACPI_WHEA_HEADER *w = &entry->WheaHeader; + + printf("\n\tAction=%s\n", erst_action(w->Action)); + printf("\tInstruction=%s\n", erst_instruction(w->Instruction)); + if (w->Flags != 0) { + printf("\tFlags=%02x", w->Flags); + if (w->Flags & 0x1) + printf(""); + printf("\n"); + } + printf("\tRegisterRegion="); + acpi_print_gas(&w->RegisterRegion); + printf("\n"); + switch (w->Instruction) { + case ACPI_ERST_READ_REGISTER: + case ACPI_ERST_WRITE_REGISTER: + case ACPI_ERST_NOOP: + case ACPI_ERST_LOAD_VAR1: + case ACPI_ERST_LOAD_VAR2: + case ACPI_ERST_STORE_VAR1: + case ACPI_ERST_ADD: + case ACPI_ERST_SUBTRACT: + case ACPI_ERST_SET_SRC_ADDRESS_BASE: + case ACPI_ERST_SET_DST_ADDRESS_BASE: + case ACPI_ERST_MOVE_DATA: + break; + default: + printf("\tValue=0x%016jx\n", w->Value); + break; + } + printf("\tMask=0x%016jx\n", w->Mask); +} + static void acpi_handle_erst(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_ERST *erst; - ACPI_WHEA_HEADER *w; + ACPI_ERST_ENTRY *w; u_int i; printf(BEGIN_COMMENT); @@ -668,10 +848,10 @@ acpi_handle_erst(ACPI_TABLE_HEADER *sdp) erst = (ACPI_TABLE_ERST *)sdp; printf("\tHeaderLength=%d\n", erst->HeaderLength); printf("\tEntries=%d\n", erst->Entries); - w = (ACPI_WHEA_HEADER *)(erst + 1); + w = (ACPI_ERST_ENTRY *)(erst + 1); for (i = 0; i < MIN(erst->Entries, (sdp->Length - - sizeof(ACPI_TABLE_ERST)) / sizeof(ACPI_WHEA_HEADER)); i++) - acpi_print_whea(w + i); + sizeof(ACPI_TABLE_ERST)) / sizeof(ACPI_ERST_ENTRY)); i++) + acpi_print_erst_entry(w + i); printf(END_COMMENT); } From nobody Fri Dec 26 15:43:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zT3kwnz6LlnH for ; Fri, 26 Dec 2025 15:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zT238fz43SN for ; Fri, 26 Dec 2025 15:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wx0gZhU89qY0UYbuEbZZErtnoRqFxElPA1hpIsXTuLQ=; b=ZSaBk9GzbUyn+n722T8dotXeJCP3dBHu6EWx/SZIaBIEh6lWk0btSryQnb1tK28bLdeCsh 3jCT96pVqVi8LsgkI2psZ3YO9cgdcQiVN7GhzL9FA0Zgt9r9jkYHFW0Kf8OqAmabbpXp4N fUl/IsANx2JprzkA8r1NETJSONcTvLCaWCNyKs5V5mxRm8aEPIXYrQCZmml+N8bI9AXDYv /9/fSN3nhBUO3bQ68DVR1zSTZwNV+NdUfvtnwyyGCYWJ27QsQGyRg6SHQigdHJ08Kb9652 0HxXl6JRU36etqSeWP3G3HZa3k09X9HN4rtTjWzlMpFj9jJwAui6iTT8imQ8jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wx0gZhU89qY0UYbuEbZZErtnoRqFxElPA1hpIsXTuLQ=; b=nT8RY7UA46JNmvQXhySeAMqG0rxIveIjXOM2Bsfdz/ZqDb5lzr4u3Vqh+6oSx15/1xDUda DaR37NOHPxuSZnWLxPRgg4Qx2WV8/5NxTy8cYc3CGQbL6+R8fnnmVlWJwrC40laInoUGBL rCZh2jLBDuKdYEEsNqvlNqK3xqCzBtInvjd8/V7oejMrKyjgintI+/XQOLQM9n5hhHK+Bu YpgQznIYDcPeVixeoShWEZOYkTK/w2YqJJC2q1b6aT4H1kZEduI23xb8CRRQzlmHtQOO+y x+vvYuhGrqXj7rWJKw/jXoe2Q3Dw9Eb1B4gxDu+MXTfWvpgGQEbfR/VXseeSfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763829; a=rsa-sha256; cv=none; b=mSeKlb4xvj8JKujc4WRsCzah/IhkWSJ0XvVYcS8PERIYRJX8FtMEAXDhGNDy5EyHkhLOBg r67UnvOmKNjh0HXxp8QkWBhtbQJuzQNl7jVW9cBNp1p7npYiD0piZnAEif4uK0lQ8AIllE VbKT5f62EGwzird/MZlymykcZreiq+gGy8thB06LktjUnwJtUEv21QLaWOLb1mulW6eJar Nc8rPlBJdh3ZT8Ye8wPq38PEnqLrCBy7HzwEbn684YdGKd8OJOwa6m0CjjRxwf35d7Xv4a 1XueFsy7SAbc90NUazFV9V/cQVbuZ1k134BdOwDyCrB5awP9GJ0prWyEsxs5hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zT17Vwz4HK for ; Fri, 26 Dec 2025 15:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5b39245ab6f3 - main - acpi: Free ivars in bus_child_deleted method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b39245ab6f37450fd025127b4fc76b5e5ba135e Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:49 +0000 Message-Id: <694ead35.ce0b.39f76f50@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5b39245ab6f37450fd025127b4fc76b5e5ba135e commit 5b39245ab6f37450fd025127b4fc76b5e5ba135e Author: John Baldwin AuthorDate: 2025-12-26 15:36:12 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:36:12 +0000 acpi: Free ivars in bus_child_deleted method Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54309 --- sys/dev/acpica/acpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index d2ccdfbf6535..0549c83ded79 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1116,6 +1116,7 @@ acpi_child_deleted(device_t dev, device_t child) if (acpi_get_device(dinfo->ad_handle) == child) AcpiDetachData(dinfo->ad_handle, acpi_fake_objhandler); + free(dinfo, M_ACPIDEV); } /* From nobody Fri Dec 26 15:43:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zV5B8vz6LmFf for ; Fri, 26 Dec 2025 15:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zV2M7yz431V for ; Fri, 26 Dec 2025 15:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXVYgf5dbL/1UwgZ9c75mHyrkYMzDbD/UTkoTqL19To=; b=sEBcXZSJJ/e3YouD9hu+pfdjAhF3bOcSvsYUXgHmjhSYF5Ml5pu7t2Q7XvBaJ3eePYX2wZ oRcePmYhk7bJMXJKT+MuO5XJoxYJlpxdmM4St/Ly3JZ4hnH5jppIQ56ygvTvDlzMgVrDfn /ddM0lOnqQFLybrNFa+CTAmqXEhXMd1RLMhCWCPea2UwU4QVjZAipMAYK2VvJhj9wRzbES 3XqhwYF7TO2BOQhaf6o0VjGQUwprm0VLeQ7FgtuB1Brx/NEKyL3YQdGMsyIfvhqYMpNk1q pkh4v987ff7T6YlHvqcIPMOx1x5J2r58+GMwEP1EosuslSWiyzlNRohQgJ8zOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXVYgf5dbL/1UwgZ9c75mHyrkYMzDbD/UTkoTqL19To=; b=geY9bkKH3WNXu+0CIqp+Lo/nQSFqvPnmfGaAvuApp9FVz7kFW1GQjJvzQvCxRAOJQeiF+f IJlFshpD4nsuqi0Y7XILirFMvVKeSco+ZRWZ2o7edk1GAA592n9lno6gLl5VCGdHM0ha6K SBwIgZwM1cMHe9NaTc1qrNiHmGVFruEMpnUkOWAuz/EWkdbGSEunuPG116/LhN2YnQq0k1 KgrJhl49tQJA5j5q3ic0OUTHqTIjsNlm674kTElaRuUnFOMrCKx+BFakPMHGfqmrkKD/1X XpB/5X+d3lV5sMAB0SMkL+kEEOQfMbESp2q/t2T7lMdBAUHyeQc8MaGpe8s/iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763830; a=rsa-sha256; cv=none; b=KOj5aYEKdrn9kHk9o1KsnRYcDTcmYE/aUPSQ7jjgA9RVxdipV8b9sQ+HLIw6kfZ8yL9yNk nwCIGQ+HkG5hkU/rJWCKsYsDI/sJhFMMP4KGZdJ9mUhrBIziX/PKTJp26v2jh4QQOOxWFG vD4L4SSu9C+QqyXqU6pWaV07wYJpg3ewLZI0TmQzXIB25gXByDt3ZUXxNDGe3oI7ibT+vO 1BWjnjeDERMVBOMHR++sAGd/tV78/3+D5e9b/pGKfD7n/DN5f7xX3Catcc+lxhYC7d85Cl APpiM18dJG51RLCMfUONmJ1UnGfEjqIrBYyjSgqNE/4KpDXwgzUffQU2tzBLOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zV1vRQz43K for ; Fri, 26 Dec 2025 15:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d568 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 88f8e3c5ab97 - main - acpi_apei: Remove the hest member from the softc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88f8e3c5ab97025587d7df761c8ae72e2db6c1d3 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:50 +0000 Message-Id: <694ead36.d568.4445eb6d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=88f8e3c5ab97025587d7df761c8ae72e2db6c1d3 commit 88f8e3c5ab97025587d7df761c8ae72e2db6c1d3 Author: John Baldwin AuthorDate: 2025-12-26 15:36:24 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:36:24 +0000 acpi_apei: Remove the hest member from the softc This is only used during attach and freed after use, so just use a local variable in the attach routine instead to avoid leaving a dangling pointer around in the softc. Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54310 --- sys/dev/acpica/acpi_apei.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c index 0d23b504cb60..e85b3910e46d 100644 --- a/sys/dev/acpica/acpi_apei.c +++ b/sys/dev/acpica/acpi_apei.c @@ -86,7 +86,6 @@ struct apei_pges { }; struct apei_softc { - ACPI_TABLE_HEST *hest; TAILQ_HEAD(, apei_ge) ges; struct apei_nges nges; struct apei_iges iges; @@ -562,9 +561,8 @@ hest_parse_structure(struct apei_softc *sc, void *addr, int remaining) } static void -hest_parse_table(struct apei_softc *sc) +hest_parse_table(ACPI_TABLE_HEST *hest, struct apei_softc *sc) { - ACPI_TABLE_HEST *hest = sc->hest; char *cp; int remaining, consumed; @@ -662,6 +660,7 @@ static int apei_attach(device_t dev) { struct apei_softc *sc = device_get_softc(dev); + ACPI_TABLE_HEADER *hest; struct acpi_softc *acpi_sc; struct apei_pges *pges; struct apei_ge *ge; @@ -691,11 +690,11 @@ apei_attach(device_t dev) } /* Search and parse HEST table. */ - status = AcpiGetTable(ACPI_SIG_HEST, 0, (ACPI_TABLE_HEADER **)&sc->hest); + status = AcpiGetTable(ACPI_SIG_HEST, 0, &hest); if (ACPI_FAILURE(status)) return (ENXIO); - hest_parse_table(sc); - AcpiPutTable((ACPI_TABLE_HEADER *)sc->hest); + hest_parse_table((ACPI_TABLE_HEST *)hest, sc); + AcpiPutTable(hest); rid = 0; TAILQ_FOREACH(ge, &sc->ges, link) { From nobody Fri Dec 26 15:43:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zW6w4dz6Llr1 for ; Fri, 26 Dec 2025 15:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zW3Hs1z43W0 for ; Fri, 26 Dec 2025 15:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvbAHF2Bshe5WSzNvQ6wsWyrScOyvOq7NnaV+01sR4A=; b=QSyxIlA7vrUhjuJDM8IqCV2yPOaei53rHJzVbIM5cVf22j1+nO8v4pA5FzSidCIu+5G6EB yWR6hXFBHicIH55vW/Kr94FuPfAjY7HM8856VyIkVrBbDnzyGk+wviFwP4gnDsGi8jGgnh EZ6zW+fzIZxieSM5Sv2HDI740l+TxC+ecwvVakrZd9cZbFUugQbeZRp48zZdeEhchlioca uW+Xp61RVRfo13Oj2wYulAEDHLuJcCx96XOCTEismalW21XL0UnlZVWEDDfaoYXbAQ3ySm tF1HzyoH0k6iRHZo/8Cqqu2EJQ1Ay9Qtte23ahIRWAiguHH4eHDoA5B8+yFtng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvbAHF2Bshe5WSzNvQ6wsWyrScOyvOq7NnaV+01sR4A=; b=wY3S3NEMKmvRCbg1AYSa8L++I1ZO4LEBGbLsuS9oku/Ap86FnN821lHr8LHCpGvCLg7xPx 6hAPLAkcCf9ddGqMT7rm++hJ04dbnE9p0lHezLiFZuTz+swIbYGFrHagtNM/6t6VJD1Cdy cVQ3tzYzJ6Sd0RjLzmA9GpPi4c1YewzQ63Wblje4ltLB/T90N5XyhUb8dtX7Pl1Cgo87z4 sLxhyQuuxzsJe8+6B3KrJ9Qsq0b3wRllcNjBRmq512yJCHo30+v8IrQxbW5XV4fHrpHIoI njvyp+gAe9WobjlLIs76jLJ9ulsyDO9+zO85yxUJdtf1FI5YmBLgTiTdHhBeFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763831; a=rsa-sha256; cv=none; b=AVVld+a8/YKG54Uo7VnqjM0BxOq/ijnZq64XPQAZOg80a/Q/Dy32ZP/JVu0VrSQnsyuVi2 WKd7LgeTdSHWoJxuYI9CH0DuVw9oaFdlI6PkkwPrR/+pDsFtJRmQ4Uy8KXoELVsedNMR0D ZHNeLs2Mqk946EYrGXMBhrUaURhsT+ubkMbKmnLcDt9yBSiayNVjeWLm9/WJ4l3sLxH3g1 MoylhikUXLPczvgoONDJRvUpEpA2EDoG8vVm170yOjBD3GdAYf6/UMZTpFvk/jdCDEcOy1 N2NOSHpFgv40XAkoveGJiYFNprx0r8E2gBipk3dAX0IvM8gekm7HbuGwvfGdzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zW2mPNz43L for ; Fri, 26 Dec 2025 15:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cd8f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4eb560faa725 - main - acpi: Reject duplicate handlers for ioctl commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4eb560faa725771e536a850a9467fbb592ab3c1b Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:51 +0000 Message-Id: <694ead37.cd8f.21db4335@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4eb560faa725771e536a850a9467fbb592ab3c1b commit 4eb560faa725771e536a850a9467fbb592ab3c1b Author: John Baldwin AuthorDate: 2025-12-26 15:36:38 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:36:38 +0000 acpi: Reject duplicate handlers for ioctl commands Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54311 --- sys/dev/acpica/acpi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 0549c83ded79..e49d3b4d1637 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4203,7 +4203,7 @@ static int acpi_ioctl_hooks_initted; int acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) { - struct acpi_ioctl_hook *hp; + struct acpi_ioctl_hook *hp, *thp; if ((hp = malloc(sizeof(*hp), M_ACPIDEV, M_NOWAIT)) == NULL) return (ENOMEM); @@ -4216,6 +4216,14 @@ acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) TAILQ_INIT(&acpi_ioctl_hooks); acpi_ioctl_hooks_initted = 1; } + TAILQ_FOREACH(thp, &acpi_ioctl_hooks, link) { + if (thp->cmd == cmd) { + ACPI_UNLOCK(acpi); + free(hp, M_ACPIDEV); + return (EBUSY); + } + } + TAILQ_INSERT_TAIL(&acpi_ioctl_hooks, hp, link); ACPI_UNLOCK(acpi); From nobody Fri Dec 26 15:43:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zY1F6cz6LmLR for ; Fri, 26 Dec 2025 15:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zX4rS0z43QH for ; Fri, 26 Dec 2025 15:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ayxd7B1oVS4Oa9z+baHxgnnKPZKL8Iel/c+E6OmHDFs=; b=RqmvMFjQHY1KGaXzfaSw9u6LNRpnyzmBfUuj6+eYTbc2nSR660E8EAKWK4AiV+/j4OdcHU 5PIOlBfEfaWMCPpvQbvsKz9ghl5X3fMBHF6ncqzMhZPE4YfcJzC1PLv/MxeFjiIg4hvkYv iWUu5T/pISgw5I+NqCc/8sw0gskPHmTtOMYzeUXzFnnFg+3Oqs9/DW6+odRjc/C+OizGt1 u7u1ubpADc7WzCmGMtR4dheqSQnfPbjAKwc2GoaFNwu28/1nK4OMWSINB2wJ7FM5/m42xi i9JlLRIupO0hXBKR56TANCXdkvcL2Ci24n6I+9VtRZ4MFFZV4Ta2q/HFWx37CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ayxd7B1oVS4Oa9z+baHxgnnKPZKL8Iel/c+E6OmHDFs=; b=pAGaVJqU3H/poAfgE7JU5s7dO8rZg+1pcuvyhxd9W/GH9HNCBSm5vWE9xyQcN58DIVucfP I6vdKPHRxw7nJxEQ39yhSdoUuhgWTmdcxRVmtAueJmiFhq1SKlSQFOzzynzPzk9Mgdq6m5 7CJz/wivAGuH/PzFWlUKeFz6Q3SlUUabQ5nhH4di88BjZt9S2okKe+RrC52pNJEQNDw4RG QRUESfPga7TKOxd8eDhtOsPHL4Ag9oceJIkg5Db6aI0JjKRUHUwAkUWwvfFz99q3rp/UPk nk9sHwVlZNw8u7FAtcti8tZ4iguGqm5314rkN/nZZ0T4scR5hQhcANxX5XdSrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763832; a=rsa-sha256; cv=none; b=KhMt2Nbba0mCBt4Mr+41/DYAzXw2zgaeZiYlgEGkBkjuu9auumAL14Hrmq4s6C6AH/wpSj wX0+08ayb0IjJdjQIshQWdZY59nYtyzBhYGAYpuifxcAkdC3hRcty5ZYDtlV6sTuE6NO68 6i1eN8gIF9QRJyCAG0VtRUCfsiqRKrSidXcEsD1ZKSuIbMq1XqgXl/03LsSTI4qEPgtdoy Z+SMW1WbnJjcEsQN3AQP00fs6bdz1sp1+aqp3bJdQnj2xGOn46qTXC7r9M4b8HN0DVFfF6 H+vvbQx9oqoBrjsBSchr+Pal1o6zPsgIXIloBnayrxgfszUPopJpnYj0o702qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zX3MrFz4Yg for ; Fri, 26 Dec 2025 15:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 425b41f81634 - main - acpi: Use M_WAITOK in acpi_register_ioctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 425b41f81634fd5a8f7d038191560040d1d4d32c Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:52 +0000 Message-Id: <694ead38.ce87.69ae88f2@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=425b41f81634fd5a8f7d038191560040d1d4d32c commit 425b41f81634fd5a8f7d038191560040d1d4d32c Author: John Baldwin AuthorDate: 2025-12-26 15:36:48 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:36:48 +0000 acpi: Use M_WAITOK in acpi_register_ioctl This function is only called from device attach routines which can sleep. Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54312 --- sys/dev/acpica/acpi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index e49d3b4d1637..0aae1db9e96e 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4205,8 +4205,7 @@ acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) { struct acpi_ioctl_hook *hp, *thp; - if ((hp = malloc(sizeof(*hp), M_ACPIDEV, M_NOWAIT)) == NULL) - return (ENOMEM); + hp = malloc(sizeof(*hp), M_ACPIDEV, M_WAITOK); hp->cmd = cmd; hp->fn = fn; hp->arg = arg; From nobody Fri Dec 26 15:43:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zY6y4dz6Llr7 for ; Fri, 26 Dec 2025 15:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zY4bVlz43QN for ; Fri, 26 Dec 2025 15:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYJ/pkZ0NXZeDn7U4PZ7ThWocG91cgMw2uBi58wkh4g=; b=fnnHpU+2Z8zHTl9aZY2HWIOFogyAe3SDB3xDUN19Ps7b0syg16m51JywMDK9l8yCz1jZc0 RRjT6dOQ2eIDhbr9BLFILTN1KndAYGY4j4ZSqdptciRrTtAlX0gcKg6dk90oJS0G4a3qUX kliQgcQ9+iGqlC+FbomM1LR9hlNnZhCztAzbfSJHMNwybZvHVdP9eMxZBPMfXHVC+BU12V 2HzDCfTrO2P9p1L3o/y9OEt7FEU2d+G13M6OWfmA8f68nMtc3hYTCIqrLyT4UCoGhkw/jw DsinRdZmnZc0zFpwzcstFl/J003+mRisM+678dMOgkJ9P/UigQ19Z8+kP6dJBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYJ/pkZ0NXZeDn7U4PZ7ThWocG91cgMw2uBi58wkh4g=; b=w+AiLZ8Zr1uh5tPTtBgfgtgvpMKOLYdnuvCCdFgSSsVH1WPSyLn60CTeq0Zz8VcqwfeAfX Y4kjjCouN8A6znb6gAMsaO+X5ycVAgwiD0D8eVf5ZYAp8cYHSHoTEiAkN3gA2iVJwZ8fHk kkUxLxyqzedUj64+t3Z+7hCTq/FFgkGgyr3eGNUhFsr+PDFQh7Dnsv+6+fI2A3GOvfYSfB 8Ub6QrrfUokgkl2d6bFC7Bnv5/N0orzIthTrxXVpycwrCvCx//qI2TBtFsL4qeViA99Utr qi0SVedj/xcJmt9q2QPiw40OmVeUh8iYo7C7et++CZNWBzNmbFRsvAa1plipxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763833; a=rsa-sha256; cv=none; b=vmA1ro8UjJiJObJupRCfwTDrYs7DqyE8J2FlMT5C6LLUC3u5mvxbJdwOyNbJVKLRFzjkb0 2B2vi6cbBjNKHDzn5IWEX61FazuaDACT0E+9E5pZ+K2OcHfC+p/M8U8au+RGFetxKQwPEB U3fmT2xVWFW4n8g+b2j/9ieXUVv6LGnOV1X9DOVWmqvgL6K7DPY5j2+wOZAjz1NSwpMYnZ G2O3mYk7VYI8jpp2Sy1dsZQ/paaqvqieZW7oeM3N7ihSB2DOb6x0GSYcn2e4SZJ7i8nw9X LvLWawEctnofehHtZey+JEZY0Bv1Q9ZYSJx8Wvj9dmLWBK0ctKpLiRDAaggVsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zY49gMz4Kp for ; Fri, 26 Dec 2025 15:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c2cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 11757b1487e3 - main - acpi: Statically initialize acpi_ioctl_hooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11757b1487e3e8ca0479dff5da0815b42aea3fe0 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:53 +0000 Message-Id: <694ead39.c2cf.5746ec69@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=11757b1487e3e8ca0479dff5da0815b42aea3fe0 commit 11757b1487e3e8ca0479dff5da0815b42aea3fe0 Author: John Baldwin AuthorDate: 2025-12-26 15:37:10 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:37:10 +0000 acpi: Statically initialize acpi_ioctl_hooks Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54313 --- sys/dev/acpica/acpi.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 0aae1db9e96e..8380f701d226 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4197,8 +4197,8 @@ struct acpi_ioctl_hook void *arg; }; -static TAILQ_HEAD(,acpi_ioctl_hook) acpi_ioctl_hooks; -static int acpi_ioctl_hooks_initted; +static TAILQ_HEAD(,acpi_ioctl_hook) acpi_ioctl_hooks = + TAILQ_HEAD_INITIALIZER(acpi_ioctl_hooks); int acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) @@ -4211,10 +4211,6 @@ acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) hp->arg = arg; ACPI_LOCK(acpi); - if (acpi_ioctl_hooks_initted == 0) { - TAILQ_INIT(&acpi_ioctl_hooks); - acpi_ioctl_hooks_initted = 1; - } TAILQ_FOREACH(thp, &acpi_ioctl_hooks, link) { if (thp->cmd == cmd) { ACPI_UNLOCK(acpi); @@ -4274,11 +4270,10 @@ acpiioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *t * Scan the list of registered ioctls, looking for handlers. */ ACPI_LOCK(acpi); - if (acpi_ioctl_hooks_initted) - TAILQ_FOREACH(hp, &acpi_ioctl_hooks, link) { - if (hp->cmd == cmd) - break; - } + TAILQ_FOREACH(hp, &acpi_ioctl_hooks, link) { + if (hp->cmd == cmd) + break; + } ACPI_UNLOCK(acpi); if (hp) return (hp->fn(cmd, addr, hp->arg)); From nobody Fri Dec 26 15:43:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zb1sRfz6LlrD for ; Fri, 26 Dec 2025 15:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zZ5jbwz43c3 for ; Fri, 26 Dec 2025 15:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PXTSKGokpyPyul/KevIkEk1X9TuyRDDM4Ej2tVf9wM=; b=VQYzXzCXr5qEdMxGf8L5AGrWXlgFq4YF8mTWfe7kHSW36oVrxCvvnQ+/e8cs7/M4xN3Qp+ wIUdBrSqTkU1xTen70IE4PSF4/AGOVT4zZoim95o2fW0oFJgCXzqeTWUos3g2oVIP40WKA RoxIs6ROpHph7m5Btaz4bOBlmSWk/nCu6IqPb6gAWWJta5Sv869j5x0RhDb3BAuYrDmA/5 D4MknL+LCMP1SKkil2SUmwmclSgzY+jsY7epVT1lTlsvf83oDyHUBT3JLx6G7JEthvYQv4 GLnsaInRIY5VRlrZj7PyYsLzyhQn7QsgBhn0D29h+0G04FyqUPHbTjqfbnIbhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PXTSKGokpyPyul/KevIkEk1X9TuyRDDM4Ej2tVf9wM=; b=pAueCrL+8Ew8E16XfX2U2yZP+Yn5OHlMgDS1jFsTiRycyIBTZvao0maMXoGJDGdSem63qJ p1oblry2XKIYXX9shzH67p9q9MCPJtAHQdNmRK1FfegFI5jm2cRM2hbsw/M0CqQeGz5dsq dGFpMp1zcgZ3aHaIPKRCkFPSw4Va2+MXtGO4J+3inSv5krr108BCBI6ZLU4VHyu3wcnADP w5qoiLLUQGiKrxHwK6aTXwYE3Q/qGnDgY2FhVlc2zoWElgcGCHcBS2FLU0FMWMJ1mb3cuJ upMFf5uY3I8hqSHiYMo0R8v7kGQQUhoXKNfea0ZA4C1Tr+LqzKBheUl6MOKFaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763834; a=rsa-sha256; cv=none; b=RjqSNtCJsLqrxwombXmo6NYRCL8KhjHZBlcJeX6u3DXYG5FWCNaxWOpLGSDUZ0aVH7S3ul TlJSKYyAtEmu7nH3rq5KTjnq1q8cHfV/lkkDbL4QbXcz+4dmxJBpTZvTY3jVgMvuWRuAEM lXz2fZ5KnD0EFyt1d4nJ2+nvsPVNr9VagEEZjO+CTDLVCZSFc1N9XVWJ9bzO8nRCOIHfDY E/4LM9EwP/SKpA+pBErihx4bt/jcIiGwcqJYkIICtOe8sdE18ngzM4RLThJBigwYtA4Ktn qQIWRqDMQVlFxxfKtXRWTyzC2r8azajcAxYokQP/OVtGlc/pkXXo2+KmcwlBug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zZ4zgqz4Yh for ; Fri, 26 Dec 2025 15:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c3ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fe74d52de5dc - main - sys/modules/acpi/Makefile: One line per subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe74d52de5dca506fe07693ffd6a35140bb55abd Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:54 +0000 Message-Id: <694ead3a.c3ca.51a3257@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fe74d52de5dca506fe07693ffd6a35140bb55abd commit fe74d52de5dca506fe07693ffd6a35140bb55abd Author: John Baldwin AuthorDate: 2025-12-26 15:37:20 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:37:20 +0000 sys/modules/acpi/Makefile: One line per subdirectory This makes diffs that add or remove modules easier to read. Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54314 --- sys/modules/acpi/Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index f646589c9fa4..098161e08836 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -1,5 +1,17 @@ -SUBDIR= acpi_asus acpi_asus_wmi acpi_dock acpi_fujitsu acpi_hp \ - acpi_ged acpi_ibm acpi_panasonic acpi_sbl_wmi acpi_sony \ - acpi_toshiba acpi_video acpi_wmi aibs +SUBDIR= \ + acpi_asus \ + acpi_asus_wmi \ + acpi_dock \ + acpi_fujitsu \ + acpi_ged \ + acpi_hp \ + acpi_ibm \ + acpi_panasonic \ + acpi_sbl_wmi \ + acpi_sony \ + acpi_toshiba \ + acpi_video \ + acpi_wmi \ + aibs .include From nobody Fri Dec 26 15:43:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zc1NKhz6Llnj for ; Fri, 26 Dec 2025 15:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd8zb6VlGz43c8 for ; Fri, 26 Dec 2025 15:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Pr8LmlmeCgReCf3JZRvoStZRNtUzcbyjTcqrbiVSx4=; b=ue0SuE8uG/Y0r6MMjFgnj45v1akm5OcJZBwUimzLy1TmO5zJR4fOxpc+ZJCKlcf5Yr6xwv /dpApGxbrbhCW8bjRtjo8mzmdjoCF+3YXMmgxZILvr5zyUVbyNU8HkdNiWMm7/Wb0kIZEI WbxUei0WtROL9V1sn1fg6HNAOlThQHnXe+jxvxr3K8WVm1J75EQ8d0xkOu7zGgpSjA5x2Q 4jOTZcGbZo4xsrgAVkX3a/9uyf09QFfWBgfTqnnZIAjxxCbVl8VVPGaD14PxHPMt3Flw7E G/R0BIDIUZKMcD41J8jqn+iY/0TvL5WWjkcnzvN/DdeI59ShZaBk/UQy+sCcBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Pr8LmlmeCgReCf3JZRvoStZRNtUzcbyjTcqrbiVSx4=; b=p7yGazO2vntHBHTodJHEvpalcE+JAnPLsHzUoGG9nuIIdCrkC4tAIb6Es9MKfnMJ7fb8g3 G9bvh4/jtE0UUAd032YnJPDCmzEj6P1247lCOQmMdlh5VVCr416VzVOcC3iJrKmIKFhhCP W6yN8VIjwrUI9GKt1IBy0eJz5mdAAIB4wdNvCUEvEFlk//tWD6TAYjsSwxMU1S6xiafH9t wQDu1lZQzAAKYTyvJbq8yFcAperWMAnrZmx8FsABO694Uhtgki9lXCpLZZibI2YnO1EfFU EIhcOoHBRzVYu7H47oqEYpYTXO3DrXpeqrW4pyybfKvZZlHuud18bXc9ufMeNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763835; a=rsa-sha256; cv=none; b=nSBeDA8aumv0wXRtCjjLZuKZVCgOMV6e8PBKe63dAMI90OLh+zfHCO79Eu3SspIc+J4JxR X/X/49N71ySJYqfFFFE5sQzx74608dmpewMN8slBH+Q7hGpMjIURjZgqpZtOpGvYA/vN5D He3qj13CzBu+kZh486fU8aofnIy86Ca5XXJWhbsDBjJSj8/TEMF/pETjMz4R5+gfJYBdnM 1YsL0dDs8zD9VST+HCIU0+i+TfYkxWUkkqqzPRZcR4bZ0rh7gidsl7QJqygPO0uY6JcRbv fFiJIdfzGy0czXVnVsveY6OWWr7Jij/HxClIYFGnp3p9y/hdNJVOgGK4FEFwLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zb5knDz4W8 for ; Fri, 26 Dec 2025 15:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c3ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 15:43:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bd8296bd81d5 - main - Build acpi kernel modules on aarch64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd8296bd81d55563f7ccafca77b7b74fb219df9e Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 15:43:55 +0000 Message-Id: <694ead3b.c3ce.306b15a7@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bd8296bd81d55563f7ccafca77b7b74fb219df9e commit bd8296bd81d55563f7ccafca77b7b74fb219df9e Author: John Baldwin AuthorDate: 2025-12-26 15:37:34 +0000 Commit: John Baldwin CommitDate: 2025-12-26 15:37:34 +0000 Build acpi kernel modules on aarch64 For now, the only kernel module built is acpi_ged.ko. Sponsored by: Netflix Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54315 --- sys/modules/Makefile | 2 +- sys/modules/acpi/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 83099c5fff14..138adc30c213 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -579,6 +579,7 @@ _mlx5ib= mlx5ib .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" +_acpi= acpi _ena= ena _gve= gve _igc= igc @@ -776,7 +777,6 @@ _wdatwd= wdatwd _aac= aac _aacraid= aacraid -_acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _aesni= aesni .endif diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index 098161e08836..5040187e906f 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -1,9 +1,9 @@ +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR= \ acpi_asus \ acpi_asus_wmi \ acpi_dock \ acpi_fujitsu \ - acpi_ged \ acpi_hp \ acpi_ibm \ acpi_panasonic \ @@ -13,5 +13,9 @@ SUBDIR= \ acpi_video \ acpi_wmi \ aibs +.endif + +SUBDIR+= \ + acpi_ged .include From nobody Fri Dec 26 16:33:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddB4z0kpRz6LqJX for ; Fri, 26 Dec 2025 16:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddB4x6pcFz49Vl for ; Fri, 26 Dec 2025 16:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766766819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CYZIA6U1yWSwB3B13yatFSnjV/2o5nKSbz2FczGabDw=; b=t4GlUHLRFlCy3ArO6jPKlFll8vJp42liuRlR6iB+8+NiVpn7j9smhB5IAuB6CZ2UgUZ/B1 Mkc533laJzgKPSHTqzlHNDKUlbp0MvTfltpmZKofhkajG756XXyokViCGs+pDlyhmM8+XL 7SWWDvJ81NDMtWv0ilHszYJIpeG/fqcMkSvaXwSwuUY9Gtl0fj0f6+vGgLDnd/ANGct8sh d0ZmfXy+C8nPwKZQFb/VHCiziT3Gz/LHalr3DFv3GiOvjzuVvKn0HK9xjjpatMqmLvVP+2 Eqb7xqOPb5xHYYr744lImBtjjQ9NxBdByjHiRIUorDvdTDNa1Ifcfa1tVR1KjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766766819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CYZIA6U1yWSwB3B13yatFSnjV/2o5nKSbz2FczGabDw=; b=aAnl0x19cjPo7YBgb4p2B4leIF/JXsy/5VJWiRyyhpJQxrI1a2ELM4/bsVfbhioOqAvp3J YeJ8cel99XXHeoDMoVMKjtKQMJPI+Q4ukTSEg2l+exq/zVdDDKo76btjaM+Z/h7s0DBb5B 2R7JoFg62FEy2fJCaNXdpijfH1/z18mYDv2SiCcAm55AMYwFfBpbKTikipUlPPlP3cQjRX AlXeFY7h8uRtS5MFs2HQeCpv8awQVas2mkinYQrY6aUJluu2TrhostdmYUm/6Mxn9dnyWt /I+k+kxzWAPEbSeOw97NdSLqnWzeU4iIygRgLRIlJ0fSBuVj7PnWs7iKjdq83w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766766819; a=rsa-sha256; cv=none; b=yXi9i8sfxQpmiaDYaUnefO6ZgxK7kr63+tpvJNPTrB5QtqcfAS5U74hHKBypd7+qpLduEW m27lKcrk5KKc89yOmoPLW9arzCSxoyJCjHMuayRYBmyJ/qqpfD3kUVoDeQv2NEYgCcsKmh cEp35XlwaA1mgOyDpYwKvZBNTmfbayN+ALfZN6flUyzUZQqPwLkDa57zG1jhGKzYmLcw1W EfcgqrfPgv66nr0tM8tIwwPnz0Y0rou5fZK1WNSc0u++FWcAsVbjyCCLaFI017M4NgRM/Z 2x6YBqZqghX4kPi2e2xaQOWq0N52P6+jmuqzPX+TZ8ljPJsFyy9SP2/qNm2TGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddB4x6NWwz57g for ; Fri, 26 Dec 2025 16:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20ea9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 16:33:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 02376be32d6b - main - tests/ci: Use :H:H rather than ../.. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02376be32d6bcccc0c722c08779bd71e70516599 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 16:33:37 +0000 Message-Id: <694eb8e1.20ea9.4f325264@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=02376be32d6bcccc0c722c08779bd71e70516599 commit 02376be32d6bcccc0c722c08779bd71e70516599 Author: Ed Maste AuthorDate: 2025-12-23 15:42:13 +0000 Commit: Ed Maste CommitDate: 2025-12-26 16:32:27 +0000 tests/ci: Use :H:H rather than ../.. In general we want to strip subdir components, rather than appending `..`s. Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54352 --- tests/ci/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index 02b20eea58a6..0f99e26fa4d0 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -18,7 +18,7 @@ # USE_QEMU: Use QEMU for testing rather than bhyve # -WORLDDIR?= ${.CURDIR}/../.. +WORLDDIR?= ${.CURDIR:H:H} RELEASEDIR= ${WORLDDIR}/release MAKECONF?= /dev/null SRCCONF?= /dev/null From nobody Fri Dec 26 16:35:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddB7S54Lnz6Lqc6 for ; Fri, 26 Dec 2025 16:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddB7S2lJWz4C9J for ; Fri, 26 Dec 2025 16:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766766948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGAuXyngWccgE4bT5hA/qdCkg8OJdMMedAhD3MNkfwM=; b=AES2sKl44D2Bx1h5N+flBdSFgYEAP9BASXi7CT5uHMjnxJIOeUNMUzPv6RJBvR9mXYgNt/ fedSmxFR7nnvYbqhTsBRSv8gzm2ejhQgj3Ld7e0ucgZvp8oldaG9HlwHwGbYW0c+KFHMAv PPgK/2YGQug26FHQtEWOafAjFxKeOiGzuSQj9UD1UMw39rfv1FzBeuTf2QVhQcPv3hirXo ebYusYt0QttUZZnSuqaNRgvC3gIoy2fDioIDcFqDeDu9VcE/G5CkdfkFcr1ymVYG2JHxSL wecbsarKPxh8+bxzE6OuvVdmBV1w+vrRCQubeMff8u0/m9QyvAtV+RKtRXdcdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766766948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGAuXyngWccgE4bT5hA/qdCkg8OJdMMedAhD3MNkfwM=; b=CSP6AcwcAlWayuYu6n+cGQuwOhXnI3wG1V5WD8MHoX00/8+mA+GKOVOdKQdWeUDsHpn/1l nh7vXmpe81mPsV1eLEuSTQMzKVwXTj+i+Yx5CNsKxwlfhsK8/upV09hUekKk0UxHtDyVwU MVvo2QRFlRJmNHaya4q+PRZh5Ejs12ophrJjh+iaM0cJJqUmST+IYf+AIXtTT7aDEkR5M+ eUf70HNKapgq7gyRlkj1bi/HwDoi68jH5vLtMnk+XiZVeTJ25iosE5JZHtdPDC9F8pj0Xd OF8dH0PFBypQ3TeBkZvl4sVvYJrOVod7uXafJCa8crukXJ5a+45lqIADzoAJMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766766948; a=rsa-sha256; cv=none; b=K3QgtqEUFUzb7EyaYXA2xHeXFHV3eihhKaWlC3wYOfN8iZAgQFw3BZRiW0p/EHP4vYzTrr dpLaNIrFGqlkltRYB0acKmrboUqFdTvOaBLrWYqeTbCLWaFuxM+LblD4y1MFfOr1hxTbHs uosCnHaLSsgSKrveUsxFqmS/a0PMHPz3UVoTjOtW0s8cpRZL1MYJZiiqmgXj+0U1GBnYb0 MiWE9IpDo1apZfp5oNokNoAM5Is8czvVy8++tPH6PqGl1XxWuWutKdNFVg2LxlyhBp87XC qQZjGsuS3zvsvwGwU9c8uix9Ogryf1KXiHvMKRChM/X5Ko5o4aOEMURiAUx65A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddB7S1p2Kz57h for ; Fri, 26 Dec 2025 16:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22662 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 16:35:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: e1bfd541c7cd - main - bhyve: Document that MAC address has to be unicast List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 16:35:48 +0000 Message-Id: <694eb964.22662.33878fb5@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb commit e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb Author: Michael Osipov AuthorDate: 2025-12-26 13:40:37 +0000 Commit: Michael Osipov CommitDate: 2025-12-26 16:35:20 +0000 bhyve: Document that MAC address has to be unicast bhyve accepts any MAC address even foreign as long it is a unicast one. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54372 --- usr.sbin/bhyve/bhyve.8 | 3 ++- usr.sbin/bhyve/bhyve_config.5 | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index aafa4b81a076..d3b067509ced 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 23, 2025 +.Dd December 26, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -551,6 +551,7 @@ If is not specified, the MAC address is derived from a fixed OUI, and the remaining bytes from an MD5 hash of the slot and function numbers and the device name. +If specified, it must be a unicast MAC address. .Pp The MAC address is an ASCII string in .Xr ethers 5 diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index b511d5ef6bfd..4ead94690d91 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -517,8 +517,10 @@ Intel e82545 network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .El .Ss Frame Buffer Settings .Bl -column "password" "[IP:]port" "127.0.0.1:5900" @@ -746,8 +748,10 @@ VirtIO network interfaces support the following variables: .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description .It Va mac Ta MAC address Ta generated Ta MAC address. -If an explicit address is not provided, -a MAC address is generated from a hash of the device's PCI address. +If not specified, the MAC address is derived from a fixed OUI, and the +remaining bytes from an MD5 hash of the slot and function numbers and +the device name. +If specified, it must be a unicast MAC address. .It Va mtu Ta integer Ta 1500 Ta The largest supported MTU advertised to the guest. .El From nobody Fri Dec 26 18:29:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddDfq70R6z6Lxv9 for ; Fri, 26 Dec 2025 18:29:39 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddDfq6FJ4z3Dc0 for ; Fri, 26 Dec 2025 18:29:39 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766773779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WrxImFqEu1s0rVuIGpQkvVtlIXu4uz/d4hVV64wI2yc=; b=bRYy4Ugzw7js2VLsYb/9Qlt/HE4R5F9y6KD0IwT/TH9l+LL1lS9ePpfr/HzCcBGsbEIvmf XtSnnmHiilo0NSFluP683+YRWGUih34i0wALUuHo5c3pP8pm7x6cioe766Reh8u4bvyZrf vZg3zrgVXvDmM4HgnfrzgdDldQStKo3/ptOFHZYCQXQShWskKoqVapjVMJUqnJXi7I7cpi Y4QGyUMbNiC9t/fGThw/Ql1UUIophqHsU6MbxYGavvKo6TiC4JB8uHSY0jRgrFIh08wR00 nLf76RnGAfBTrRqZPedhqS8HZuRtQpsGFZavukod9Zxw7g86deZ2/reGKrzEIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766773779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WrxImFqEu1s0rVuIGpQkvVtlIXu4uz/d4hVV64wI2yc=; b=comLbooJw4ISiR5VB0FLIzvlgr1nfe7Es3KOZFN4oinqqBlKI/W2NkVQ2DinN/w+XmZ8Ky nEr0qysmQe+zbz1kAPiVfGF3mswoeDiaJ9ehqPxeyKVpST/PemD6i3SRwqIMzP73CLBOtE 4lHkTmwe/4sZGRLj3dbzX9tn+oP4K8UezQr3w0I6BcyjhE6xw2wSHepg1FbxgFs9BA/jOp QpBQm/MQPpBVsXaQmBI1ilPRsAvKpSN2BcuWIlQ6VEYzWE5uEHcucSgXf3gfZtM+L6SaFm fLq3xmWBCEg0lhAcqNHLt2hWDUI1aN1HPVm4pnmO2k+HC/4xzWeyCFe2mN4WFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766773779; a=rsa-sha256; cv=none; b=EJZ9XKWjuenCODRv06WuXbkqboJ7yp0vRfD++824kpPyUAkT+94EF8bY12UkfGRVVemNE+ p9a74gDrY25B4ni3bsoIyEaMn3RxeR3HzvRn5g56+U7W5g7Msr13vMwPPtFx8g7ZaGE61H n8OH49i81c7cpcaaaYsXNgWZ4cpzLObpZRP4o0u0X/5G6t/R99o46o+oDqEV6YXP7nK2e2 YH15i2Y2EAp75tUAqqa3PzBgj6Ljyi06wLaSyYLptEEOx5hg0J2uov5QSw38r3l+yop8Xa NlV+F1v2K6w7pEBQWLh1iPUmw8YdYU3Xso2iyZztwK6Ajh9xjnqWggEERYPLsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ddDfq5TJWz5nY for ; Fri, 26 Dec 2025 18:29:39 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-8b2dec6115bso97175185a.3 for ; Fri, 26 Dec 2025 10:29:39 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWgD7nP9cLG6S9f2qF21dP6abR8/Z16CVK8LXufO1JCFs7ZtiosI6TATiMPv77Nm+sSpyY1gxj4Ug2muhsoltcWl2gP@freebsd.org X-Gm-Message-State: AOJu0YzF5r2BHsyqU3QJpGH6Yrcwwoy9vTt9gd3dmlj10XkHkwgxsdNG CDtNqaCS7J/crNthQOq8uUzXZM7xp3sfUJVWx+bE+RG9HHD7tuv8nhZn2R7B0bm4xdCy/4rRfu1 gckdprsz51djsdIAk+2dUIY47T3fSqQg= X-Google-Smtp-Source: AGHT+IH0OMzIaW3rfK+QBORJHV2UX+U9ExXSCz/TdX0savSHjaIHZKlouGfVCyKsJFumgqs3kH04uAdsd3FPZSzdpVQ= X-Received: by 2002:a05:622a:19a2:b0:4ed:7f85:225c with SMTP id d75a77b69052e-4f4abdfb09cmr255447301cf.10.1766773779408; Fri, 26 Dec 2025 10:29:39 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <694b03ef.4403e.6c28845a@gitrepo.freebsd.org> <17FDDAAA-D518-41FE-8BDE-D8435008A99E@FreeBSD.org> In-Reply-To: <17FDDAAA-D518-41FE-8BDE-D8435008A99E@FreeBSD.org> From: Nuno Teixeira Date: Fri, 26 Dec 2025 18:29:22 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2p2CpYAqqROm4_J6GQBnE3iajG0NKr1WcB4mTHVOJYAvE4thQxMn7JDOpc Message-ID: Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000852d0d0646df13c3" --000000000000852d0d0646df13c3 Content-Type: text/plain; charset="UTF-8" > > *** [_libinstall] Error code 71 > > You have to use the same options for installworld as for buildworld. I'm > unsure who you can tell poudriere with -m src=/usr/src where it gets the > options from. I would expect it respect src.conf? > > -Dimitry I can confirm that using a correct src.conf in poudriere solved the error. Thanks, -- Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000852d0d0646df13c3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

> *** [_libinstall] Error code 71

You have to use the same options for installworld as for buildworld. I'= m unsure who you can tell poudriere with -m src=3D/usr/src where it gets th= e options from. I would expect it respect src.conf?

-Dimitry

I can confirm that using a correct= src.conf in poudriere solved the error.

Thanks,


= --
<= div>Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000852d0d0646df13c3-- From nobody Fri Dec 26 18:36:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddDqG6VLNz6LyW3; Fri, 26 Dec 2025 18:36:58 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddDqG2LSyz3FWN; Fri, 26 Dec 2025 18:36:58 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5BQIaiH4016348; Fri, 26 Dec 2025 20:36:47 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5BQIaiH4016348 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5BQIahMp016347; Fri, 26 Dec 2025 20:36:43 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 26 Dec 2025 20:36:43 +0200 From: Konstantin Belousov To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1c9ff80f0635 - main - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it Message-ID: References: <694ea9cc.9f30.1d45a192@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <694ea9cc.9f30.1d45a192@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ddDqG2LSyz3FWN On Fri, Dec 26, 2025 at 03:29:16PM +0000, Dimitry Andric wrote: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1c9ff80f06350fa44b7e50ce09ad665ab0082abb > > commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb > Author: Dimitry Andric > AuthorDate: 2025-12-26 15:26:13 +0000 > Commit: Dimitry Andric > CommitDate: 2025-12-26 15:26:13 +0000 > > tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it > > This is needed to let the legacy stage compile against newer versions of > sys/font.h, which transitively includes sys/cdefs.h, and requires the > new __nonstring macro from it. > > Fixes: e2c93ed09f25 > MFC after: 3 days > --- > tools/build/Makefile | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/tools/build/Makefile b/tools/build/Makefile > index a701c12a9b5c..2c6237c4dd7d 100644 > --- a/tools/build/Makefile > +++ b/tools/build/Makefile > @@ -351,6 +351,10 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h > MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h > DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h > > +# Needed to build most of the things below, which include sys/cdefs.h either > +# directly or transitively > +SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h > + > # Needed to build config (since it uses libnv) > SYSINCS+= ${SRCTOP}/sys/sys/_nv.h > SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ Then the sys/_visible.h needs to be added as well if it is not added yet. From nobody Fri Dec 26 18:54:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddFC5216Hz6M0fr for ; Fri, 26 Dec 2025 18:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddFC50zRJz3GvZ for ; Fri, 26 Dec 2025 18:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766775249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mQlMBQQ+TNXF0wbomPiTlA35oEfRS8WlO12uebC88M=; b=OOFnU2LT0rGSgo7X928VFQdrxl/NRPcftrUqzN4NcULtoJ7EDLFpclNJ53fPQvIhbUVwZv NSIY3mOqLNJluqSYEbHP2d+jYh1Iz80SlgMSBFRv9q+NJyWanla+IyngTQlLaLcuS8rTp7 qzkggEbB+NmxZshV41QibXckQqfGwTwNF0udBtDJjytdgCDeRSONtUqXuCN4rLze6cAReH 0jX9MV5TzpcXzPALAAze3KJBB7hlw4fZswmaPRbQdJB98Apg7ghMZFRZqH9xj8A6yqbNyh lTdKbHRifLZ6dRKL4dzSYYK/XoMd/VPtlwRH4CowZA2m8vhgjGTM7oW34JdehA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766775249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mQlMBQQ+TNXF0wbomPiTlA35oEfRS8WlO12uebC88M=; b=GiiuokB4YRDl2k8F6QDW91NUXJ1ekiGY7XMgD4JqD9jEwrWXIhkDl/VnJxPkbzgqBMDEpQ RWzqW+1nt+7vP4P16xGIutCC8EKDi2Fv0URPuCboHil+jqj4gNKODkOUaQX6t0FBYq8Eth yngu+JNCHEwBddWBGJd+bvY5a8M0JcJkUGeCwrQeQcen/eHzYQXb9/GVCaW3HxDI74dDpT 7CBbKnseodnvoNEN681YronzL7YHMOWsdeHf/QwsQVidzVSTQZhOCzbqV7IP8Eq6CCj+is ovuIWOZJGkP7kNP5pUdFyla0DXdNlxhRy1j5p1nVrSlqIY/I0LbUe4stcv4m3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766775249; a=rsa-sha256; cv=none; b=hj/kJrheXU+eRb9oxL9yEWSj8uImJjGa9IItcsyfo7PEtJdnoSBXGEklZnR3n88mz3+dYP 6lIaA6NteIqOlQGBsiSORlzuLHRr4HRy/tYhVvhLtpldkGF3I1jNYWotkRpHbnK92aMleI yZemAVx80jd+irFOzbftIgqK0av/gQUgzKJ0ZGU/3NwQdVS6dkM7kBZNwrtByInQDzUDwp C6GgVQZtcgpVjHuvuSpDo0uMo8PJv7mPEc1n2PGUjMCIQhJg1l9uV6PZ2vD4sc+y7fdcsj 2q7H9+mp8pfnbyYBZz5I1TYYD/055YYRazVn1zLo1+HxT5w8YBPFXZsYDWw2Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddFC50TW0z9fD for ; Fri, 26 Dec 2025 18:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e50 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 18:54:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 0d31189cbce4 - main - linprocfs.4: Improve docs around pid/self entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d31189cbce4de142a43b65037beb7bf8c09cf26 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 18:54:09 +0000 Message-Id: <694ed9d1.36e50.4e8d924c@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=0d31189cbce4de142a43b65037beb7bf8c09cf26 commit 0d31189cbce4de142a43b65037beb7bf8c09cf26 Author: Michael Osipov AuthorDate: 2025-12-24 18:12:25 +0000 Commit: Michael Osipov CommitDate: 2025-12-26 18:53:43 +0000 linprocfs.4: Improve docs around pid/self entries Mark as a placeholder and document that self is a symlink to a directory. PR: 283080 Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54358 --- share/man/man4/linprocfs.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/linprocfs.4 b/share/man/man4/linprocfs.4 index dcd1c642b409..043dedbd723a 100644 --- a/share/man/man4/linprocfs.4 +++ b/share/man/man4/linprocfs.4 @@ -1,7 +1,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd May 29, 2025 +.Dd December 26, 2025 .Dt LINPROCFS 4 .Os .Sh NAME @@ -126,11 +126,11 @@ Information about the swap device if any. Time since the last boot and time spent in idle state. .It Pa /compat/linux/proc/version Version of the emulated linux system. -.It Pa /compat/linux/proc/pid +.It Pa /compat/linux/proc/ Ns Ao Ar pid Ac A directory containing process information for process -.Pa pid . +.Ar pid . .It Pa /compat/linux/proc/self -A directory containing process information for the current process. +A symlink to a directory containing process information for the current process. .El .Sh EXAMPLES To mount a From nobody Fri Dec 26 20:07:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddGr612prz6M4r1 for ; Fri, 26 Dec 2025 20:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddGr55fjzz3MX5 for ; Fri, 26 Dec 2025 20:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766779669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEMJZXQ1SmD3JLLdk/SQDULq6UXwCJqb4h7lh7IIp1U=; b=fvjAbeT0c0BTKz3OiiG+ItaCNe38JrpgbME2DxGs71KPdhnsPBRw2DFTZUqyUNpWLOlaaN JXkgjRrmhMSv842P5irgofZSmqjNxjqBTzFPHH+31jClmoXyhUtfOg9fV0JNvX9YjTIKpy d4P/S2IBW0naoDx7ibyf7wAQccg+g1xgPIAmEKp5MowOCyBlLykP/iCGGXp/dvwulpcXNJ hQg5orepmK5RY+SU+rxAw9JxV2k/Yp3e8AxAhYIQSKv8GVT4Vz39aCMM9/wuWWbXgrMLYP xfidvtZNzkVnHgEVwVq78Eq6tP0kUFh2X6cmmVmsiZdW+ML9HKNUYthuDuk2LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766779669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEMJZXQ1SmD3JLLdk/SQDULq6UXwCJqb4h7lh7IIp1U=; b=nDzth4K3Td1IfaycUPpzU3T01Lmq/cUp12euciyv4vgUvqdl5byLfMRuoCGz136jk88ee2 BeumlckpnZbRlK/J79CXfHJpUlQNFo0IpEzA686PZlO3/Kgj6RXXuo6hqXZxsxtQKU18ut sd+gpMOVRFmVPCRUfKPu5IuLEfjZwcQ1xcztURxcEgZW11xhR2HC+kyL30TC2dv33ZitPT bfK3wO3VXE4sa0noDYVv7VrvYFSdYnW1N/chftRXf6cWGmOgOqME0kwNbmn2ON13eU+6oN EPVRF7qjW+KRxlMS7t27HjQFk0PQr/VuQsNRplUtYcooli9rxRlyf9SSREfBDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766779669; a=rsa-sha256; cv=none; b=Xw5tZBfdBW/pkuk9+9j6IixvOQ178J+AslLBSB4I5TfX+sALzQjX193TS9qpYa5SuTYSlO /k9XvwbVyYe64sYNFafSDO1XmbNZ6QQhuNppJ1nkKX0kei55Q2DkyOg0VXv1pVIEYKQfs5 gycOWH+TPwGdNHOgc9afYEeJ/ogseT0BAIaWky01N3SedGfzlw3cf10305RMpzgOu5JUMX BI0FZrbR/8T8FP6b1PAkMbu80lPiEd79oJEX23BF/rQKdmvWoQ4sRMxl/Mxbn07OmAA0BX 4GfUNTBQ9Q3jNWsu2g/Aj9PK2dAuLQSYb+1ndO9u+E5+jQzO1QwgurMLoFyF2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddGr54bZpzCVH for ; Fri, 26 Dec 2025 20:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e994 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 20:07:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 350f31973189 - main - kyua: Make "debug -p" skip writing stdout/stderr to tmp files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 350f319731897f741b516db99636e7ced071dfa4 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 20:07:49 +0000 Message-Id: <694eeb15.3e994.2f071a78@gitrepo.freebsd.org> The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=350f319731897f741b516db99636e7ced071dfa4 commit 350f319731897f741b516db99636e7ced071dfa4 Author: Igor Ostapenko AuthorDate: 2025-12-26 20:06:56 +0000 Commit: Igor Ostapenko CommitDate: 2025-12-26 20:06:56 +0000 kyua: Make "debug -p" skip writing stdout/stderr to tmp files Reviewed by: kp, ngie Differential Revision: https://reviews.freebsd.org/D54363 --- contrib/kyua/cli/cmd_debug.cpp | 6 +++++- contrib/kyua/engine/scheduler.cpp | 20 +++++++++++++++----- contrib/kyua/engine/scheduler.hpp | 6 +++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/contrib/kyua/cli/cmd_debug.cpp b/contrib/kyua/cli/cmd_debug.cpp index 700c4b3ea851..978ccae0fdf1 100644 --- a/contrib/kyua/cli/cmd_debug.cpp +++ b/contrib/kyua/cli/cmd_debug.cpp @@ -149,7 +149,11 @@ cmd_debug::run(cmdline::ui* ui, const cmdline::parsed_cmdline& cmdline, const engine::test_filter filter = engine::test_filter::parse( test_case_name); - auto debugger = std::shared_ptr< engine::debugger >(new dbg(ui, cmdline)); + engine::debugger_ptr debugger = nullptr; + if (cmdline.has_option(pause_before_cleanup_upon_fail_option.long_name()) + || cmdline.has_option(pause_before_cleanup_option.long_name())) { + debugger = std::shared_ptr< engine::debugger >(new dbg(ui, cmdline)); + } const drivers::debug_test::result result = drivers::debug_test::drive( debugger, diff --git a/contrib/kyua/engine/scheduler.cpp b/contrib/kyua/engine/scheduler.cpp index 4c40bf31046e..a0719ec461ab 100644 --- a/contrib/kyua/engine/scheduler.cpp +++ b/contrib/kyua/engine/scheduler.cpp @@ -1283,7 +1283,9 @@ scheduler::exec_handle scheduler::scheduler_handle::spawn_test( const model::test_program_ptr test_program, const std::string& test_case_name, - const config::tree& user_config) + const config::tree& user_config, + const utils::optional& stdout_target, + const utils::optional& stderr_target) { _pimpl->generic.check_interrupt(); @@ -1305,7 +1307,7 @@ scheduler::scheduler_handle::spawn_test( run_test_program(interface, test_program, test_case_name, user_config), test_case.get_metadata().timeout(), - unprivileged_user); + unprivileged_user, stdout_target, stderr_target); const exec_data_ptr data(new test_exec_data( test_program, test_case_name, interface, user_config, handle.pid())); @@ -1563,8 +1565,16 @@ scheduler::scheduler_handle::debug_test( const fs::path& stdout_target, const fs::path& stderr_target) { + optional out = none; + optional err = none; + const model::test_case& test_case = test_program->find(test_case_name); + if (test_case.get_debugger() != nullptr) { + out = stdout_target; + err = stderr_target; + } + const exec_handle exec_handle = spawn_test( - test_program, test_case_name, user_config); + test_program, test_case_name, user_config, out, err); result_handle_ptr result_handle = wait_any(); // TODO(jmmv): We need to do this while the subprocess is alive. This is @@ -1574,12 +1584,12 @@ scheduler::scheduler_handle::debug_test( // Unfortunately, we cannot do so. We cannot just read and block from a // file, waiting for further output to appear... as this only works on pipes // or sockets. We need a better interface for this whole thing. - { + if (test_case.get_debugger() == nullptr) { std::unique_ptr< std::ostream > output = utils::open_ostream( stdout_target); *output << utils::read_file(result_handle->stdout_file()); } - { + if (test_case.get_debugger() == nullptr) { std::unique_ptr< std::ostream > output = utils::open_ostream( stderr_target); *output << utils::read_file(result_handle->stderr_file()); diff --git a/contrib/kyua/engine/scheduler.hpp b/contrib/kyua/engine/scheduler.hpp index ee01c83b4991..508a0c0cbfd9 100644 --- a/contrib/kyua/engine/scheduler.hpp +++ b/contrib/kyua/engine/scheduler.hpp @@ -74,6 +74,8 @@ #include "utils/process/executor_fwd.hpp" #include "utils/process/status_fwd.hpp" +using utils::none; + namespace engine { namespace scheduler { @@ -248,7 +250,9 @@ public: const utils::config::tree&); exec_handle spawn_test(const model::test_program_ptr, const std::string&, - const utils::config::tree&); + const utils::config::tree&, + const utils::optional& = none, + const utils::optional& = none); result_handle_ptr wait_any(void); result_handle_ptr debug_test(const model::test_program_ptr, From nobody Fri Dec 26 22:08:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddKWn3s37z6MCn1 for ; Fri, 26 Dec 2025 22:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddKWn1dJKz3bdk for ; Fri, 26 Dec 2025 22:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766786933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0tyNavNGo9lHQFjOa5qdnPWDd3ItDCf/UAf5DOYCUk=; b=xkoVmemMbRgHJX4H/N2poo0VkWNk+Tk+rVjEbFcQuCKXMta1oqUcj+zASnRPQ+2wp63p8x 1W932ebKzpeImuYFS/RpB01XOdVBi27q0b4c9Woh9d6rLXuur90VRZsBfmmwmt/OZeDGOy XSYUxetclVWflfc9waGcEZnuUrPr+Ajlpu+ljaDQwqKQpLkgOX+EmpbgjdGMHfy5x1NG03 9+C2ET52M88u7LUE3k+gBAIk9aAkb6zvTxX5DJYZWQAPjBm0Cw6IN3zR3KfQujCPpnXaTK beN8iuSgbQel/RJGyqJ5KCTgO8bHqUC597QZhuOR0IHhKyf0/KLQCAfhvhL5vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766786933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0tyNavNGo9lHQFjOa5qdnPWDd3ItDCf/UAf5DOYCUk=; b=wxVZDTEllAP1JYuNxLVw1+fI7aw2M6oAkTrCkxQ8B1lVUYbyGna0Da++M1HjUt+S9LbqFL t57Qz7ug9NcnSgL8izCwjpkjNfkPvBhVXSOerocTEfg3fwqqv+Fi+mTYVyd5zw8OgmxsJX owQPpZPwjLtItMeUhzxJf21TID0tIzFaK0k23vHBNipyYZG0tuS9dJi2UtmIheN9wySjR4 olUr/6wa/7sldSE4eDu1S47qEt6X2icSm4eyth1RNSPPHbLGFXmxTXtP/kn9fP5Yh4phqU fMItdG+hV87y68wDeRIqkcQEh6f4so8y2Xf6rMB3X9emVoxPbp+jT3ckaFTzeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766786933; a=rsa-sha256; cv=none; b=Oy7/wC/mjgej9cTbQyI1L7EbzyZ6PsK6uoXizn/gg4X2hFN7SpCBPP4/lBko8BAEGJYJ26 hHZ0Vp461hQaPiNWu8ZJ46Ntv8WnXI8tylG7cgj7NC0OVqgxbmJthfbkXwOBkIi5wNpAF2 S/rqghbl4UzfUdGEB3k8RX9xLuNwZ6OsiMTI6rmSOUFQsIS6jJGo6oZC0qIsAZQAX0EUyG mhCEMRlYpd295fLj/4cjWg8ZLMNZNzumQFigFngDzl4pHddtqUqyUeY+pBBN23dZ7Cu9nA 6/JvbVSnnHnBcDfDpIfMMD4fxQVjbeWoiZqinFmHvRI8dflLx0Bz7DsED4N0+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddKWn19kMzXdD for ; Fri, 26 Dec 2025 22:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a291 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 22:08:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 939ac0c8fde2 - main - vnode_pager: clean up undirty_pages() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 939ac0c8fde22a4ad9cb9bfb5d94f29cad6ea040 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 22:08:53 +0000 Message-Id: <694f0775.a291.3c7343ca@gitrepo.freebsd.org> The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=939ac0c8fde22a4ad9cb9bfb5d94f29cad6ea040 commit 939ac0c8fde22a4ad9cb9bfb5d94f29cad6ea040 Author: Doug Moore AuthorDate: 2025-12-26 22:07:34 +0000 Commit: Doug Moore CommitDate: 2025-12-26 22:07:34 +0000 vnode_pager: clean up undirty_pages() The first (second) loop of vnode_pager_undirty_pages() includes an if-test to test whether an iteration is the last (first). Move those if-tests out of their loops. That allows the compiler to unroll the loops. Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D54353 --- sys/vm/vnode_pager.c | 76 +++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 040b4037df15..3504c90821e5 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1523,49 +1523,47 @@ void vnode_pager_undirty_pages(vm_page_t *ma, int *rtvals, int written, off_t eof, int lpos) { - int i, pos, pos_devb; + int i, npages, pos; - if (written == 0 && eof >= lpos) - return; - for (i = 0, pos = 0; pos < written; i++, pos += PAGE_SIZE) { - if (pos < trunc_page(written)) { - rtvals[i] = VM_PAGER_OK; - vm_page_undirty(ma[i]); - } else { - /* Partially written page. */ - rtvals[i] = VM_PAGER_AGAIN; - vm_page_clear_dirty(ma[i], 0, written & PAGE_MASK); - } + /* Process pages up to round_page(written) */ + pos = written & PAGE_MASK; + npages = atop(written); + for (i = 0; i < npages; i++) { + rtvals[i] = VM_PAGER_OK; + vm_page_undirty(ma[i]); + } + if (pos != 0) { + /* Partially written page. */ + rtvals[i] = VM_PAGER_AGAIN; + vm_page_clear_dirty(ma[i], 0, pos); } - if (eof >= lpos) /* avoid truncation */ - return; - for (pos = eof, i = OFF_TO_IDX(trunc_page(pos)); pos < lpos; i++) { - if (pos != trunc_page(pos)) { - /* - * The page contains the last valid byte in - * the vnode, mark the rest of the page as - * clean, potentially making the whole page - * clean. - */ - pos_devb = roundup2(pos & PAGE_MASK, DEV_BSIZE); - vm_page_clear_dirty(ma[i], pos_devb, PAGE_SIZE - - pos_devb); - /* - * If the page was cleaned, report the pageout - * on it as successful. msync() no longer - * needs to write out the page, endlessly - * creating write requests and dirty buffers. - */ - if (ma[i]->dirty == 0) - rtvals[i] = VM_PAGER_OK; + /* Process pages from trunc_page(eof) to round_page(lpos) */ + pos = eof & PAGE_MASK; + i = atop(eof); + npages = atop(lpos); + if (i < npages && pos != 0) { + /* + * The page contains the last valid byte in the + * vnode, mark the rest of the page as clean, + * potentially making the whole page clean. + */ + pos = roundup2(pos, DEV_BSIZE); + vm_page_clear_dirty(ma[i], pos, PAGE_SIZE - pos); - pos = round_page(pos); - } else { - /* vm_pageout_flush() clears dirty */ - rtvals[i] = VM_PAGER_BAD; - pos += PAGE_SIZE; - } + /* + * If the page was cleaned, report the pageout on it + * as successful. msync() no longer needs to write + * out the page, endlessly creating write requests + * and dirty buffers. + */ + if (ma[i]->dirty == 0) + rtvals[i] = VM_PAGER_OK; + i++; + } + for (; i < npages; i++) { + /* vm_pageout_flush() clears dirty */ + rtvals[i] = VM_PAGER_BAD; } } From nobody Fri Dec 26 23:11:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddLw14fwRz6MGs3 for ; Fri, 26 Dec 2025 23:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddLw13Shxz3gfG for ; Fri, 26 Dec 2025 23:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766790689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyhKjHtVkjEVbssK7WrYaL98m8KwCJ4BN2C6HAT/aRM=; b=YUumi0ZBpo3isE8ZWQgvRr9zVmzXR2j2LCqEdJ+zP3ztcmMIZjtf8+0H13l4PPIKcu/G82 prZOD55j/TqZXuwL33nQbI+ee8I/k/Fcf5CL2LQ53/hvOeIQ67peSUsSrd0jEIEHmXZ6MK F+em/WY083QKUpTVucdmiOFwLjesy6zVIkvpLynIKBP8v80+qa92PE+kl4uojFVVEe6edX cc3L5asU/Ygstsk99dtvDl7eLZCT98CeRIiwyFrWJTTKyW8oZ6VG0nVqrF/oHQu6t89k+M D/FWuJx4ocHkOBE0iQfwLHsb6TTuv3EaXFuzqgqa2VqbdpyFOz8IB9/+jRKeBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766790689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyhKjHtVkjEVbssK7WrYaL98m8KwCJ4BN2C6HAT/aRM=; b=m9Jw0YkYHqX/W3uzyKGtdrA2Y3lp11SuVnDX5YhNVjpgox+TBJWKQkn6YdMu3X7oSKoRsD Zt0b1TZ7iEIR3g7ZURWFtMX6pQUl61j80/9b0tCuZn3wP1Ly2Rus/a82lWr31PLEiB1ZAk b+pWRkN9lYus1ayDu1gfVbL5tuYmyyGzr/TvoVfbYsumaj5lz74pm2UnRzy4Dn5fusI7Aa Hjjt2bKEAIFL2iR4JFX7QQ2mPcFT3BLVaJoFwm5TMz5W2oSAGQopWol9dP1SJb9oYL8/rM 1q3YQAEZSaAtH4qkYi3neTAVb1d8iPJEdy2kbLrrtE5ZZqFKRLo8R3uVqP2VUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766790689; a=rsa-sha256; cv=none; b=Amttz271FXisSgjqVBqYErallKn4SMk/8CTOsBHOlUlKA15NtE3jkAyn1gz0w/WXSyhliM jabarkcnOaJKwYFtTNlf0X4noff87edSwiAekzBhsWP1h+/juAR2R1BoQO2HXvcGhwERXo nK56fnEk9VYmKgxFaH0jZavesXPiXSyE9rzyaHCYFzFtQ7OqU8IK8T7+YhkVUlHvQMPclh t8FFFBBPOLpRiKDj1l91Hxk+m8sKdttwXWNGAJBqW0BRmtwI7iKdmqtNqG71Oy+W5cpIW6 h/FMstBWbduEM8wMrwgeHJFVUQFTtd/RyQNhC5rk/EFb6G2VZjkTHxuGM3Z/kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddLw12pC1zZLS for ; Fri, 26 Dec 2025 23:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 201aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 23:11:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 086bedb11a85 - main - tools.build: also add sys/_visible.h to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 086bedb11a853801e82234b8a1a64f0df52d9e52 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 23:11:29 +0000 Message-Id: <694f1621.201aa.62d3187d@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=086bedb11a853801e82234b8a1a64f0df52d9e52 commit 086bedb11a853801e82234b8a1a64f0df52d9e52 Author: Dimitry Andric AuthorDate: 2025-12-26 23:07:53 +0000 Commit: Dimitry Andric CommitDate: 2025-12-26 23:11:17 +0000 tools.build: also add sys/_visible.h to SYSINCS This is needed since sys/cdefs.h includes sys/_visible.h. Reported by: kib Fixes: 1c9ff80f0635 MFC after: 3 days --- tools/build/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 2c6237c4dd7d..8017d776fd55 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -353,6 +353,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h # Needed to build config (since it uses libnv) From nobody Fri Dec 26 23:12:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddLwm07FSz6MGX1; Fri, 26 Dec 2025 23:12:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddLwl6Yskz3hZb; Fri, 26 Dec 2025 23:12:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766790727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rTRJd2D1gp2DmnYplyD+P5jcr+8YJdXR34n1POH+EKw=; b=Ja7ZuvTvW1ksl5ps9zy6l8rawW9EhTIiKQV7wPROcMDNiA/6mdQ1R0i3pzMNNBUZtsVVRF Mdm1SSHI2rSot9/K/V20T9CPlzJ1jA+pn405xqO2NMr32Lr5hvKMOOjHBWKjfZNz8uy7bL 6nmQSGF7QnBVZvZTTzg8umKGKNdgBPvysw3mVwh/Xwu088PvFIGyakpmE2yNpkVb0f470K IUqsQzHNKmpQi2+yjDG9orbacZBgbmYsHlwUXb7IY1OncPZV5sHIhHqnyGmYBFnL/WEWWO +qpQ7wNNopg2+ZkIxiv4GXLQ6lQVfRl97VPfWPysDVpUaqaQWEOYYucCD+6UEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766790727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rTRJd2D1gp2DmnYplyD+P5jcr+8YJdXR34n1POH+EKw=; b=K2Bg9OleVx36EQkRKxm/Gxjum/uqruW8ZSXc5OqZPr/vvq4jnyvuDwcjORfoMRGSCNKwWi It4l+GFv7upZKaoZAPwQgaAl2AWyAX7vYO2Eugp0AiXlARgzKbnwtxUbJxpSWESQf7WAcP Em+hPAnTPM8jqKQDEBLKRE1kMCD+eon2gzkKuN5uBK6OV9ZSORYaNkk2lrB19thoL+qEbg okKvdokO5BztQ0TlCdN2G36HIIOptmDsxaAlwRw5vJeNlbadSWMgJPig44ZfX6M25Os4Uj qmhifNzn828oX5WmnXRnKxvyjb9pneRzKnkxUe8zbjN5Ot9jnhgbugWNFPYCXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766790727; a=rsa-sha256; cv=none; b=WN/E7DnIIlHrweBtdMsZVdRD0IpVfu9LlgnAKqe5gkcXMOHHEqu5wClKZ4g8Ct/q6bb4Z8 7B6g22DOJhgzMty3c0uivKoNrCGVC2DQT+YLzMnFkQ3bqAebDhTetKtpVOeiW/d8faNzdi 9okL2mj+d2OiYgcXbh3MLlCFkbdNPd0kibhMBa0xFTbi8Deb37tIES4CahwaN4Jh/c4HlP wnC7rCTBB/LS1rIJ17+zncHwAeJgAqMNUhOAx8wBAR9ccyAYuODCTDey058sFFkrrQ+fSj FVjSuSOMGjcrW0WTTZc3weryvsH0p9pnWEfoksQijkT6vCG9NQCq8Tq0kXMXwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ddLwl5WVgzCrn; Fri, 26 Dec 2025 23:12:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id A2DB951D04; Sat, 27 Dec 2025 00:12:06 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 1c9ff80f0635 - main - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it From: Dimitry Andric In-Reply-To: Date: Sat, 27 Dec 2025 00:12:06 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <694ea9cc.9f30.1d45a192@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3826.700.81.1.4) On 26 Dec 2025, at 19:36, Konstantin Belousov = wrote: >=20 > On Fri, Dec 26, 2025 at 03:29:16PM +0000, Dimitry Andric wrote: >> The branch main has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1c9ff80f06350fa44b7e50ce09ad665a= b0082abb >>=20 >> commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb >> Author: Dimitry Andric >> AuthorDate: 2025-12-26 15:26:13 +0000 >> Commit: Dimitry Andric >> CommitDate: 2025-12-26 15:26:13 +0000 >>=20 >> tools.build: add sys/cdefs.h to SYSINCS, since lots of other = headers use it >>=20 >> This is needed to let the legacy stage compile against newer = versions of >> sys/font.h, which transitively includes sys/cdefs.h, and requires = the >> new __nonstring macro from it. >>=20 >> Fixes: e2c93ed09f25 >> MFC after: 3 days >> --- >> tools/build/Makefile | 4 ++++ >> 1 file changed, 4 insertions(+) >>=20 >> diff --git a/tools/build/Makefile b/tools/build/Makefile >> index a701c12a9b5c..2c6237c4dd7d 100644 >> --- a/tools/build/Makefile >> +++ b/tools/build/Makefile >> @@ -351,6 +351,10 @@ MSDOSFSINCS+=3D ${SRCTOP}/sys/fs/msdosfs/fat.h >> MSDOSFSINCS+=3D ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h >> DISKINCS+=3D ${SRCTOP}/sys/sys/disk/bsd.h >>=20 >> +# Needed to build most of the things below, which include = sys/cdefs.h either >> +# directly or transitively >> +SYSINCS+=3D ${SRCTOP}/sys/sys/cdefs.h >> + >> # Needed to build config (since it uses libnv) >> SYSINCS+=3D ${SRCTOP}/sys/sys/_nv.h >> SYSINCS+=3D ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ >=20 > Then the sys/_visible.h needs to be added as well if it is not added = yet. Thanks, committed that in 086bedb11a85. -Dimitry From nobody Sat Dec 27 16:29:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddnxs6VBzz6LXZ8 for ; Sat, 27 Dec 2025 16:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddnxs4JG3z3DqB for ; Sat, 27 Dec 2025 16:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766852977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XI8L9SnRQUTwpufPa5Kk6Qru2cKRolLK1z9Za4QmIzk=; b=G5uEPfG9TOeinImL2/njPyTMq82XMYV64Ca6RBsNPL731YCcmlTiFk0RHjVTZC4Nntcmc/ TbDN1cIMjLQxW21LYi7tyyi3EJy/oVQeKimNbmxMeg2cgfzCPusF8Ib5t07ZGYBBmlbLBX w99DirLyiU9y8p+iHMW2xH0nJNzsoB7DGl/R3NZ4j2tjcUBJa3yrZAolYK+9Jaj8pC4Tx5 Cxky3+ODZ2BBQj/9JtoPYOiTy56VePsr6AnhbLnIA6dJnGzTqsSujFdeq/qrwjjvswukZ2 4mJT28UfqDsjoFcFR5Sd2Q5ZJHnLeuyXRn3BO2+uQ5fUEmSWxmvQ8CU+m9/Jkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766852977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XI8L9SnRQUTwpufPa5Kk6Qru2cKRolLK1z9Za4QmIzk=; b=oYGNxh/jDO/Foc8eXB2AtIsaJjVdVUSrwhPN3OGhittWhtyum40+yELLNn6VOsLfA/YLUK 0K17Az5IJVKIHSVcun2F47LwdEu4l9LPdUfrpquce+jvmlOIo6XoVRYPyV0TOmXYwLDtY6 1jo7rjdhrznXSPgYD/I84PLLQPVClz4lrXLpCtoqRLuhqmvPLhC0ujIvwFYICIIGaVEfCq JL8RERrJARVks5LsQw553fBhmk6n+o+JD07YMP7QUI1JpPw8WoAhkt7O2fW9M+Bm5jJdyV ScFc7/68LOfaXBTX/2+u33UOJHRSmR70BsTuPUe4/vTnBopOKxTrHhtNh9v7qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766852977; a=rsa-sha256; cv=none; b=BaH0tdoxAytUG7tEbM717iLkzOvhuH+ymNTquyQze4xhQlpkSf5YKUwEsrcncuNY+nLzno PAHjUpPuSujypgX8ZzX9nxaTHMt7dR9oL+Br/c+OW5vlcYnRkyTHO8mTjrq9MKp+YyK6pm 0/hpnfrmrPyY41/kMVS1JZTs0nyvgrbHdE9Dr6q5MrgfkwYvSZVg6Bw667cLDJGKg4PAXB pw6WxKuVe4G/8cDr3FKq57D2ljBZ0U4EmmtHlRw+cHYxYuhq73omCLXmVslbf/Umpw8SY5 78wXPSizbC95EX4Pwo2eY7NL/ISYtrbbdnkqdc2Yovd9C+IQbZopiVeV0Ty8Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddnxs35Pmz16K0 for ; Sat, 27 Dec 2025 16:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d9d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Dec 2025 16:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 791fb098c9e8 - stable/15 - Import latest mtree from NetBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 791fb098c9e84282b7d061c5708569757e6c65a3 Auto-Submitted: auto-generated Date: Sat, 27 Dec 2025 16:29:37 +0000 Message-Id: <69500971.d9d4.7c502b5d@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=791fb098c9e84282b7d061c5708569757e6c65a3 commit 791fb098c9e84282b7d061c5708569757e6c65a3 Author: Jose Luis Duran AuthorDate: 2025-12-19 20:14:35 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-27 16:28:01 +0000 Import latest mtree from NetBSD Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c' PR: 192839 PR: 219467 MFC after: 1 week (cherry picked from commit f8cee1f2c2dfba6223385fd711cce9faeca76451) --- contrib/mtree/compare.c | 16 ++++++---------- contrib/mtree/create.c | 7 ++++--- contrib/mtree/mtree.c | 36 ++++++++++++++++++++++-------------- contrib/mtree/spec.c | 25 +++++++++++-------------- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/contrib/mtree/compare.c b/contrib/mtree/compare.c index 3d8cf2335207..cc31ec365194 100644 --- a/contrib/mtree/compare.c +++ b/contrib/mtree/compare.c @@ -1,4 +1,4 @@ -/* $NetBSD: compare.c,v 1.61 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: compare.c,v 1.63 2025/12/14 17:30:47 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: compare.c,v 1.61 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: compare.c,v 1.63 2025/12/14 17:30:47 christos Exp $"); #endif #endif /* not lint */ @@ -291,16 +291,12 @@ typeerr: LABEL; (u_long)p->fts_statp->st_mode & MBITS); if (uflag) { if (lchmod(p->fts_accpath, s->st_mode)) - printf(", not modified: %s%s\n", - strerror(errno), - flavor == F_FREEBSD9 ? "" : ")"); + printf(", not modified: %s", strerror(errno)); else - printf(", modified%s%s\n", - was_unlinked ? " by unlink" : "", - flavor == F_FREEBSD9 ? "" : ")"); + printf(", modified%s", + was_unlinked ? " by unlink" : ""); } - else - printf(")\n"); + printf("%s\n", flavor == F_FREEBSD9 ? "" : ")"); tab = "\t"; skip: ; } diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c index e23004851f39..191d69c6a537 100644 --- a/contrib/mtree/create.c +++ b/contrib/mtree/create.c @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.79 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.79 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $"); #endif #endif /* not lint */ @@ -236,7 +236,8 @@ statf(FILE *fp, int indent, FTSENT *p) offset += fprintf(fp, "%*s", (INDENTNAMELEN + indent) - offset, ""); - if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) + if (keys & F_TYPE && + !S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) output(fp, indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) { diff --git a/contrib/mtree/mtree.c b/contrib/mtree/mtree.c index 28f09fa32210..479f6acfca3a 100644 --- a/contrib/mtree/mtree.c +++ b/contrib/mtree/mtree.c @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.51 2024/12/05 17:17:15 christos Exp $ */ +/* $NetBSD: mtree.c,v 1.52 2025/12/18 18:17:26 christos Exp $ */ /*- * Copyright (c) 1989, 1990, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: mtree.c,v 1.51 2024/12/05 17:17:15 christos Exp $"); +__RCSID("$NetBSD: mtree.c,v 1.52 2025/12/18 18:17:26 christos Exp $"); #endif #endif /* not lint */ @@ -73,19 +73,20 @@ static struct { }; __dead static void usage(void); +static int parsekeys(char **); int main(int argc, char **argv) { int ch, status; unsigned int i; - int cflag, Cflag, Dflag, Uflag, wflag; + int cflag, Cflag, Dflag, Uflag, wflag, rkeys; char *dir, *p; FILE *spec1, *spec2; setprogname(argv[0]); - cflag = Cflag = Dflag = Uflag = wflag = 0; + cflag = Cflag = Dflag = Uflag = wflag = rkeys = 0; dir = NULL; init_excludes(); spec1 = stdin; @@ -150,14 +151,9 @@ main(int argc, char **argv) break; case 'k': keys = F_TYPE; - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys |= parsekey(p, NULL); - break; + /*FALLTHROUGH*/ case 'K': - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys |= parsekey(p, NULL); + keys |= parsekeys(&optarg); break; case 'l': lflag = 1; @@ -198,9 +194,7 @@ main(int argc, char **argv) rflag++; break; case 'R': - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys &= ~parsekey(p, NULL); + rkeys |= parsekeys(&optarg); break; case 's': sflag = 1; @@ -243,6 +237,8 @@ main(int argc, char **argv) if (argc) usage(); + keys &= ~rkeys; + switch (flavor) { case F_FREEBSD9: if (cflag && iflag) { @@ -312,6 +308,18 @@ main(int argc, char **argv) exit(status); } +static int +parsekeys(char **arg) +{ + const char *p; + int k = 0; + + while ((p = strsep(arg, " \t,")) != NULL) + if (*p != '\0') + k |= parsekey(p, NULL); + return k; +} + static void usage(void) { diff --git a/contrib/mtree/spec.c b/contrib/mtree/spec.c index 24e15f33fa8a..af5248be1596 100644 --- a/contrib/mtree/spec.c +++ b/contrib/mtree/spec.c @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.92 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: spec.c,v 1.94 2025/12/18 14:05:41 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: spec.c,v 1.92 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: spec.c,v 1.94 2025/12/18 14:05:41 christos Exp $"); #endif #endif /* not lint */ @@ -100,7 +100,7 @@ static dev_t parsedev(char *); static void replacenode(NODE *, NODE *); static void set(char *, NODE *); static void unset(char *, NODE *); -static void addchild(NODE *, NODE *); +static NODE *addchild(NODE *, NODE *); static int nodecmp(const NODE *, const NODE *); static int appendfield(FILE *, int, const char *, ...) __printflike(3, 4); @@ -239,8 +239,7 @@ noparent: mtree_err("no parent node"); * full path entry; add or replace */ centry->parent = pathparent; - addchild(pathparent, centry); - last = centry; + last = addchild(pathparent, centry); } else if (strcmp(centry->name, ".") == 0) { /* * duplicate "." entry; always replace @@ -252,8 +251,7 @@ noparent: mtree_err("no parent node"); * add or replace */ centry->parent = last; - addchild(last, centry); - last = centry; + last = addchild(last, centry); } else { /* * new relative child in parent dir @@ -261,8 +259,7 @@ noparent: mtree_err("no parent node"); * add or replace */ centry->parent = last->parent; - addchild(last->parent, centry); - last = centry; + last = addchild(last->parent, centry); } } return (root); @@ -721,7 +718,7 @@ unset(char *t, NODE *ip) * a duplicate, insert it into the linked list referenced by * pathparent->child. Keep the list sorted if Sflag is set. */ -static void +static NODE * addchild(NODE *pathparent, NODE *centry) { NODE *samename; /* node with the same name as centry */ @@ -740,7 +737,7 @@ addchild(NODE *pathparent, NODE *centry) if (cur == NULL) { /* centry is pathparent's first and only child node so far */ pathparent->child = centry; - return; + return centry; } /* @@ -785,7 +782,7 @@ addchild(NODE *pathparent, NODE *centry) replacenode(samename, centry); if (samename == replacepos) { /* The just-replaced node was in the correct position */ - return; + return samename; } if (samename == insertpos || samename->prev == insertpos) { /* @@ -793,7 +790,7 @@ addchild(NODE *pathparent, NODE *centry) * or just after the replaced node, but that would * be equivalent to just retaining the replaced node. */ - return; + return samename; } /* @@ -833,7 +830,7 @@ addchild(NODE *pathparent, NODE *centry) if (centry->next) centry->next->prev = centry; } - return; + return centry; } /* From nobody Sat Dec 27 16:29:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddny86T9Bz6LXkg for ; Sat, 27 Dec 2025 16:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddny85kgcz3Djj for ; Sat, 27 Dec 2025 16:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766852992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OHs7xevdTiCOuWKtuEhsz+9GsF3L20kx3JcCcI2H91g=; b=Z2XSW4fpnrEOlyTED3Y+1+7wwM5Zvethq7s8RK9FeKTv2vTg4WmQytnhxPyTHf2r8zNhkW OhW+c1YPvjI2MMJkgVMuJQ2FOI32idlFA4N/tqcCQ3rLnjHwAgTyYaCHwhqZyD/U/mOT/I /q3eD2/kxM+6NQUsFJtglIQWl2A69k5g5WnqChHE/92j2Wbb/wDs7v7lkxRBGJrCEyoZwD rY8kL4VQVcuDgEgEfCJKj55ladoe9pz0ebaeVRftfgOLmlJ8OW4u9ye1WCjKReMI69/ax6 wJ4pYerHhfocvYzdvR5lFJSiKG/Vo3aPpUur+1nxrIh73Dr+vD7NW3xNOBGqYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766852992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OHs7xevdTiCOuWKtuEhsz+9GsF3L20kx3JcCcI2H91g=; b=RfD4QC7Iq7pw//dil8XoHqcACHfBx7V+UgxzxC6mITJBEtsT29HdkSyMcvb3Ek7KlvoCFj 1rJZM5FsnbV0OFbCgHmJyWOcJP3IOi4c+fbcj5Pae4Xufxds59NSGjwFwi4nikFd58QV51 Wxqi7Usk2WzXd4MtXTumt4+cuKmuQ0qQxhjuF3JZHzrjuCysFIMMxtw1cam2yxczIR/ehH iqSmjzz4aw9ZZtrbG2XRVgg5DBc4dIWk6CCwQ8CDrWYB5MML9jTVk6eV9ShH+nR54w8QPP WcMoKgEKXpdj4EgMzFCrrWFovj4Am5tdoz0ZW6Mgygn6axJKR+GyBHhiHWT3UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766852992; a=rsa-sha256; cv=none; b=wntAe87iJm7McDYvUlJme3TgR3Bm7wfGPt0x30dYESfT2cNj0IW/+gQ3omCSWk9TdF059L 0dXQ9kvcod7ruvrdFR4r9y1K70jUsrSUCmcCq2Ie0MpcUpQcqMqj5+bIt3vyXvxTV6moB7 tL4iTaoXkrXODKO0XaH7mDUpqcosnDNUduIoTvyMa7M0o8KmDPbGg2HEI+vVDI5AXk+Jp9 xlqODJ4EHZNQZhqFJfwJTN+7jgyG6Ofcdd7Jb+VVWWglGk1FpJO/n8KhlTyFiVSLxfRFE0 687qncJAuvlGV8sqF9PDfMuWV/98ags/r8NXDuE4ApcGLjMls4EzE6Gkmhbd4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddny859V4z169f for ; Sat, 27 Dec 2025 16:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d7ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Dec 2025 16:29:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f9d671f726ac - stable/14 - Import latest mtree from NetBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9d671f726ac2199b906fc406b46b57cd2a11cf7 Auto-Submitted: auto-generated Date: Sat, 27 Dec 2025 16:29:52 +0000 Message-Id: <69500980.d7ac.7b9ac11c@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f9d671f726ac2199b906fc406b46b57cd2a11cf7 commit f9d671f726ac2199b906fc406b46b57cd2a11cf7 Author: Jose Luis Duran AuthorDate: 2025-12-19 20:14:35 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-27 16:28:35 +0000 Import latest mtree from NetBSD Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c' PR: 192839 PR: 219467 MFC after: 1 week (cherry picked from commit f8cee1f2c2dfba6223385fd711cce9faeca76451) --- contrib/mtree/compare.c | 16 ++++++---------- contrib/mtree/create.c | 7 ++++--- contrib/mtree/mtree.c | 36 ++++++++++++++++++++++-------------- contrib/mtree/spec.c | 25 +++++++++++-------------- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/contrib/mtree/compare.c b/contrib/mtree/compare.c index 3d8cf2335207..cc31ec365194 100644 --- a/contrib/mtree/compare.c +++ b/contrib/mtree/compare.c @@ -1,4 +1,4 @@ -/* $NetBSD: compare.c,v 1.61 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: compare.c,v 1.63 2025/12/14 17:30:47 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: compare.c,v 1.61 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: compare.c,v 1.63 2025/12/14 17:30:47 christos Exp $"); #endif #endif /* not lint */ @@ -291,16 +291,12 @@ typeerr: LABEL; (u_long)p->fts_statp->st_mode & MBITS); if (uflag) { if (lchmod(p->fts_accpath, s->st_mode)) - printf(", not modified: %s%s\n", - strerror(errno), - flavor == F_FREEBSD9 ? "" : ")"); + printf(", not modified: %s", strerror(errno)); else - printf(", modified%s%s\n", - was_unlinked ? " by unlink" : "", - flavor == F_FREEBSD9 ? "" : ")"); + printf(", modified%s", + was_unlinked ? " by unlink" : ""); } - else - printf(")\n"); + printf("%s\n", flavor == F_FREEBSD9 ? "" : ")"); tab = "\t"; skip: ; } diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c index e23004851f39..191d69c6a537 100644 --- a/contrib/mtree/create.c +++ b/contrib/mtree/create.c @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.79 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.79 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $"); #endif #endif /* not lint */ @@ -236,7 +236,8 @@ statf(FILE *fp, int indent, FTSENT *p) offset += fprintf(fp, "%*s", (INDENTNAMELEN + indent) - offset, ""); - if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) + if (keys & F_TYPE && + !S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) output(fp, indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) { diff --git a/contrib/mtree/mtree.c b/contrib/mtree/mtree.c index 28f09fa32210..479f6acfca3a 100644 --- a/contrib/mtree/mtree.c +++ b/contrib/mtree/mtree.c @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.51 2024/12/05 17:17:15 christos Exp $ */ +/* $NetBSD: mtree.c,v 1.52 2025/12/18 18:17:26 christos Exp $ */ /*- * Copyright (c) 1989, 1990, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: mtree.c,v 1.51 2024/12/05 17:17:15 christos Exp $"); +__RCSID("$NetBSD: mtree.c,v 1.52 2025/12/18 18:17:26 christos Exp $"); #endif #endif /* not lint */ @@ -73,19 +73,20 @@ static struct { }; __dead static void usage(void); +static int parsekeys(char **); int main(int argc, char **argv) { int ch, status; unsigned int i; - int cflag, Cflag, Dflag, Uflag, wflag; + int cflag, Cflag, Dflag, Uflag, wflag, rkeys; char *dir, *p; FILE *spec1, *spec2; setprogname(argv[0]); - cflag = Cflag = Dflag = Uflag = wflag = 0; + cflag = Cflag = Dflag = Uflag = wflag = rkeys = 0; dir = NULL; init_excludes(); spec1 = stdin; @@ -150,14 +151,9 @@ main(int argc, char **argv) break; case 'k': keys = F_TYPE; - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys |= parsekey(p, NULL); - break; + /*FALLTHROUGH*/ case 'K': - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys |= parsekey(p, NULL); + keys |= parsekeys(&optarg); break; case 'l': lflag = 1; @@ -198,9 +194,7 @@ main(int argc, char **argv) rflag++; break; case 'R': - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys &= ~parsekey(p, NULL); + rkeys |= parsekeys(&optarg); break; case 's': sflag = 1; @@ -243,6 +237,8 @@ main(int argc, char **argv) if (argc) usage(); + keys &= ~rkeys; + switch (flavor) { case F_FREEBSD9: if (cflag && iflag) { @@ -312,6 +308,18 @@ main(int argc, char **argv) exit(status); } +static int +parsekeys(char **arg) +{ + const char *p; + int k = 0; + + while ((p = strsep(arg, " \t,")) != NULL) + if (*p != '\0') + k |= parsekey(p, NULL); + return k; +} + static void usage(void) { diff --git a/contrib/mtree/spec.c b/contrib/mtree/spec.c index 24e15f33fa8a..af5248be1596 100644 --- a/contrib/mtree/spec.c +++ b/contrib/mtree/spec.c @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.92 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: spec.c,v 1.94 2025/12/18 14:05:41 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: spec.c,v 1.92 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: spec.c,v 1.94 2025/12/18 14:05:41 christos Exp $"); #endif #endif /* not lint */ @@ -100,7 +100,7 @@ static dev_t parsedev(char *); static void replacenode(NODE *, NODE *); static void set(char *, NODE *); static void unset(char *, NODE *); -static void addchild(NODE *, NODE *); +static NODE *addchild(NODE *, NODE *); static int nodecmp(const NODE *, const NODE *); static int appendfield(FILE *, int, const char *, ...) __printflike(3, 4); @@ -239,8 +239,7 @@ noparent: mtree_err("no parent node"); * full path entry; add or replace */ centry->parent = pathparent; - addchild(pathparent, centry); - last = centry; + last = addchild(pathparent, centry); } else if (strcmp(centry->name, ".") == 0) { /* * duplicate "." entry; always replace @@ -252,8 +251,7 @@ noparent: mtree_err("no parent node"); * add or replace */ centry->parent = last; - addchild(last, centry); - last = centry; + last = addchild(last, centry); } else { /* * new relative child in parent dir @@ -261,8 +259,7 @@ noparent: mtree_err("no parent node"); * add or replace */ centry->parent = last->parent; - addchild(last->parent, centry); - last = centry; + last = addchild(last->parent, centry); } } return (root); @@ -721,7 +718,7 @@ unset(char *t, NODE *ip) * a duplicate, insert it into the linked list referenced by * pathparent->child. Keep the list sorted if Sflag is set. */ -static void +static NODE * addchild(NODE *pathparent, NODE *centry) { NODE *samename; /* node with the same name as centry */ @@ -740,7 +737,7 @@ addchild(NODE *pathparent, NODE *centry) if (cur == NULL) { /* centry is pathparent's first and only child node so far */ pathparent->child = centry; - return; + return centry; } /* @@ -785,7 +782,7 @@ addchild(NODE *pathparent, NODE *centry) replacenode(samename, centry); if (samename == replacepos) { /* The just-replaced node was in the correct position */ - return; + return samename; } if (samename == insertpos || samename->prev == insertpos) { /* @@ -793,7 +790,7 @@ addchild(NODE *pathparent, NODE *centry) * or just after the replaced node, but that would * be equivalent to just retaining the replaced node. */ - return; + return samename; } /* @@ -833,7 +830,7 @@ addchild(NODE *pathparent, NODE *centry) if (centry->next) centry->next->prev = centry; } - return; + return centry; } /* From nobody Sat Dec 27 16:30:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddnyV0Nshz6LXl6 for ; Sat, 27 Dec 2025 16:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddnyT5y5Bz3F8c for ; Sat, 27 Dec 2025 16:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766853009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjkbcaB05ZKjTxi/82YFDoGFuZPTklRSRF20W+0hjF0=; b=YWBQKbSGtFCFX20N//FbYchqXKV+J9mj4RqD5XHKs7llrcgO57Vjt1SkrHf/9xdQp0eNJb tuC90X22t0Gw7viauJUy60C+LTfyU9FWgqc6LWlyCB/goKDLKgbxv8F+LyPfJGgQa2cdA+ OrihgqCpxREpMsaDcPAgjW2MygtRn6ewoyYCdZhHbk4Q9Aw2niPWgpdcNU5H748emVflDf EZ8eJOlUc9PlEC5gUGZNYZLdXnjDeW5OM17n7h7smasHxwbYO/jB0Pbt80k2OeQybvGNTb KqjQSKZOXOZdiXKRW+A/Q02OqTGRsQ5nednEOvLfMdBp+vzqJdccgstnD7AFAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766853009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjkbcaB05ZKjTxi/82YFDoGFuZPTklRSRF20W+0hjF0=; b=dGNtb+No0pcuL5l6AQnBZpDjY83ZNOlxFVNHaFyJxpJAUIXwwq2amnpDs30AwgnSI5hKXp UO4RlKaLp36o68BbfZ1X7bo5+gynSxUnJzFPk62yV3+mjV7WmSrVB9xNnB9iSOuQEQLXJ6 zqniTVBLah0n5O2X6dz56/+iiKLW/i/rAuqcqTF0yyt9FdpKgg/aTM70pqH7qd1l8EXrlY yU2n6bCTFwIZ+ODabNmIyfgw4gv9c2gHbfCk7wZSpHzEUn995qZ7wAqdkUvBQcSQxBoBx7 Fgqlp+fXwrUZEO9cLxCSLKaZAbkcWE6ICrKhAO5I6Sxxx9zTXK5sGxAMn3lvTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766853009; a=rsa-sha256; cv=none; b=go2Ff2DNQ8HpFe6cB2hmBxASiOGm/IcrjC2dDvjVp6G0urNNat3CUMFNvvWbyrmQO1K01Q DmDY06Fbj+qJp08Mjd5rFbRbO997JmtdUsqcDN+PGCUHxDKlIoPpAcB4Q3utP+NUzFX9EB TFFuByHzgvc96uGAZQ8fNzl3OSy5dmPLHMasf8mMH2BXZuTMlwn8zpw/zm4zlrHq6en7Mf s5vTigLWq8JDIB2gn8VqMIXF9W+KB7i8dZNwRcK0SmBejFcBb2BMeuEQVteGxZBXZsiWXF Ia7OJ1RfE76ZOiRtVcpOqnqWIeZzJbEiSULCBDugp5UKJSDeCrgfMOSV1Sm77Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddnyT5Xdsz16MS for ; Sat, 27 Dec 2025 16:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c3ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Dec 2025 16:30:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 5ea3ad01e6f5 - stable/13 - Import latest mtree from NetBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5ea3ad01e6f511ee573e993e89810c27a7cf4198 Auto-Submitted: auto-generated Date: Sat, 27 Dec 2025 16:30:09 +0000 Message-Id: <69500991.c3ef.7e39ddd7@gitrepo.freebsd.org> The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea3ad01e6f511ee573e993e89810c27a7cf4198 commit 5ea3ad01e6f511ee573e993e89810c27a7cf4198 Author: Jose Luis Duran AuthorDate: 2025-12-19 20:14:35 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-27 16:29:02 +0000 Import latest mtree from NetBSD Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c' PR: 192839 PR: 219467 MFC after: 1 week (cherry picked from commit f8cee1f2c2dfba6223385fd711cce9faeca76451) --- contrib/mtree/compare.c | 16 ++++++---------- contrib/mtree/create.c | 7 ++++--- contrib/mtree/mtree.c | 36 ++++++++++++++++++++++-------------- contrib/mtree/spec.c | 25 +++++++++++-------------- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/contrib/mtree/compare.c b/contrib/mtree/compare.c index 3d8cf2335207..cc31ec365194 100644 --- a/contrib/mtree/compare.c +++ b/contrib/mtree/compare.c @@ -1,4 +1,4 @@ -/* $NetBSD: compare.c,v 1.61 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: compare.c,v 1.63 2025/12/14 17:30:47 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: compare.c,v 1.61 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: compare.c,v 1.63 2025/12/14 17:30:47 christos Exp $"); #endif #endif /* not lint */ @@ -291,16 +291,12 @@ typeerr: LABEL; (u_long)p->fts_statp->st_mode & MBITS); if (uflag) { if (lchmod(p->fts_accpath, s->st_mode)) - printf(", not modified: %s%s\n", - strerror(errno), - flavor == F_FREEBSD9 ? "" : ")"); + printf(", not modified: %s", strerror(errno)); else - printf(", modified%s%s\n", - was_unlinked ? " by unlink" : "", - flavor == F_FREEBSD9 ? "" : ")"); + printf(", modified%s", + was_unlinked ? " by unlink" : ""); } - else - printf(")\n"); + printf("%s\n", flavor == F_FREEBSD9 ? "" : ")"); tab = "\t"; skip: ; } diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c index e23004851f39..191d69c6a537 100644 --- a/contrib/mtree/create.c +++ b/contrib/mtree/create.c @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.79 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.79 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $"); #endif #endif /* not lint */ @@ -236,7 +236,8 @@ statf(FILE *fp, int indent, FTSENT *p) offset += fprintf(fp, "%*s", (INDENTNAMELEN + indent) - offset, ""); - if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) + if (keys & F_TYPE && + !S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) output(fp, indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) { diff --git a/contrib/mtree/mtree.c b/contrib/mtree/mtree.c index 28f09fa32210..479f6acfca3a 100644 --- a/contrib/mtree/mtree.c +++ b/contrib/mtree/mtree.c @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.51 2024/12/05 17:17:15 christos Exp $ */ +/* $NetBSD: mtree.c,v 1.52 2025/12/18 18:17:26 christos Exp $ */ /*- * Copyright (c) 1989, 1990, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: mtree.c,v 1.51 2024/12/05 17:17:15 christos Exp $"); +__RCSID("$NetBSD: mtree.c,v 1.52 2025/12/18 18:17:26 christos Exp $"); #endif #endif /* not lint */ @@ -73,19 +73,20 @@ static struct { }; __dead static void usage(void); +static int parsekeys(char **); int main(int argc, char **argv) { int ch, status; unsigned int i; - int cflag, Cflag, Dflag, Uflag, wflag; + int cflag, Cflag, Dflag, Uflag, wflag, rkeys; char *dir, *p; FILE *spec1, *spec2; setprogname(argv[0]); - cflag = Cflag = Dflag = Uflag = wflag = 0; + cflag = Cflag = Dflag = Uflag = wflag = rkeys = 0; dir = NULL; init_excludes(); spec1 = stdin; @@ -150,14 +151,9 @@ main(int argc, char **argv) break; case 'k': keys = F_TYPE; - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys |= parsekey(p, NULL); - break; + /*FALLTHROUGH*/ case 'K': - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys |= parsekey(p, NULL); + keys |= parsekeys(&optarg); break; case 'l': lflag = 1; @@ -198,9 +194,7 @@ main(int argc, char **argv) rflag++; break; case 'R': - while ((p = strsep(&optarg, " \t,")) != NULL) - if (*p != '\0') - keys &= ~parsekey(p, NULL); + rkeys |= parsekeys(&optarg); break; case 's': sflag = 1; @@ -243,6 +237,8 @@ main(int argc, char **argv) if (argc) usage(); + keys &= ~rkeys; + switch (flavor) { case F_FREEBSD9: if (cflag && iflag) { @@ -312,6 +308,18 @@ main(int argc, char **argv) exit(status); } +static int +parsekeys(char **arg) +{ + const char *p; + int k = 0; + + while ((p = strsep(arg, " \t,")) != NULL) + if (*p != '\0') + k |= parsekey(p, NULL); + return k; +} + static void usage(void) { diff --git a/contrib/mtree/spec.c b/contrib/mtree/spec.c index 24e15f33fa8a..af5248be1596 100644 --- a/contrib/mtree/spec.c +++ b/contrib/mtree/spec.c @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.92 2024/12/05 17:17:43 christos Exp $ */ +/* $NetBSD: spec.c,v 1.94 2025/12/18 14:05:41 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: spec.c,v 1.92 2024/12/05 17:17:43 christos Exp $"); +__RCSID("$NetBSD: spec.c,v 1.94 2025/12/18 14:05:41 christos Exp $"); #endif #endif /* not lint */ @@ -100,7 +100,7 @@ static dev_t parsedev(char *); static void replacenode(NODE *, NODE *); static void set(char *, NODE *); static void unset(char *, NODE *); -static void addchild(NODE *, NODE *); +static NODE *addchild(NODE *, NODE *); static int nodecmp(const NODE *, const NODE *); static int appendfield(FILE *, int, const char *, ...) __printflike(3, 4); @@ -239,8 +239,7 @@ noparent: mtree_err("no parent node"); * full path entry; add or replace */ centry->parent = pathparent; - addchild(pathparent, centry); - last = centry; + last = addchild(pathparent, centry); } else if (strcmp(centry->name, ".") == 0) { /* * duplicate "." entry; always replace @@ -252,8 +251,7 @@ noparent: mtree_err("no parent node"); * add or replace */ centry->parent = last; - addchild(last, centry); - last = centry; + last = addchild(last, centry); } else { /* * new relative child in parent dir @@ -261,8 +259,7 @@ noparent: mtree_err("no parent node"); * add or replace */ centry->parent = last->parent; - addchild(last->parent, centry); - last = centry; + last = addchild(last->parent, centry); } } return (root); @@ -721,7 +718,7 @@ unset(char *t, NODE *ip) * a duplicate, insert it into the linked list referenced by * pathparent->child. Keep the list sorted if Sflag is set. */ -static void +static NODE * addchild(NODE *pathparent, NODE *centry) { NODE *samename; /* node with the same name as centry */ @@ -740,7 +737,7 @@ addchild(NODE *pathparent, NODE *centry) if (cur == NULL) { /* centry is pathparent's first and only child node so far */ pathparent->child = centry; - return; + return centry; } /* @@ -785,7 +782,7 @@ addchild(NODE *pathparent, NODE *centry) replacenode(samename, centry); if (samename == replacepos) { /* The just-replaced node was in the correct position */ - return; + return samename; } if (samename == insertpos || samename->prev == insertpos) { /* @@ -793,7 +790,7 @@ addchild(NODE *pathparent, NODE *centry) * or just after the replaced node, but that would * be equivalent to just retaining the replaced node. */ - return; + return samename; } /* @@ -833,7 +830,7 @@ addchild(NODE *pathparent, NODE *centry) if (centry->next) centry->next->prev = centry; } - return; + return centry; } /* From nobody Sat Dec 27 21:59:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddxFz44sCz6Lx9Q for ; Sat, 27 Dec 2025 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddxFz3DXwz3hLS for ; Sat, 27 Dec 2025 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766872743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lXBHyD5NVDWmsaRglquEScFmoUQZ+7phqUMPeH3HVw=; b=C9L9C9gt2v604cLWqBufkIWhPtNyctl+ZT8SI5zjHsqMTedVPAcCeaqUj4mdT/QhcEOp8o uHVpcG5m/chebVupbbKHeCAiHKKYzB0+RhFWYBnQxnFFCc/h3xEo8ssGdQFd24bCDDaPYP oaiWBnSxZo8no0X7vzynEIZWyIdV55iZoogFlEOZqVFYoyZjdrn1gdJf25WjRqgiuOdZtt q5/uHKlJjJHa9pdB6Q9SL9h2S45+4HGgUDx5RZlFyNX6xwjXVCcw5dLA6qdLGZ3Hgnee7Y /pR/AymH7yCvzGIKQOpWtUNG5rBVQDs2L8g0h+HQIOC4wJw2QEMCQJHmZCEPJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766872743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lXBHyD5NVDWmsaRglquEScFmoUQZ+7phqUMPeH3HVw=; b=jDihsuV9oYlFH/+gwGAgSYvvOjr/aMwcpD/1bKbww3UFSADAtT3xqQTyoHdVu85e08fBGO trkX3UewbTajDIPCxekQhl4SrWz9FJYrFwxRTToqD2NPdQyLrIo10n6k83sDF9B8bxoYVX Nify7atGv6bz7KKDKmh9SOVAQ6Pc+w+tVu9Qzw4WrXyMrOvO5rSHMdPBpPmn5U5cC3LwNB W3ur2kTWiod5FUBRFQW/ZXkT1lYUgtnkpZEcG7v1nhEzox8hc4b3LFwSIJJPEyTH1YjX1J vQGrmNhZaZ2lefoA0NwkyHZVvrCVq0tewcvEEN+Y8ohBck77fv6kuSuL+HOlqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766872743; a=rsa-sha256; cv=none; b=IxY/RTxUxFrG3/LLREiU2tzRDiQRkegpegkerXMMiSt3YGNYpkedD8z3UWsT9b/JtR7vgF 9rrqClE7llwD3y7IwNVViTpSqVCzrTOb07cejy3cq1offdigugZ/xGnX8gZqdRb5snoOeH vfsvNv6pRIoI0s8tZ4K9MKphnHQIR3xheipKOX4X3ypgd1tM1EW1Qv2Hp6VCP9D0L2eKhH CGlWFABgLC+5dvo0fafrs5QM4q/fqajc6yruexpTElruT6Cbx1mlAX+G3Dtimylf/i/5Sj Dcqu/66ct5nlNrJlBCJf5B8CNogbjiJlE/ukZXU/kOZPYmUZOHYycUqlxO9+ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddxFz2NhVz2DB for ; Sat, 27 Dec 2025 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ecb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Dec 2025 21:59:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e6546807f4c1 - main - sh: avoid warnings about too-long initializer strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802 Auto-Submitted: auto-generated Date: Sat, 27 Dec 2025 21:59:03 +0000 Message-Id: <695056a7.ecb4.68a2c53f@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802 commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802 Author: Dimitry Andric AuthorDate: 2025-12-25 20:13:48 +0000 Commit: Dimitry Andric CommitDate: 2025-12-27 21:58:25 +0000 sh: avoid warnings about too-long initializer strings Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid warnings from clang 21 similar to: bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; | ^~~~~~~~~~~~~~~~~~~~~ bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 153 | {"==", STREQ}, | ^~~~ MFC after: 3 days Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D54362 --- bin/sh/options.h | 2 +- bin/test/test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sh/options.h b/bin/sh/options.h index a059e19707b1..2ce2e6ebedf2 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -74,7 +74,7 @@ extern char optval[NOPTS]; extern const char optletter[NSHORTOPTS]; #ifdef DEFINE_OPTIONS char optval[NOPTS]; -const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; +const char optletter[NSHORTOPTS] __nonstring = "efIimnsxvVECabupTPh"; static const unsigned char optname[] = "\007errexit" "\006noglob" diff --git a/bin/test/test.c b/bin/test/test.c index a35c5b424d3f..5ba5df5d7e44 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -116,7 +116,7 @@ enum token { #define TOKEN_TYPE(token) ((token) & 0xff00) static const struct t_op { - char op_text[2]; + char op_text[2] __nonstring; short op_num; } ops1[] = { {"=", STREQ}, From nobody Sat Dec 27 22:25:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddxrH0zFTz6M0Hr for ; Sat, 27 Dec 2025 22:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddxrH0HT8z3m8K for ; Sat, 27 Dec 2025 22:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766874319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9TdVsAS+Kd9K50XdXBhQFCPejCVb9yNtx5TNoe4ByE4=; b=lgnNlVjQzTybB5OygfKYIvHOyLh1MsGs6RZ5eCUIvKINJwq/Eux+xiYptIGkKrnb6oaIWV hvFX1BVif0s3PPaEoOsVlAVN5dU8DZrSt5BB5+u82uBfehDiQ0XS+LNXdCA5OcMHUttmkC ny2rABQWLufoNfZNvKgI28+dozL2gmSeu8Yf6f/P5KTvvRGA6HrG8WPpqXR3A/UebgcUAO JJcKda6nEfkRcUeiz7p+oWuzxufa+esFnolS3m7VJFBfPzGyVmtindnJKPyhGoz7OBT+ml 6RQmkl56TWIVWyDZh4XXEnkvJA53HOLQRMsluWP5YGkoFOOCFHDC9zarbdGKMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766874319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9TdVsAS+Kd9K50XdXBhQFCPejCVb9yNtx5TNoe4ByE4=; b=uMhPqZCW1eqJH6h/d7H3pKCqDBsHeHpOH74zQnBbCIoMLL6n04BWMeY9j5Uep/RSyBtp7c E3o2bJbGhw3RVl12aztFHcRfmk3eYpiD/Zs0xRDeEA8n1tIbzFfD4M35HIod38IrFM5KSY +zHseJB3MqbpwQ8qW9sZZ5BCcpzH+c6Acf6L9VoEYipc/pAG9hWIFuD5Zg2cYYn/nXn/Lj QcTR2iiW4KFkjI9kiIqVNPUT0tzwXGs1nWJWYqJ59NY3B6Q8d9zSW3jqODjlw405x0dA9A +txiQfVa8tnGpjKWaSRiHQzPzu8hnaHpCS3nOtYi6bgGsWDe56xFvS+m0Pl5Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766874319; a=rsa-sha256; cv=none; b=IHe+62Lv+9qsSnenf5KKUOvrRxWev4f1uw1FMI3LMmWzoqbcwWElFtXf7aVZZbbT4jGt6o p+PyomdQ7Vc9QYNtmpWQmg1I2TlVmU3MtVbzdFo1BTjabVjgHDPV+LX6uNZ7V33pK75FjH J/uiz6AuMYLb58wYhqOx8aCHCShvSbY39Peka6CtI8NkEObmzCuDqhm9SaLEffj9rur6bX qE6cLGTPipxL1oMFfe6Ytbri7ef9ziKIRdQ36nJeubi4L3vtswFx348ylDonQ3aFTW7R6C XpWde72b8pcyaKAV7JjoMxDiZcLsCjnyt1wBBmYdGZ22Tzg2wqcPnEuE+DWXCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddxrG6h47z2kC for ; Sat, 27 Dec 2025 22:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Dec 2025 22:25:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 294ba5698039 - vendor/llvm-project/release-21.x - vendor branch created List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-21.x X-Git-Reftype: branch X-Git-Commit: 294ba569803972323a64670451a82af53c660541 X-Git-Oldrev: 0000000000000000000000000000000000000000 X-Git-Newrev: 294ba569803972323a64670451a82af53c660541 Auto-Submitted: auto-generated Date: Sat, 27 Dec 2025 22:25:18 +0000 Message-Id: <69505cce.21f9b.15fc7e82@gitrepo.freebsd.org> The branch vendor/llvm-project/release-21.x has been created by dim: URL: https://cgit.FreeBSD.org/src/log/?id=294ba5698039 009b1c42aa62 Import LLVM, at r72732. ec2b103c267a Import Clang, at r72732. 33a8e4360f50 Import LLVM, at r72770. 922a2097733e Import Clang, at r72770. 68eb509bdc5c Import LLVM, at r72805, which fixes PR4315 and PR4316. 2659aeb5e51f Import Clang, at r72805. f4fe016fa15f Import LLVM, at r72995. 37f6c480c696 Import clang, at r72995. d2a7037439ec Import LLVM r73021. 70b4596d9d0d Import Clang r73021. 93338c197185 Import LLVM r73070. 8ba99c00327a Import Clang r73070. 600c6fa13de5 Import LLVM r73340. 7ef7bab7e3d0 Import Clang r73340. b2f21fb044b6 Update LLVM sources to r73879. b897c8660c4f Update Clang sources to r73879. 0408e1d309a7 Import LLVM r73954. d6aff018d446 Import Clang r73954. f76359690a70 Import LLVM r73984. f698f7e71940 Import Clang r73984. f859468f5a21 Import LLVM r74383. 4ebdf5c4f587 Import Clang r74383. 18f153bdb9db Import LLVM 74788. 5362a71c02e7 Import Clang r74788. 59850d087442 Update llvm to r84119. 4c8b24812ddc Update clang to r84119. 98781354c33b Update clang to 84175. 26137f35958f Update llvm to r84175. 5cd822fa9bbb Delete all stale files. a505eb93f43f Delete stale files. a5f348eb914e Delete some more files. 4a142eb28942 Update LLVM to r84949. 73490b890977 Update clang to r84949. bd3c9c2e3e89 These files does not belong here. f9666f9b3a3d This was removed upstream. 36bf506ad3c9 Update LLVM to r86025. 51fb8b013e77 Update clang to r86025. fc25e9aa5245 Delete this file. 72cc50852bec Update LLVM to r86140. 8f57cb030523 Update clang to r86140. 907da171cc91 Update LLVM to r89205. b3d5a323a5ca Update clang to r89205. 7d4538633051 Update LLVM to r89337. f5bd02d290ff Update clang to r89337. 76e2e0ebfdd3 Remove includes that were removed upstream. 06f9d4012fb8 Update LLVM to r90226. 1569ce68681d Update clang to r90226. 571945e6affd Update LLVM to 91430. 34d02d0b37f1 Update clang to 91430. 1e7804dbd25b Update LLVM to 92395. abe15e553e58 Updaet clang to 92395. 829000e035f4 Update LLVM to 93512. ee791dde723a Update clang to r93512. 989df958a10f Update LLVM to r94309. 5044f5c816ad Update clang to r94309. 6fe5c7aa327e Update LLVM to r96341. ecb7e5c8afe9 Update clang to r96341. 67a71b3184ce Update LLVM to 97654. 79ade4e02893 Update clang to 97654. f5a3459adfde Update LLVM to r97873. dd5132ce2569 Update clang to r97873. ea5b2dd11c05 Update LLVM to r98164. a16e9ac1f192 Update clang to r98164. c69102774f97 Update LLVM to r98631. 4a37f65f1c13 Update clang to r98631. 2f12f10af369 Update LLVM to r99115. c0c7bca4e5b8 Update clang to r99115. 104bd8179fb5 Update LLVM to r100181. 11d2b2d2bb70 Update clang to r100181. b5efedaf2ab2 Update LLVM to r100285. 2c56c396ce59 Update clang to r100285. 9f4a1da9a0a5 Update LLVM to r100520. 60bfabcd8ce6 Update clang to r100520. d7f7719e5e08 Update LLVM to r103004. 0883ccd9eac3 Update clang to r103004. 59161dfae322 Update LLVM to r103052. be17651f5cd2 Update clang to r103052. abdf259d4871 Update LLVM to r104832. d7279c4c177b Update clang to r104832. 66e41e3c6e8b Update LLVM to r108243. 4ba675006b5a Update clang to r108243. *** 517 LINES SKIPPED *** From nobody Sun Dec 28 01:17:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4df1gB1mqSz6MB1L for ; Sun, 28 Dec 2025 01:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4df1gB0ZvRz42FV for ; Sun, 28 Dec 2025 01:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766884662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWzQas9FQtFphlLZbhB4NWiY4emCo2/GDhxHkikGSJw=; b=L6ssp1Sj3XJ4z3Ey2ZZ+p0XOgff6iFK3khcf3RyfjAb89fqN8iUzctQ0+n60NuQviYyR8M eOnxMlhpmwPVNwKHojP4Wp7XnflKfLb1+rgXYLC6CuY8G37YkzKDVKKYUk87wrr1rMzdXK E0Ai48rS0j8D9UL9r0zfX7Gyil7oUFxqvYRPbr9j8/spb2TUvJ+hYq2NPsnnnGR7nNx3Jp eKtGGyJhFydXv26CEZat6SaiDuGN4abHPEkDkpZLUkFFk9sT8BtT57z2XcfCxar8dSr71t UAhlwmT0hZO/1Yo6Ee1Y7na3+rUgAJTbS3wjITsDQxqI8Fcai5acG+9gzMjDdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766884662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWzQas9FQtFphlLZbhB4NWiY4emCo2/GDhxHkikGSJw=; b=O8+zgKHi3ARBuWYoOHlyLNafmVg+mx6ZptG42z8gd9XRfx+LOBCiM1n1ENRl+Gl6ctLy9q ATq/kq0dqCNdxUfRwZPzSzc58hhzYywPuMvcC1lFD8fm4ezTRTSVKfdzwp9siFwVZNQED1 fdOeTjqWl13hDMp6hjphdyPRwDY8piIo7LhwrNnUzp9Pn0bfI3OyqkwIU1k+YYFViFnz4a obfq+jXdpQkeVStC9qZIYZRwi/OQoI0u2JOttgWnJilWvv9W9EOK7GiogxKpX75o6hm/FJ rGDL3E5aQsqaSatU+cOXmwGUVL2Mhi+VrIazmgKuEHn5TldnEoLyi5Tvbsjt3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766884662; a=rsa-sha256; cv=none; b=a+upttu+HfxrktW8e+nCyKnSAFs/BBS9gBlBlZLwTJUTgXXV9TTL8h+u3ZxXv9glX9v+ea 2iLrpscRoIkmuIoBo6/wAD6e6NWs/uae5wTWi3f9EFKOLWfipOTwtnvSr4vJnGbeNx6grV tv0T/8iNouN30jh/a9MouqAFIs+v7oKpcylgLD2dG8fd/YHvd45PWfnQgD3O0QCFMzFpCw UzNDCGwr53CNwUgMUqyZyLsol+V3LXpPNNjSt7nxSbsoOWg0lSrzdud+DW6QU2bvAth6vJ UBynLYITSReoJtlLg/ZTBOmmSCnpjGD1OZQXkzgkQMmawRFJ0OzUrl0io933WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4df1g973fzz7GG for ; Sun, 28 Dec 2025 01:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39d3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 01:17:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f22cffe43343 - main - vt.4: Remove Xr to nonexistent vidcontrol(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f22cffe43343d9d48c731952d94976c5deb9659e Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 01:17:41 +0000 Message-Id: <69508535.39d3d.4a68e660@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f22cffe43343d9d48c731952d94976c5deb9659e commit f22cffe43343d9d48c731952d94976c5deb9659e Author: Ed Maste AuthorDate: 2025-12-28 00:52:17 +0000 Commit: Ed Maste CommitDate: 2025-12-28 01:17:09 +0000 vt.4: Remove Xr to nonexistent vidcontrol(8) PR: 291985 Fixes: a8740ba860bf ("vt.4: Document increasing scrollback size") --- share/man/man4/vt.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 6176c8c3093e..d59030cfff9d 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -420,7 +420,6 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , -.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Sun Dec 28 05:48:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4df7h613Rbz6MTLR for ; Sun, 28 Dec 2025 05:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4df7h558Kvz3Dn6 for ; Sun, 28 Dec 2025 05:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766900933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vWOCI4ouqGxoIDYljLYDh+b697fSu/aQpzjmjT98acA=; b=ceB4oX0iXk3ynmJG8v3qU/3KWglYFqmPwhG+szrlmcL8EaqFTTg0BLow0mBBdjnOoXoKdt UvUVLizfRYMjXIAbbefNCZohL5f1zNc8+FemRC+8WkayK4XCXAyOQ5cQ0VlfxbhKSpM8eN cp5oA8jlVQ1/wiSBU5j2saMsJpQcbw7cTzGxxrRh6T1t7GCch1UajyF4V6w7nj5pVNYVvn mpCNvmuilvx7DyE1CxwHLBV1cPFLTuygb7tn7/lkBBFam+2lUrzhKclQ4FjChmuQizzyc1 CEpn58oyqYt3F2p85iXfX8sFl7FTYZXRXbfPZ1rGfhiHQ0TjFBjbSH3EsqqRnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766900933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vWOCI4ouqGxoIDYljLYDh+b697fSu/aQpzjmjT98acA=; b=eQS1dz/YL1fLMqK1vsqRt2L8Ud81EXaFvQVOBdzyoF38mfFXhTCFJf2qrfUVVsT0yhGhAI kwD/H+EQvuHRjuXWYPmEV5QfZ6s8a6FiFJe8IO3KdEQE9YR+vN26kimrFUdcxuB8C+3PHC n4/txRABeDXzaz5j9zuqQWpoaJMAHeR7rqVh3iNwYix8LYDlV5FNOy6efwSnqpTwAH/qpT erTgAzXmyD+fTukqN3Ucd0YguqZ3abUQEliN8ACwnlQtc8estIeTb9iRe+5DcYyr8vFmXu Ig85jLsyQRRS8TYwLJMjGA/HWu/v2Ez4+tthMnuTC1e8LbBjCeB5H6Gbdr7+bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766900933; a=rsa-sha256; cv=none; b=ggDK9BKbM6Vt60uf1gB/0A24V8p8NQn65EsLir2sVXq4p+kFvG6Cp6MIf85svseXqQ28RJ vmRG6iGlppKal51jJgSgqy+3zlsL8QKAa8J8WT03yOEvxBYidR1gEJNpI5kyc/zWgcSLAb /pi1RdaOlqD7sL6xgj3Y2KnCSL+H/jtWIrshyDuuBBBY1Y/OW2h++3oJV097yARjxnCnYF rcQvkHPRA6otOKaLkB+zvc8LVHcqojpV/2uCRqmcejwj0drHBi98MGJmhvJmJ3PD8XebfT +uJOkfFdukDFApYrGy+VqpHsKK5W0qFtOB3lTal3eTsOPZMy3wtY/tN5rGHSAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4df7h542M5zY7b for ; Sun, 28 Dec 2025 05:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25792 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 05:48:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 424089a0fc82 - main - loader: Fix powerpc64le by working around slof bug in qemu/slof List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 424089a0fc82ee9db8659b8c1099bbbde8999473 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 05:48:53 +0000 Message-Id: <6950c4c5.25792.96d1fae@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=424089a0fc82ee9db8659b8c1099bbbde8999473 commit 424089a0fc82ee9db8659b8c1099bbbde8999473 Author: Warner Losh AuthorDate: 2025-12-28 05:27:03 +0000 Commit: Warner Losh CommitDate: 2025-12-28 05:27:03 +0000 loader: Fix powerpc64le by working around slof bug in qemu/slof Fix powerpc 64 little endian booting by adding some padding. Due to https://gitlab.com/slof/slof/-/blob/master/lib/libelf/elf32.c?ref_type=heads#L114 https://gitlab.com/slof/slof/-/blob/master/lib/libelf/elf32.c?ref_type=heads#L150 using <= instead of <, slof used to loop over the phdrs. It overruns by 1 and so on little endian it swizzles the first 32 bytes of .text. Work around this by adding 32 bytes of padding after the headers. We should fix this in slof, but it's in the just released QEMU 10.2, so we have to pad things here for now. Now powerpc64le + qemu works. MFC After: 3 days (maybe EN too) Reviewed by: adrian, jhibbits Sponsored by: Netflix --- stand/powerpc/ofw/ppc-common.ldscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/powerpc/ofw/ppc-common.ldscript b/stand/powerpc/ofw/ppc-common.ldscript index e12dee74824a..edd37eba8fca 100644 --- a/stand/powerpc/ofw/ppc-common.ldscript +++ b/stand/powerpc/ofw/ppc-common.ldscript @@ -9,7 +9,7 @@ PHDRS SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x02c00000 + SIZEOF_HEADERS; + . = 0x02c00000 + SIZEOF_HEADERS + 32; .interp : { *(.interp) } :text .hash : { *(.hash) } .dynsym : { *(.dynsym) } From nobody Sun Dec 28 05:48:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4df7h67276z6MTG4 for ; Sun, 28 Dec 2025 05:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4df7h64YGWz3Dy7 for ; Sun, 28 Dec 2025 05:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766900934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aDre0Gx1obmZ1N+fPc1rzlLNpNN94TobBXffZuDyv6I=; b=G4SMxRS4VQ8GMskQC4mFbd/pYNQM4TDe4L1FOuk+YAImJ0BQ521AewAjB1PvD56OIH1+li KKsZFnFkDprYEKrcgrPvBxmxGedPGAGIxi1ySOBDJEGltxHEwuEysbrZ1kx+b12CBycvKM R+5uz2kCbFKjfPXjHHcsYv0v/SSGsUAJC614qzVfFoac2Sok+l6AWVjXOdBM83cNlvpkdV VweLpmvcOugsWbNMehkIzKZ9+kCOm3CLasUvMewlvIEcfzzPbKKfnkf8mTGhPO8ArW2UlU eEOWUsMivh1l4OUeHEP48a5e3FDXeeJJqCacH64TU4qCDnjKBe7+NqtEWi2aBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766900934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aDre0Gx1obmZ1N+fPc1rzlLNpNN94TobBXffZuDyv6I=; b=MKM1/wMNf7ud4yI/UO0NhNhQ+pTjoDQWFVAYfqlz94lDyDqt6F8ZSzYOEq/L8YE4YAseHk Vo442Gh1Nqjczci0AmOIitc3rrAmhicPKhaT0iwE9GuWGSgIUZwp1m8kD4LKIOElc2sg6n oAUeriIWnR8/sDQG/MI1Uu92XugHP5ztjqBROwZWmGSB+tyQngGtNh74OpRYIMseeusQHa gBFv4mUf+zYjgG5R8rcWWNhMNBY4UTV8EFzqZFc8zbc+TPW4g6CA0NLgsGIIyc+ykmihkS vIkVQALBLW1FeoZuWgA/Ey+FvOxezWA9Llu9nOQqVGihFkH+kpJgJBhDEZja1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766900934; a=rsa-sha256; cv=none; b=T6cj4OYQrWbrNhNlBuAP/xZCbIEHUD10JJKWl63soYDpvqAinpaGZm6oAv6FBm3I2uabpg sK6GEV50Ci8FAJ8vIPsIfH9gICYS90lt7SZpML9J9buc2VYPQfn0+a0GfFU3pOA/r8Avxa 5PYvxkVq2BVlW0efnKNmDzlFVrvB7xKgzM8AieVse3LR5HuVRszf1pd29KgHqMf304jwzZ aYGJ2KcziVPqlnXJxc/f9TO7O2zRtYP0kaGGSf8qfn/jDN8e/vQKSg6wZgE6mpVcR7VnYx sJWPTtLXEbUUWGK6rR7mY4fDaPfmDVK9paW6HofRqiTfcEHOG9ZYbnuhGLvB3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4df7h647hJzY7c for ; Sun, 28 Dec 2025 05:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a3c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 05:48:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8e8d7d489f7b - main - loader: Use C99 initializations for file_format List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8d7d489f7ba169b78b21fb84f8b4666fa871b8 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 05:48:54 +0000 Message-Id: <6950c4c6.25a3c.77e816f7@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8d7d489f7ba169b78b21fb84f8b4666fa871b8 commit 8e8d7d489f7ba169b78b21fb84f8b4666fa871b8 Author: Warner Losh AuthorDate: 2025-12-28 05:37:56 +0000 Commit: Warner Losh CommitDate: 2025-12-28 05:37:56 +0000 loader: Use C99 initializations for file_format For greppability, use C99 initializers for the struct file_format. Sponsored by: Netflix --- stand/efi/loader/arch/amd64/multiboot2.c | 10 ++++++++-- stand/efi/loader/arch/arm/exec.c | 4 ++-- stand/efi/loader/arch/arm64/exec.c | 4 ++-- stand/efi/loader/arch/riscv/exec.c | 4 ++-- stand/i386/libi386/elf32_freebsd.c | 10 ++++++++-- stand/i386/libi386/elf64_freebsd.c | 10 ++++++++-- stand/i386/libi386/multiboot.c | 11 ++++++++--- stand/kboot/kboot/arch/aarch64/exec.c | 4 ++-- stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 7 +++---- stand/powerpc/ofw/elf_freebsd.c | 7 +++---- stand/powerpc/ofw/ppc64_elf_freebsd.c | 7 +++---- stand/uboot/arch/powerpc/ppc64_elf_freebsd.c | 7 +++---- stand/uboot/elf_freebsd.c | 4 ++-- stand/userboot/userboot/elf32_freebsd.c | 10 ++++++++-- stand/userboot/userboot/elf64_freebsd.c | 10 ++++++++-- 15 files changed, 70 insertions(+), 39 deletions(-) diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c index 086dba33895a..b1c60601a8bd 100644 --- a/stand/efi/loader/arch/amd64/multiboot2.c +++ b/stand/efi/loader/arch/amd64/multiboot2.c @@ -558,5 +558,11 @@ obj_exec(struct preloaded_file *fp) return (EFTYPE); } -struct file_format multiboot2 = { loadfile, exec }; -struct file_format multiboot2_obj = { obj_loadfile, obj_exec }; +struct file_format multiboot2 = { + .l_load = loadfile, + .l_exec = exec +}; +struct file_format multiboot2_obj = { + .l_load = obj_loadfile, + .l_exec = obj_exec +}; diff --git a/stand/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c index 3963b6c0104b..50e94af05fd2 100644 --- a/stand/efi/loader/arch/arm/exec.c +++ b/stand/efi/loader/arch/arm/exec.c @@ -90,8 +90,8 @@ __elfN(arm_exec)(struct preloaded_file *fp) } static struct file_format arm_elf = { - __elfN(arm_load), - __elfN(arm_exec) + .l_load = __elfN(arm_load), + .l_exec = __elfN(arm_exec) }; struct file_format *file_formats[] = { diff --git a/stand/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c index 89e2ad7521a8..6b5181b54507 100644 --- a/stand/efi/loader/arch/arm64/exec.c +++ b/stand/efi/loader/arch/arm64/exec.c @@ -43,8 +43,8 @@ static int elf64_exec(struct preloaded_file *amp); static int elf64_obj_exec(struct preloaded_file *amp); static struct file_format arm64_elf = { - elf64_loadfile, - elf64_exec + .l_load = elf64_loadfile, + .l_exec = elf64_exec }; struct file_format *file_formats[] = { diff --git a/stand/efi/loader/arch/riscv/exec.c b/stand/efi/loader/arch/riscv/exec.c index 8d1a0bd03de0..64e522775471 100644 --- a/stand/efi/loader/arch/riscv/exec.c +++ b/stand/efi/loader/arch/riscv/exec.c @@ -106,8 +106,8 @@ __elfN(exec)(struct preloaded_file *fp) } static struct file_format riscv_elf = { - __elfN(loadfile), - __elfN(exec) + .l_load = __elfN(loadfile), + .l_exec = __elfN(exec) }; struct file_format *file_formats[] = { diff --git a/stand/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c index ae5702e5e65f..40111bdd4d6c 100644 --- a/stand/i386/libi386/elf32_freebsd.c +++ b/stand/i386/libi386/elf32_freebsd.c @@ -39,8 +39,14 @@ static int elf32_exec(struct preloaded_file *amp); static int elf32_obj_exec(struct preloaded_file *amp); -struct file_format i386_elf = { elf32_loadfile, elf32_exec }; -struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec }; +struct file_format i386_elf = { + .l_load = elf32_loadfile, + .l_exec = elf32_exec +}; +struct file_format i386_elf_obj = { + .l_load = elf32_obj_loadfile, + .l_exec = elf32_obj_exec +}; /* * There is an ELF kernel and one or more ELF modules loaded. diff --git a/stand/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c index 89cc249e9d96..73d1ad088824 100644 --- a/stand/i386/libi386/elf64_freebsd.c +++ b/stand/i386/libi386/elf64_freebsd.c @@ -43,8 +43,14 @@ static int elf64_exec(struct preloaded_file *amp); static int elf64_obj_exec(struct preloaded_file *amp); -struct file_format amd64_elf = { elf64_loadfile, elf64_exec }; -struct file_format amd64_elf_obj = { elf64_obj_loadfile, elf64_obj_exec }; +struct file_format amd64_elf = { + .l_load = elf64_loadfile, + .l_exec = elf64_exec +}; +struct file_format amd64_elf_obj = { + .l_load = elf64_obj_loadfile, + .l_exec = elf64_obj_exec +}; /* * i386's pmap_pae.h doesn't provide this, so diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c index e2bd44fe83f5..f30787ecebe0 100644 --- a/stand/i386/libi386/multiboot.c +++ b/stand/i386/libi386/multiboot.c @@ -67,9 +67,14 @@ static int multiboot_exec(struct preloaded_file *); static int multiboot_obj_loadfile(char *, uint64_t, struct preloaded_file **); static int multiboot_obj_exec(struct preloaded_file *fp); -struct file_format multiboot = { multiboot_loadfile, multiboot_exec }; -struct file_format multiboot_obj = - { multiboot_obj_loadfile, multiboot_obj_exec }; +struct file_format multiboot = { + .l_load = multiboot_loadfile, + .l_exec = multiboot_exec +}; +struct file_format multiboot_obj = { + .l_load = multiboot_obj_loadfile, + .l_exec = multiboot_obj_exec +}; extern void multiboot_tramp(); diff --git a/stand/kboot/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c index df3e922dfe11..bc7cd6917e13 100644 --- a/stand/kboot/kboot/arch/aarch64/exec.c +++ b/stand/kboot/kboot/arch/aarch64/exec.c @@ -73,8 +73,8 @@ int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, #endif static struct file_format arm64_elf = { - elf64_loadfile, - elf64_exec + .l_load = elf64_loadfile, + .l_exec = elf64_exec }; struct file_format *file_formats[] = { diff --git a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c index ae398e357df2..65c43a411433 100644 --- a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -157,10 +157,9 @@ ppc64_elf_exec(struct preloaded_file *fp) while (1) {} } -struct file_format ppc_elf64 = -{ - ppc64_elf_loadfile, - ppc64_elf_exec +struct file_format ppc_elf64 = { + .l_load = ppc64_elf_loadfile, + .l_exec = ppc64_elf_exec }; /* diff --git a/stand/powerpc/ofw/elf_freebsd.c b/stand/powerpc/ofw/elf_freebsd.c index 4d34fa18c5dd..5f8d84ac8bec 100644 --- a/stand/powerpc/ofw/elf_freebsd.c +++ b/stand/powerpc/ofw/elf_freebsd.c @@ -97,8 +97,7 @@ __elfN(ofw_exec)(struct preloaded_file *fp) panic("exec returned"); } -struct file_format ofw_elf = -{ - __elfN(ofw_loadfile), - __elfN(ofw_exec) +struct file_format ofw_elf = { + .l_load = __elfN(ofw_loadfile), + .l_exec = __elfN(ofw_exec) }; diff --git a/stand/powerpc/ofw/ppc64_elf_freebsd.c b/stand/powerpc/ofw/ppc64_elf_freebsd.c index bc68d129f353..92d394963678 100644 --- a/stand/powerpc/ofw/ppc64_elf_freebsd.c +++ b/stand/powerpc/ofw/ppc64_elf_freebsd.c @@ -101,8 +101,7 @@ ppc64_ofw_elf_exec(struct preloaded_file *fp) panic("exec returned"); } -struct file_format ofw_elf64 = -{ - ppc64_ofw_elf_loadfile, - ppc64_ofw_elf_exec +struct file_format ofw_elf64 = { + .l_load = ppc64_ofw_elf_loadfile, + .l_exec = ppc64_ofw_elf_exec }; diff --git a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c index e500b862de2e..1df64d166840 100644 --- a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c +++ b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c @@ -88,8 +88,7 @@ ppc64_uboot_elf_exec(struct preloaded_file *fp) panic("exec returned"); } -struct file_format uboot_elf64 = -{ - ppc64_uboot_elf_loadfile, - ppc64_uboot_elf_exec +struct file_format uboot_elf64 = { + .l_load = ppc64_uboot_elf_loadfile, + .l_exec = ppc64_uboot_elf_exec }; diff --git a/stand/uboot/elf_freebsd.c b/stand/uboot/elf_freebsd.c index 3b1bdc542538..772ba32bb7b7 100644 --- a/stand/uboot/elf_freebsd.c +++ b/stand/uboot/elf_freebsd.c @@ -87,6 +87,6 @@ __elfN(uboot_exec)(struct preloaded_file *fp) } struct file_format uboot_elf = { - __elfN(uboot_load), - __elfN(uboot_exec) + .l_load = __elfN(uboot_load), + .l_exec = __elfN(uboot_exec) }; diff --git a/stand/userboot/userboot/elf32_freebsd.c b/stand/userboot/userboot/elf32_freebsd.c index c2492dce7397..984218f419d9 100644 --- a/stand/userboot/userboot/elf32_freebsd.c +++ b/stand/userboot/userboot/elf32_freebsd.c @@ -39,8 +39,14 @@ static int elf32_exec(struct preloaded_file *amp); static int elf32_obj_exec(struct preloaded_file *amp); -struct file_format i386_elf = { elf32_loadfile, elf32_exec }; -struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec }; +struct file_format i386_elf = { + .l_load = elf32_loadfile, + .l_exec = elf32_exec +}; +struct file_format i386_elf_obj = { + .l_load = elf32_obj_loadfile, + .l_exec = elf32_obj_exec +}; #define GUEST_STACK 0x1000 /* Initial stack base */ #define GUEST_GDT 0x3000 /* Address of initial GDT */ diff --git a/stand/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c index 5a63fdb4990c..b4cbefd07aad 100644 --- a/stand/userboot/userboot/elf64_freebsd.c +++ b/stand/userboot/userboot/elf64_freebsd.c @@ -43,8 +43,14 @@ static int elf64_exec(struct preloaded_file *amp); static int elf64_obj_exec(struct preloaded_file *amp); -struct file_format amd64_elf = { elf64_loadfile, elf64_exec }; -struct file_format amd64_elf_obj = { elf64_obj_loadfile, elf64_obj_exec }; +struct file_format amd64_elf = { + .l_load = elf64_loadfile, + .l_exec = elf64_exec +}; +struct file_format amd64_elf_obj = { + .l_load = elf64_obj_loadfile, + .l_exec = elf64_obj_exec +}; #define GUEST_NULL_SEL 0 #define GUEST_CODE_SEL 1 From nobody Sun Dec 28 08:17:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfBzl6srvz6LQlw for ; Sun, 28 Dec 2025 08:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfBzl5pyCz3TFC for ; Sun, 28 Dec 2025 08:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766909859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1aEJsJtZBVxJrRPEh+nlisj5ebk8j6rCCqyg3gXkGII=; b=u+LcVp+rsdA7WNQATnRByOydA0FdWkc/84rVZCvjtp2GJPJdf/fpa9Q9OxqCeO0u4PrvIw lzR0ZCv9+ZssmEliSCSagcrSsZON0neD/whvhPfxuyBp6LbN9KJTofulLV2me96WDqL2jr jv/fQEoREhXMVNMxx4xn61wtsrwP5i80RdAOCvXjCoA9nPCy6rDQ+eiAC75HmvNWnxvocV R9Xvpn2O6DfJo6TodAzzRSFlDKWIs+y5v/OsG+R33BkaPoWgex4dCkpMzC2dxwIOwqMlpj HjiJ2dv5dJt1/nSz+/diXo8U7KGS9lhMU51Ue7J8w7oW22mQGG8nonxKqbn2SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766909859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1aEJsJtZBVxJrRPEh+nlisj5ebk8j6rCCqyg3gXkGII=; b=K9DTESdKWAonfEEsTTSRwR2Rf577gFcIyW+yDA/MNtmnTbdvxn+ZhALFp1RaMvVdxbIKvt QzXESCTH/C15cwJx/Ucb4C3h6y54F/auNh4RLA4ON9whYvyJdY53GAONJawhnCDVR/wRBW 3t6xcMYiP39icyzB3G69TsMQQU41qcus1zK1vHNa/cWIT9z6OcFIG6Fncuzf6kDaxRpSwh zuJNLsZyX7APuV2KtSJKK+oEtAzpejsmVkVkwVIZH0BZByTqQK4ygQhNBr5S2WISg2p0h7 xdLtLO0qpgrRRSaU1SkESbmkVdK0gdXPuBZ/mxHG1a4cMc9gG4AJBkOSQmeOtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766909859; a=rsa-sha256; cv=none; b=J9t8XVSxAoCmncYdtnXD+HQ8kPECpR9MtKf+uy6YkeQ4Pqc4ltgSmdUQZfc1J55Uhe0LFC A6eaMjK0bOJ3nmUavOERMbfz/9DcKs6dalXq1xb7Azl1qf54HRr6yH9R0Q/iXJs5KiFXMp J1Loqgit1TGEREszJRaKjt9VOZSAU3Xy9MYosVphWC+YZFUzJJsJeoulWLMbfzXeGn1JOp 18gUia5ZfVhtwrRasLAdlVe/fRPU/TJ/IKG7EQIGF1ACLs6rnCcdoY9GF2cjqNSjraw4ZM a6fG+OpGpCj7EtgsdMcY1XEGF8rFLMbSp16QmjM02BqiJYA6bQHDOeSnFvGl9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfBzl4vggzdLj for ; Sun, 28 Dec 2025 08:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b044 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 08:17:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: faeaa25f5624 - main - kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faeaa25f562493370a5da84b429ab0a117c3213a Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 08:17:39 +0000 Message-Id: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=faeaa25f562493370a5da84b429ab0a117c3213a commit faeaa25f562493370a5da84b429ab0a117c3213a Author: Warner Losh AuthorDate: 2025-12-28 07:31:05 +0000 Commit: Warner Losh CommitDate: 2025-12-28 08:16:39 +0000 kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src There are many environments that you do not want the paths to be canonicalized. For example, if I always build a product from a specific path in a jail that's dependent on the product version, I don't want that to be sanitized to /usr/src because when I have profiling tools run against multiple kernels, I can't do A/B testing and results processing if everything points to /usr/src (sadly, the profiling tools cannot remap back to the original like gdb can). Since we need both active at the same time, symbloic link fallbacks don't work. We do want the rest of the build to be reproducible, however. We'll get the same binaries if we rebuild later since we always rebuild with the same path. Turn them both on for maximum reproduction for environments where that cannot be guaranteed. Sponsored by: Netflix Input from: emaste, ivy Differential Revision: https://reviews.freebsd.org/D52959 --- share/man/man5/src.conf.5 | 9 ++++++++- share/mk/bsd.debug.mk | 2 +- share/mk/src.opts.mk | 1 + sys/conf/kern.opts.mk | 1 + sys/conf/kern.post.mk | 2 +- sys/conf/kmod.mk | 2 +- tools/build/options/WITH_REPRODUCIBLE_PATHS | 6 ++++++ 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 1d55ab074a45..a047dfb528fd 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd December 21, 2025 +.Dd December 28, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1590,6 +1590,13 @@ option. Exclude build metadata (such as the build time, user, or host) from the kernel, boot loaders, and uname output, so that builds produce bit-for-bit identical output. +.It Va WITH_REPRODUCIBLE_PATHS +Modify the paths encoded in binary artifacts to be standard path + +Normaly, the actual path is encoded in the binary. However, this makes the build +differ depending on the path it was built from. With this option enabled, the +paths recorded are /usr/src, regardless of the actual path. With this option +disabled, the actual paths are recorded. .It Va WITHOUT_RESCUE Do not build .Xr rescue 8 . diff --git a/share/mk/bsd.debug.mk b/share/mk/bsd.debug.mk index cf2fb4356aef..9f4dc5d90484 100644 --- a/share/mk/bsd.debug.mk +++ b/share/mk/bsd.debug.mk @@ -16,7 +16,7 @@ MK_WERROR= no # If reproducible build mode is enabled, map the root of the source # directory to /usr/src and the root of the object directory to # /usr/obj. -.if ${MK_REPRODUCIBLE_BUILD} != "no" && !defined(DEBUG_PREFIX) +.if ${MK_REPRODUCIBLE_PATHS} != "no" && !defined(DEBUG_PREFIX) .if defined(SRCTOP) DEBUG_PREFIX+= ${SRCTOP:S,/$,,}=/usr/src .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0d806702417f..0805c88976da 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -217,6 +217,7 @@ __DEFAULT_NO_OPTIONS = \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ + REPRODUCIBLE_PATHS \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index cef4dd11ba58..81b117492916 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -56,6 +56,7 @@ __DEFAULT_NO_OPTIONS = \ KERNEL_RETPOLINE \ RATELIMIT \ REPRODUCIBLE_BUILD \ + REPRODUCIBLE_PATHS \ VERIEXEC # Some options are totally broken on some architectures. We disable them. If you diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 7cdfd17778db..343abc5853f7 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -372,7 +372,7 @@ _ILINKS+= x86 _ILINKS+= i386 .endif -.if ${MK_REPRODUCIBLE_BUILD} != "no" +.if ${MK_REPRODUCIBLE_PATHS} != "no" PREFIX_SYSDIR=/usr/src/sys PREFIX_OBJDIR=/usr/obj/usr/src/${MACHINE}.${MACHINE_CPUARCH}/sys/${KERN_IDENT} CFLAGS+= -ffile-prefix-map=${SYSDIR}=${PREFIX_SYSDIR} diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 6e20dce0653f..edc311348971 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -303,7 +303,7 @@ all: ${PROG} beforedepend: ${_ILINKS} beforebuild: ${_ILINKS} -.if ${MK_REPRODUCIBLE_BUILD} != "no" +.if ${MK_REPRODUCIBLE_PATHS} != "no" PREFIX_SYSDIR=/usr/src/sys CFLAGS+= -ffile-prefix-map=${SYSDIR}=${PREFIX_SYSDIR} .if defined(KERNBUILDDIR) diff --git a/tools/build/options/WITH_REPRODUCIBLE_PATHS b/tools/build/options/WITH_REPRODUCIBLE_PATHS new file mode 100644 index 000000000000..e71ebff204d7 --- /dev/null +++ b/tools/build/options/WITH_REPRODUCIBLE_PATHS @@ -0,0 +1,6 @@ +Modify the paths encoded in binary artifacts to be standard path + +Normaly, the actual path is encoded in the binary. However, this makes the build +differ depending on the path it was built from. With this option enabled, the +paths recorded are /usr/src, regardless of the actual path. With this option +disabled, the actual paths are recorded. From nobody Sun Dec 28 15:53:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfP6J3shDz6LyfY for ; Sun, 28 Dec 2025 15:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfP6J371Dz3KDX for ; Sun, 28 Dec 2025 15:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766937240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3o2KwS0oCevFcWCUFcF+yCY5FGPy639SdlHjgQ7nVRY=; b=PoqF77Ww+DfP2rfMc+CfDzXwJt0uegMiIS0Ni/Ayo3v8UU1tCBJqsuMEYKJnwJh5nv72Yr pXEFq3iUiLsC7t9XTyyfP7odlAZ54V47BgWaPRYme9rITlUv3OfvDYi0KC6hiqTClzyX6T sxMNTwf5NYhysyX6jBHFReiiL+KJFPPtZc1Aahy54yJOivIB/V94yOZxa05hH5ASWnm59C EtbbtJ1T9QxrPrsOAIQHg1quWQIDc4AcHCnVSSm1Ii6ZOL4d2/QRLcQ1JqXRvxAU74htIz drtcQPsLZw6S6h2MH+39cmKG+8j7GCPPPYSWsTAqdDvfxeX15eGcGi5ZkW2Oxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766937240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3o2KwS0oCevFcWCUFcF+yCY5FGPy639SdlHjgQ7nVRY=; b=RXZA7ysi1KqXxdu6Kn50N17sa/Fi7DUbCkI9vS1fGNQI4qVFBG/GM6121bDNs5DySBO/d6 rXyF3JOlSB0+HP4FOt/tzS7owrsB06BQgP4o2ntNgC5H1osBTlrRayxmcpJHZzB+UDiZrY THUK/ueUJtgpBU6tiLZmJFzYV1zTGUPTHEWhEPS+L2C6uxITiUriXPXAOLLoCw8rpAMcbx 2HFad0yeZ2Re5o47GBa37ZyarJmgZBAh2+vcqJWw0Km7E9sREclHiCmkYO86FO/3LLxKFk KjwH4NQRRf+aHA0kBLcuakIux+zkdjMAaKoR8HAm0ZSMlNLN1mFG+KF3djKfGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766937240; a=rsa-sha256; cv=none; b=QCXSdnq3cfQiPMeWaV4Msoz6PpYprJYE21s3Ahv+neRgQXaPD+e19pYtmeW0+y8kK0d58S umlBVQfDJ0uuRZx+L4+pWeufdtkPlr+dxCn+L/bOQl0WwAYUoJmHOlX+2EgNQqx0Eur16G 8dR2H/E80AjNNoU1noGp5nS7bqwa+NDXyHYjPpx7b7jJUGa2tS1J527wrBmdFW5eADKwKq 2bPVDrLPISbAUs4n6DpWmzXV9BIerMNyqCR685qAFpF4+NH+7tpLglTF4r772tJlkhFkbY Q07uCZwysCiVBYQUc2aPOdl+Q+P1lkwvnWi584onOz9/hW2xQDSE6b++NPeD7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfP6J2h0dzrLd for ; Sun, 28 Dec 2025 15:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8fa4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 15:53:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c910c7a3d224 - main - vt: Remove .fnt.uu from Makefile SUFFIXES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c910c7a3d224764adf53581cc097cefb6f963502 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 15:53:55 +0000 Message-Id: <69515293.8fa4.3e6750a5@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c910c7a3d224764adf53581cc097cefb6f963502 commit c910c7a3d224764adf53581cc097cefb6f963502 Author: Ed Maste AuthorDate: 2025-12-28 15:52:13 +0000 Commit: Ed Maste CommitDate: 2025-12-28 15:53:45 +0000 vt: Remove .fnt.uu from Makefile SUFFIXES The uudecode make rule was removed years ago. Fixes: 68510f3bac15 ("Remove uudecode make rule for vt fonts") --- share/vt/fonts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile index 01f56a235e5e..706207e70070 100644 --- a/share/vt/fonts/Makefile +++ b/share/vt/fonts/Makefile @@ -21,7 +21,7 @@ FILES= ${FONTS} INDEX.fonts CLEANFILES+= ${FONTS} -.SUFFIXES: .bdf .fnt .fnt.uu .hex +.SUFFIXES: .bdf .fnt .hex .bdf.fnt .hex.fnt: vtfontcvt -o ${.TARGET} ${.IMPSRC} From nobody Sun Dec 28 15:58:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfPCw2C0Wz6M024 for ; Sun, 28 Dec 2025 15:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfPCv6zxlz3KR0 for ; Sun, 28 Dec 2025 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766937532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7/y7XOQnf22d4GpJMDxZilkVh2az74Dc6WebdonJ0U=; b=HXL+mkYNAYql/kLBy1U7jUUpBjJFmyaEofYcPRtj0RebDCZsevvAPVvsY9B6pc5Lpl+Dlm SM+3rHoMQ62ECrc0uGXCJgTpVknhBbTP2wLWo/sbxzNDTXw9Wq8nlB+mBeUP5wI0MqYQAo +4bkexjVEghvMbx+/Dughir6Fb+FH0sXEsjOAL3tJjD2iPhsA9BoBDqB9aRI1QzP4cwXr0 W3KSni3lN8ZzMFt1sEDmk9SV6vKuChVuAzqVyhV6TnC6Usftw1OJBq+3H27Qm6uGT71BCd rkVr90Sbdkc04furm8Nfw4RfT4i/KgMgKaYqL/1WJ0UMHwIjSIihVE47j2fmEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766937532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7/y7XOQnf22d4GpJMDxZilkVh2az74Dc6WebdonJ0U=; b=XSOhNTtKKLwZ/gfbOwAV4Kg4E4rqTUIHxH4GfrM7PWfDVwaXTpvF8pvoC5S2DOtf/3BZTo jojaOmiLWvfh5m31lKXeEuAaOWF/uvd+vpr15JL/SHQHHrtavgwBiWR1TfiyltDffjMQ4s qfsTDwdGX//L5EwNTXK7kzPbZPRzs1o14HwUV7P+abC21idn+XeuaswmNWBcB8o4p/WpdY biIzH0a3AysDQoXbu1v/DwRxrTZsfIK/TPVW/KF4X1Xl/Ufc3sZxfS6T4F/7R9Gj6Bov3b 7aR1tlsh33fMlv8YCg9V4TqDRZunjR51kEwrg9jAJ+4oeP2IzkLMYUPDvl2mOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766937532; a=rsa-sha256; cv=none; b=BOIyJoT3FXh7jX6wrEVmV7+v8yqoHjAxz87sLqPY6xrn5AvQloRay55y7MvPD9BJPic4G8 k/xlzkdVTj1u14DQB8pvVXN3AZONE8J68NOzDnOOrfn5sEseZ+DqfWw0DYUGty9ylBTGjS Vp4sruxd3Nh7wd7jAU7JR3uZ6/vAeXfiJUPeL8cXUJzTV5UaB97pnx52gZseT6rY6bmW89 rw9pLApt9fYYM5IjQX7zAxdO5XCZ2wbG8icJKTkLD5D9Xlr8WpK1hCymAollzgKQRlwjHf 9wYbxPH2a1KAvJF3rnima/iJE7MsFHNk3AD1fVemu41LGqMpXeDWwb2zAxWbUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfPCv606XzrLf for ; Sun, 28 Dec 2025 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 478f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 15:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 176075e661fc - main - locking.9: Tweak the table column width to fit 80 characters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 176075e661fc657845d788ab3451e690c4e9bac6 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 15:58:51 +0000 Message-Id: <695153bb.478f9.11660efc@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=176075e661fc657845d788ab3451e690c4e9bac6 commit 176075e661fc657845d788ab3451e690c4e9bac6 Author: Zhenlei Huang AuthorDate: 2025-12-28 15:57:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-28 15:57:51 +0000 locking.9: Tweak the table column width to fit 80 characters While here, add some white spaces to improve the readability of source code. Reviewed by: ziaee, #manpages MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54121 --- share/man/man9/locking.9 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index b29cd07e2c2a..ad044b6e1d46 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 3, 2023 +.Dd December 28, 2025 .Dt LOCKING 9 .Os .Sh NAME @@ -371,9 +371,9 @@ functions, and any of the .Fn sleep functions. -.Bl -column ".Ic xxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXX" -offset 3n +.Bl -column " You want:" "spin mtx " "mutex/rw " "rmlock " "sleep rm " "sx/lk " -offset 3n .It Em " You want:" Ta spin mtx Ta mutex/rw Ta rmlock Ta sleep rm Ta sx/lk Ta sleep -.It Em "You have: " Ta -------- Ta -------- Ta ------ Ta -------- Ta ------ Ta ------ +.It Em "You have:" Ta -------- Ta -------- Ta ------ Ta -------- Ta ----- Ta ------ .It spin mtx Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-1 .It mutex/rw Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no-1 .It rmlock Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no-1 @@ -407,13 +407,13 @@ Note that non-blocking try operations on locks are always permitted. .Ss Context mode table The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. -.Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXX" -offset 3n +.Bl -column "interrupt filter: " "spin mtx " "mutex/rw " "rmlock " "sleep rm " "sx/lk " -offset 3n .It Em "Context:" Ta spin mtx Ta mutex/rw Ta rmlock Ta sleep rm Ta sx/lk Ta sleep .It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no .It interrupt thread: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no -.It callout: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no -.It direct callout: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no -.It system call: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok +.It callout: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no +.It direct callout: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no +.It system call: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok .El .Sh SEE ALSO .Xr lockstat 1 , From nobody Sun Dec 28 17:11:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfQqz3w3Dz6M4SC for ; Sun, 28 Dec 2025 17:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfQqz3CwYz3Vtf for ; Sun, 28 Dec 2025 17:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766941903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IZTxp2kbWkYOwDZ2sjvG8sjddchAwN42B775AYpWjJc=; b=r/inzPQFnCzpMaPZJmdNMpkBcgffx4YEL5tRZekvV4KgnfiFEeE+7yLGAq/hyLWHkQsm6o d9AHIyijju2iaXmGl3wmt0F14tMGY1FWPZrgtITF/2Oy4YWS/imSrkWP8g9cpNC1+xckmf KbcL4ktDLh0vyUoJ2gU0JhcTdF+1k24TdgYQHW6aw4D1rYtP6QfpDRlDsf7DqnOrHJs7p8 0bpbvR4WtRP/5ogXmPHdeeqp1OYNFAXioK8Ubk2CLOQd4yJ8WxSIo4aaUbfnakiiovIHjT FeQZPg9Yzw49Q15+G6nNHrZlwXKRvyyBK5Z1dpwc9mkpJtRur1SbDYXi7tLnOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766941903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IZTxp2kbWkYOwDZ2sjvG8sjddchAwN42B775AYpWjJc=; b=ugoNtBZrBUr5wp8ULBK88jUwiDe0bU4J0XlaL+xrhz+qJH6qU3QNW5Uf0aHYmWRjKKCRaL 6zDzqGw+3OPK+Ardq24aaQ/kOOs9h1nER8y8rs5RxQ9JsLBmLdPC+8+Q200FPkGXmSXQ+c 23z1YfTONTsoFO4UXBXuYq85NFpuOGu1BtefyTswd5nOK6lNK0rSzPKRw13VDlKL7Mmqmv 2Vig0t1hx9OHrV1RMY1DSgecZVT/AtHj50XYqLurcxSWEGFjPcdT8HpZlvQoD9FbK+6/3l fx88sq+Y1Z0/loWK1L+0aR4C/96/pPuPABQEKnerqrNhQzb7PhzhhlwVREhX+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766941903; a=rsa-sha256; cv=none; b=XLDqcSrSigm1lOYZXn1nBsBBiJIOYTcffZvZvCTpmgt4qvAsHXsTT/UisAtdRsiejRwDX+ sVPyCqHE0875qKNQiGkOXR39YW/7Z8d4YDN82K+m8NAItkifUNt61kHaKhb7c1L3Gh20p1 +KZT/6CZxp6RxJhH7xmjsbRFXfl5sH+f3Hy6zHLbmt+zD7kj3u291wGxVxfepVxrTunN3R u7j0AI5yhuEZYyLmI33yNt0NayAe8T+h/7kLl1U+oFUNy1N6/4WuefqpbgbCgXU9aG71Ar t0lWYWAscRqk6/34B/l3t0xxZQZ/M8JXAlAMXaXHKJ+2SlZBpuB61j73DF62Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfQqz2hdKztT0 for ; Sun, 28 Dec 2025 17:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f358 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 17:11:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: a7b8a5d37bcb - main - ipfw.8: fix documentation bug for setmark List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7b8a5d37bcb0009297962137bfb6c6570e5af12 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 17:11:43 +0000 Message-Id: <695164cf.f358.59339a5c@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b8a5d37bcb0009297962137bfb6c6570e5af12 commit a7b8a5d37bcb0009297962137bfb6c6570e5af12 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:05:22 +0000 Commit: Eugene Grosbein CommitDate: 2025-12-28 17:05:22 +0000 ipfw.8: fix documentation bug for setmark A mark set with "setmark" keyword is intended to be "sticky" and documented as such but in fact it is not yet, as current implementation lacks "sticky" feature and its implementation will be not MFC'd, most probably. Correct the manual page until the implementation improved. MFC after: 3 days Discussed with: Boris Lytochkin (author) --- sbin/ipfw/ipfw.8 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 7a81c84de3e4..bafad1479c0e 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -839,8 +839,12 @@ When a packet matches a rule with the .Cm setmark keyword, a 32-bit numeric mark is assigned to the packet. The mark is an extension to the tags. -As tags, mark is "sticky" so the value is kept the same within the kernel and -is lost when the packet leaves the kernel. +The mark is preserved for a packet within a single ipfw rulese traversal +and is lost when the packet is checked against the active ruleset +next time (see +.Sx PACKET FLOW +section) or leaves ipfw context (e.g. accepted, +diverted, bridged or routed). Unlike tags, mark can be matched as a lookup table key or compared with bitwise mask applied against another value. Each packet can have only one mark, so From nobody Sun Dec 28 17:20:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfR2W0nBJz6M4yY for ; Sun, 28 Dec 2025 17:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfR2V72S6z3X47 for ; Sun, 28 Dec 2025 17:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766942451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tT7S9R4PUBXO7UGTiwIwNW6uzRN+Ndm/nXoZmnzZjv0=; b=UC7hoOUvVeQR82vKy6tH/oZUzlZCRgyqmce7qNme99Lj7+Ixu7C725a7GcreqZXmL8pNyD nU/gPTQFZTAoJpP9IqKQAQL2WHHcInSLf7WFkWW5207l6jM1jM90VfFbEutl+/S5SiXApb LOVN/ykSLBrFpV+EDdHPxAzLue43wecFjf8xD/HrVXX94FK+fataCEleyn9zpxN6lfZAVM s8rxQueoE5LyqDhi+O8HCZomNDv6n40LMbOJzQL/39u6Ey4xMogIkqCJs5PnqJwXECDyM5 PVpM5QpeVNEsYPcIX+lZ0XAj1Teqk8QjMhL4dF//c8hX1QQ5na6fGeW7TPS3ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766942451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tT7S9R4PUBXO7UGTiwIwNW6uzRN+Ndm/nXoZmnzZjv0=; b=WGlbqNbFB0qUCvGt5wImmc4wg9jK+4nwhBG71cz9qUM02g0BP6YMRTatq5tIeawncSPoZo vtRz8Tze2VrdHbXnd4qTLkOImgfiOPG8tuCTDz2Rmp1TMVkPfNg9Kd0vUPF9b/c4bbfcAs u4PAQbpfSqg6mDM4jL6SRtCwirqeSH/g8tGRlc5NmN/EB7S954sALGBjKQEqtUpZeZM5Jt HzsPXLODZGmkNuJwGK+BTPslIoLLBVKPeSNXwraCGkjRKwDpzBBDvqTs0DudFDAb8mws3E OFdPGg7uLJRPcOu5qCB859Zv2KzSkPs3nTV9vyEwPuJDph3SrvnzwsZHSKxDvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766942451; a=rsa-sha256; cv=none; b=QisnBPMUMNjyvS1puJHvECNSyCo1yshvckWvoCllWWkX4AjSkubZEn+QWaj4S/6d2Njnvj 0NJRTKW3owgt2lQtSeDPTROIojR1n93mrjdJQ/BOE4SsdiBowXVAr+RA8vUdhKe4M8/+pY MkO8f25fNstqiMNH6bvs2CLep/9t792cFNs37UDnXykN2X/XywmN4r+05GbK7ec53GuYz7 kfCwSYSh6d+2J/w/qIV+3nzI2Lctb7vts//JGTspb/6a1co066xC6qUVAVqTFVDJIdH3jG xoq1qtNvlgf95LBP63Cx/JA6yMQz3WfZ2D96Zz1H86oN0VhXL/BMWJa4w+L1tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfR2V6Z7rztTY for ; Sun, 28 Dec 2025 17:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20276 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 17:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 9fdf49e8a501 - main - ipfw.8: fix misprint after previous change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fdf49e8a501047b61a615ab1b4b133159ad76e1 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 17:20:50 +0000 Message-Id: <695166f2.20276.434ffe0@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9fdf49e8a501047b61a615ab1b4b133159ad76e1 commit 9fdf49e8a501047b61a615ab1b4b133159ad76e1 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:19:35 +0000 Commit: Eugene Grosbein CommitDate: 2025-12-28 17:19:35 +0000 ipfw.8: fix misprint after previous change rulese -> ruleset MFC after: 3 days X-MFC-with: a7b8a5d37bcb0009297962137bfb6c6570e5af12 --- sbin/ipfw/ipfw.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index bafad1479c0e..35580f58352d 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -839,7 +839,7 @@ When a packet matches a rule with the .Cm setmark keyword, a 32-bit numeric mark is assigned to the packet. The mark is an extension to the tags. -The mark is preserved for a packet within a single ipfw rulese traversal +The mark is preserved for a packet within a single ipfw ruleset traversal and is lost when the packet is checked against the active ruleset next time (see .Sx PACKET FLOW From nobody Sun Dec 28 17:33:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfRK31Xmhz6M5k2 for ; Sun, 28 Dec 2025 17:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfRK30pdcz3YG8 for ; Sun, 28 Dec 2025 17:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766943207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXngkROQoW4MS+izx/iBgD4clkmluBJ80rE+2102V3s=; b=yA8gNNJ3WObRQSL+fCwqP6+pE/R6ROEIM8Z0+0HWH+Mo7YSe81rifwW/+E+cFZJoIagIgT PcocJEJWOHaHbW/PBuEq7pZrYQ0xrnc6JOM+M7acmu/NV98Ce/04i2i3cy4SpaKoEQa9G3 uLLb90Qh/UG3WMyfXAa5NzD86W68dK28ZGWMQ5b/Nufl1fi7+zOx+EUplD0+UAUOKbVQHM zoCy10lk51ajBswl11C6q3wrmUpWnDRboCkaggXRV4j/v4tKPbh4+ZmAU31R+iX7yLx/lQ FO+i2ISTTeGLHA9MpsMEBQgH/asF/buvbMB/2CSxcU8i1Q9kJptLFERWRjQ7Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766943207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXngkROQoW4MS+izx/iBgD4clkmluBJ80rE+2102V3s=; b=GCe/ea3K8RwMF7tD4dUcLW688LjdnuaHCInkz5OxusHIoLR1d7zQFQIqLq6ZkCrysrqT6+ S4qgjnctp3nX9dwHpg3nz/ByWFmk+A6yVdUMzfHwpaEnHvEYjl0iXKlQjeSkiFzdNzuIpF CMkr4CTysYdjsK7XscNKUT44AsVK2Ld+cmg3IoRfgOUqhYUUeqsP/slGd1Fx8SLbrCzKfc i+Z1BDNlVOuAe9up3JiMco3yjoiJOwpFoYmZ7QbrSBx3vwgfndQqdSSId57kLyZIHnqv3U 9snR9mebnNKTaPD/KCeGjY/u7o4sBW9gGaSxT9ZcxajO0MGd48OWNBMCPSmetg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766943207; a=rsa-sha256; cv=none; b=DRcoSDoSg+gGlyvGN3/28mhiUeSVBAwa5g/9dM5oD6p1ySZT2iQ4D5PNWg5CSMKDFzjVBy OnB4glIUQeHxpMklMVDdwuFFPtzjnMA9FtwIe3yw+ey+yUa14MiLImuTeZWDI2Qt30tooO ppKfc9KmupkG2XaMH2634s8bM6ayzhebEfhqpXl65iuBRE/fTuv+gfcP08Atv6fC9LCNcN TDhQLsPVQ5S3cywbhAyOfm7q1nkxwlZaiHDOJXI/8gU/Px9TdwsqNbdCMuJdKhQfXwlyGx wfX4dTDrYdtSmJTbAH9fqKwp55CcUDpRXK7kWKyWuLk8+wBnXIXK/RxmkqDC4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfRK30Jz1zvFM for ; Sun, 28 Dec 2025 17:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24203 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 17:33:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b67a7c062b65 - main - scsi: Make all da error messages greppable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b67a7c062b65f29448ad5e9e001b03c99869c192 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 17:33:27 +0000 Message-Id: <695169e7.24203.22315042@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b67a7c062b65f29448ad5e9e001b03c99869c192 commit b67a7c062b65f29448ad5e9e001b03c99869c192 Author: Warner Losh AuthorDate: 2025-12-28 17:22:15 +0000 Commit: Warner Losh CommitDate: 2025-12-28 17:32:05 +0000 scsi: Make all da error messages greppable Don't split the error messages across lines. We used to do that ages ago, but have relaxed style(9) to encourage the opposite so all error messages can be grepped. This constantly slows me down when I'm helping others find issues, so start here by splitting according to normal style(9) rules with a relaxed line length of 90. Sponsored by: Netflix --- sys/cam/scsi/scsi_da.c | 89 +++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 49 deletions(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 773a786d08f7..3f18817030c1 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2059,8 +2059,9 @@ dainit(void) status = xpt_register_async(AC_FOUND_DEVICE, daasync, NULL, NULL); if (status != CAM_REQ_CMP) { - printf("da: Failed to attach master async callback " - "due to status 0x%x!\n", status); + printf( + "da: Failed to attach master async callback due to status 0x%x!\n", + status); } else if (da_send_ordered) { /* Register our shutdown event handler */ if ((EVENTHANDLER_REGISTER(shutdown_post_sync, dashutdown, @@ -2186,10 +2187,10 @@ daasync(void *callback_arg, uint32_t code, path, daasync, AC_FOUND_DEVICE, cgd); - if (status != CAM_REQ_CMP - && status != CAM_REQ_INPROG) - printf("daasync: Unable to attach to new device " - "due to status 0x%x\n", status); + if (status != CAM_REQ_CMP && status != CAM_REQ_INPROG) + printf( + "daasync: Unable to attach to new device due to status 0x%x\n", + status); return; } case AC_ADVINFO_CHANGED: /* Doesn't touch periph */ @@ -2372,8 +2373,7 @@ dasysctlinit(void *context, int pending) SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "optimal_nonseq_zones", CTLFLAG_RD, &softc->optimal_nonseq_zones, - "Optimal Number of Non-Sequentially Written Sequential Write " - "Preferred Zones"); + "Optimal Number of Non-Sequentially Written Sequential Write Preferred Zones"); SYSCTL_ADD_UQUAD(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "max_seq_zones", CTLFLAG_RD, &softc->max_seq_zones, @@ -2859,8 +2859,8 @@ daregister(struct cam_periph *periph, void *arg) M_NOWAIT|M_ZERO); if (softc == NULL) { - printf("daregister: Unable to probe new device. " - "Unable to allocate softc\n"); + printf( + "daregister: Unable to probe new device. Unable to allocate softc\n"); return(CAM_REQ_CMP_ERR); } @@ -3035,8 +3035,8 @@ daregister(struct cam_periph *periph, void *arg) if (cam_iosched_init(&softc->cam_iosched, periph, softc->disk, daschedule) != 0) { - printf("daregister: Unable to probe new device. " - "Unable to allocate iosched memory\n"); + printf( + "daregister: Unable to probe new device. Unable to allocate iosched memory\n"); free(softc, M_DEVBUF); return(CAM_REQ_CMP_ERR); } @@ -3115,8 +3115,9 @@ da_zone_cmd(struct cam_periph *periph, union ccb *ccb, struct bio *bp, zone_sa = da_zone_bio_to_scsi(bp->bio_zone.zone_cmd); if (zone_sa == -1) { - xpt_print(periph->path, "Cannot translate zone " - "cmd %#x to SCSI\n", bp->bio_zone.zone_cmd); + xpt_print(periph->path, + "Cannot translate zone cmd %#x to SCSI\n", + bp->bio_zone.zone_cmd); error = EINVAL; goto bailout; } @@ -3180,8 +3181,7 @@ da_zone_cmd(struct cam_periph *periph, union ccb *ccb, struct bio *bp, if (error != 0) { error = EINVAL; xpt_print(periph->path, - "scsi_ata_zac_mgmt_out() returned an " - "error!"); + "scsi_ata_zac_mgmt_out() returned an error!"); goto bailout; } } @@ -3198,8 +3198,8 @@ da_zone_cmd(struct cam_periph *periph, union ccb *ccb, struct bio *bp, num_entries = rep->entries_allocated; if (num_entries == 0) { - xpt_print(periph->path, "No entries allocated for " - "Report Zones request\n"); + xpt_print(periph->path, + "No entries allocated for Report Zones request\n"); error = EINVAL; goto bailout; } @@ -3208,8 +3208,8 @@ da_zone_cmd(struct cam_periph *periph, union ccb *ccb, struct bio *bp, alloc_size = min(alloc_size, softc->disk->d_maxsize); rz_ptr = malloc(alloc_size, M_SCSIDA, M_NOWAIT | M_ZERO); if (rz_ptr == NULL) { - xpt_print(periph->path, "Unable to allocate memory " - "for Report Zones request\n"); + xpt_print(periph->path, + "Unable to allocate memory for Report Zones request\n"); error = ENOMEM; goto bailout; } @@ -3266,8 +3266,7 @@ da_zone_cmd(struct cam_periph *periph, union ccb *ccb, struct bio *bp, if (error != 0) { error = EINVAL; xpt_print(periph->path, - "scsi_ata_zac_mgmt_in() returned an " - "error!"); + "scsi_ata_zac_mgmt_in() returned an error!"); goto bailout; } } @@ -3599,8 +3598,8 @@ out: mode_buf_len = 192; mode_buf = malloc(mode_buf_len, M_SCSIDA, M_NOWAIT); if (mode_buf == NULL) { - xpt_print(periph->path, "Unable to send mode sense - " - "malloc failure\n"); + xpt_print(periph->path, + "Unable to send mode sense - malloc failure\n"); if ((softc->flags & DA_FLAG_CAN_RC16) != 0) softc->state = DA_STATE_PROBE_RC16; else @@ -3882,8 +3881,7 @@ out: log_dir = malloc(sizeof(*log_dir), M_SCSIDA, M_NOWAIT|M_ZERO); if (log_dir == NULL) { - xpt_print(periph->path, "Couldn't malloc log_dir " - "data\n"); + xpt_print(periph->path, "Couldn't malloc log_dir data\n"); daprobedone(periph, start_ccb); break; } @@ -3932,8 +3930,7 @@ out: id_dir = malloc(sizeof(*id_dir), M_SCSIDA, M_NOWAIT | M_ZERO); if (id_dir == NULL) { - xpt_print(periph->path, "Couldn't malloc id_dir " - "data\n"); + xpt_print(periph->path, "Couldn't malloc id_dir data\n"); daprobedone(periph, start_ccb); break; } @@ -3981,8 +3978,7 @@ out: sup_cap = malloc(sizeof(*sup_cap), M_SCSIDA, M_NOWAIT|M_ZERO); if (sup_cap == NULL) { - xpt_print(periph->path, "Couldn't malloc sup_cap " - "data\n"); + xpt_print(periph->path, "Couldn't malloc sup_cap data\n"); daprobedone(periph, start_ccb); break; } @@ -4032,8 +4028,7 @@ out: ata_zone = malloc(sizeof(*ata_zone), M_SCSIDA, M_NOWAIT|M_ZERO); if (ata_zone == NULL) { - xpt_print(periph->path, "Couldn't malloc ata_zone " - "data\n"); + xpt_print(periph->path, "Couldn't malloc ata_zone data\n"); daprobedone(periph, start_ccb); break; } @@ -4084,8 +4079,7 @@ out: if (bdc == NULL) { xpt_release_ccb(start_ccb); - xpt_print(periph->path, "Couldn't malloc zone VPD " - "data\n"); + xpt_print(periph->path, "Couldn't malloc zone VPD data\n"); break; } scsi_inquiry(&start_ccb->csio, @@ -4201,8 +4195,7 @@ da_delete_unmap(struct cam_periph *periph, union ccb *ccb, struct bio *bp) if (totalcount + c > softc->unmap_max_lba || ranges >= softc->unmap_max_ranges) { xpt_print(periph->path, - "%s issuing short delete %ld > %ld" - "|| %d >= %d", + "%s issuing short delete %ld > %ld || %d >= %d", da_delete_method_desc[softc->delete_method], totalcount + c, softc->unmap_max_lba, ranges, softc->unmap_max_ranges); @@ -4483,8 +4476,8 @@ cmd6workaround(union ccb *ccb) (*cdb != READ_6 && *cdb != WRITE_6)) return 0; - xpt_print(ccb->ccb_h.path, "READ(6)/WRITE(6) not supported, " - "increasing minimum_cmd_size to 10.\n"); + xpt_print(ccb->ccb_h.path, + "READ(6)/WRITE(6) not supported, increasing minimum_cmd_size to 10.\n"); softc->minimum_cmd_size = 10; bcopy(cdb, &cmd6, sizeof(struct scsi_rw_6)); @@ -5124,8 +5117,7 @@ dadone_proberc(struct cam_periph *periph, union ccb *done_ccb) &cgd.inq_data, &sense_key_desc, &asc_desc); snprintf(announce_buf, DA_ANNOUNCETMP_SZ, - "Attempt to query device " - "size failed: %s, %s", + "Attempt to query device size failed: %s, %s", sense_key_desc, asc_desc); } else { if (have_sense) @@ -5135,9 +5127,8 @@ dadone_proberc(struct cam_periph *periph, union ccb *done_ccb) "got CAM status %#x\n", done_ccb->ccb_h.status); } - - xpt_print(periph->path, "fatal error, " - "failed to attach to device\n"); + xpt_print(periph->path, + "fatal error, failed to attach to device\n"); announce_buf = NULL; @@ -5171,8 +5162,8 @@ dadone_proberc(struct cam_periph *periph, union ccb *done_ccb) &softc->sysctl_task); } else { /* XXX This message is useless! */ - xpt_print(periph->path, "fatal error, " - "could not acquire reference count\n"); + xpt_print(periph->path, + "fatal error, could not acquire reference count\n"); } } @@ -5410,8 +5401,7 @@ dadone_probebdc(struct cam_periph *periph, union ccb *done_ccb) DA_ZONE_IF_ATA_SAT : DA_ZONE_IF_SCSI; } else if ((bdc->flags & SVPD_ZBC_MASK) != SVPD_ZBC_NR) { - xpt_print(periph->path, "Unknown zoned " - "type %#x", + xpt_print(periph->path, "Unknown zoned type %#x", bdc->flags & SVPD_ZBC_MASK); } } @@ -6516,8 +6506,9 @@ dasetgeom(struct cam_periph *periph, uint32_t block_len, uint64_t maxsector, if ((cdai.ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(cdai.ccb_h.path, 0, 0, 0, FALSE); if (cdai.ccb_h.status != CAM_REQ_CMP) { - xpt_print(periph->path, "%s: failed to set read " - "capacity advinfo\n", __func__); + xpt_print(periph->path, + "%s: failed to set read capacity advinfo\n", + __func__); /* Use cam_error_print() to decode the status */ cam_error_print((union ccb *)&cdai, CAM_ESF_CAM_STATUS, CAM_EPF_ALL); From nobody Sun Dec 28 17:47:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfRdX6X4kz6M6x7 for ; Sun, 28 Dec 2025 17:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfRdX37Tbz3dl7 for ; Sun, 28 Dec 2025 17:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766944064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NAMt7SoiA00VI2RRv+2zxTjhdB2PWwSnFWLePCh7bUk=; b=xVBdyvJ9EpLCWL/bH+f6KkItYWfEZBZkWVTbDXG/kt5BZ64oBMWIJet4fPvTrHNsc4ie3C HdQOtnn+0Cw1pptxHztY0ISf4qejv2XspYhageNsHtSGo40f1taJJEjG4i9nUXtPxWDnkj 22xGem+ipBTeDCQNNzE6B776nzRNYlIUyOFmExi85dGC8WdfZPkQCle7HncPiMBPPGnLuH i2pJ+N7FU7CGspukW82mph1SCGYDiehEgFcfgRla8nmCZ3RkMm9WvnLbr/GSfl3WTRKHcL l0T9qaB3gy05cJFf4MMayIc3DD695X/MQA147p476L1YI3d2vm6igi6UGiZX+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766944064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NAMt7SoiA00VI2RRv+2zxTjhdB2PWwSnFWLePCh7bUk=; b=dVRamcw2h64UxvcdH76y+77y77orNdgJBCRZo5dAbeNyXlRJkg6vqNNQFfTVOD6cuDgVjY yUnbcDGHy3vvZ/7NLO2K5qGD7pDL6P0di1pPItFsAyAISH63L2rQ4IbX8r5XXafHzWD7na d2gMaxrCBlM8ZgNC7Q4GMCxK5la4qdG0YMrZClt3NeriN8F5+TAKTYglCOnaOWDTNU27Lh 6Y8DxnLi1InXESySZH57bjpQSs1gu/jPEKMihFkDHcbaubNHNoOGt7oL1VTCSBx9piApHg /hVcIKGnXDnbIm4C4yM5UfR3Xo7i12yvER7wu8IQ5+xRAxrwrWDBHmA85/PlTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766944064; a=rsa-sha256; cv=none; b=iJeW8LQBcxo8HAPSuxJIjUJ3hVv2EctttpIESjh1qLiTWd2tVTUmNOSVX/XVdn9uPDHsLl BSi4rs/TAUkOl07LVowgZdNZawYtPE3eiULQj43p16GCmRlw9hHDZsXd0rIETBoE3d5rwB 0MKJN6W4chob+JDUwwPqLzdD56DKsisC+RIVe7g2qCiloDnx9/EC21yykS0vztxtDdyr1D TO/nic5t3JcvLHR07WJ/uQwa+PE2NNlr3BNjhw7ZL7QNf1hsIsWxcjW0HgJVoTN7edC1N1 fNLpfpvCI+tzAzYd/5/tGQfxL4b1PhPxsgYVmGuMvHsBJ6tzGpk6NHoCSW8F1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfRdX2kYxztjS for ; Sun, 28 Dec 2025 17:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 17:47:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: e51047118cb1 - main - ipfw.8: document how to delete nat configuration instance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e51047118cb1d15abe8077a5b47b8063fa364ad9 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 17:47:44 +0000 Message-Id: <69516d40.244a8.1694984a@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e51047118cb1d15abe8077a5b47b8063fa364ad9 commit e51047118cb1d15abe8077a5b47b8063fa364ad9 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:47:08 +0000 Commit: Eugene Grosbein CommitDate: 2025-12-28 17:47:39 +0000 ipfw.8: document how to delete nat configuration instance MFC after: 3 days --- sbin/ipfw/ipfw.8 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 35580f58352d..867a43868ecc 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd December 10, 2025 +.Dd December 29, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -104,6 +104,11 @@ in-kernel NAT.\& .Cm config .Ar config-options .Nm +.Op Fl q +.Cm nat +.Ar number +.Cm delete +.Nm .Cm nat .Ar number .Cm show @@ -3511,6 +3516,15 @@ For more information about aliasing modes, refer to See Section .Sx EXAMPLES for some examples of nat usage. +.Pp +To delete specific nat configuration instance, use the following command: +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm delete +.Ek +.Ed .Ss REDIRECT AND LSNAT SUPPORT IN IPFW Redirect and LSNAT support follow closely the syntax used in .Xr natd 8 . From nobody Sun Dec 28 19:53:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfVQV6NpHz6MGhK for ; Sun, 28 Dec 2025 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfVQV5g0nz3t8J for ; Sun, 28 Dec 2025 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766951602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4FZApaGx9lxvHBoXYkUHAROjaB30OzDZmls9oKvhxU=; b=ZmJcm9mWWY9MUZczRVC6rLepO8nXb+UbKg01kDSesL5IbMt1N7+8nb3muh834NHd4gJiGy V8vonyvnb+BrcuUhm6cwByuvLW2d8DTkQXZtCZJoJB4ssdFGfp/gKbKg4KEZnfrdPPTe1Y m4VfWdRHeVBD3bxESSFFT7Swu0q0RzdQ5wHv5NS8kHDOkPVAPNi1w2bKzt+/+GpS50uMjZ b+WsV+gNXf681Mdxcenbh4Upyy7q7TckBTuPJWnnbmokICMnza02i+M03tjTo/RumZNhPK 2hvTQDsLtJRPdG1Ix5syOjIX2DW8cf4Ka0PaErwzmQIP/0myEfywiGaKCgjnDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766951602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4FZApaGx9lxvHBoXYkUHAROjaB30OzDZmls9oKvhxU=; b=AGG9t/6mZrCYIQLNA6W+Xsfmsuitmc0w7jv4kKiu0ez9y4n27iA34vsn0hJ5iW/TrslMRL j0tQ7OQDhEz0a7CArdINYBEuAgbF1QqxLaFyFa9xO/x0LJpZVvtQUmzsPe0XRiUTLusAWB R5CSHG7dI9rXL0WpCGEzQDf7C0diI6+emC3CID/KocNUIht9L5lJWmtcExySV+9NWyKleX AiZ1I4S9og1FjYZ6NldYOegEPbMym1RrzDxffrttIe0T1b7oSD79wCVsIW25bdzvCqOpau 5dM7wnyFZETgZoYla5DEKBwGGXA5fQcIlUhz9MQgjUtqKQ7r3v0fcOQ0LkUNJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766951602; a=rsa-sha256; cv=none; b=EhL8JDfleri9FJNYia3oLhLmtWwlAThOn09HwFFq8Ht4NUozNMG73KbVVr3oq2VaKbbP05 DNc+T//HVYFCb8n9fwvUkaOTV18Zif+7O9OKUfAUBNm18h/2E8woLp0iSMo151p4492I50 o6HWHLZYODpYRIgPLvD2458oCkDfKzypUhnnZMkcMu4X9cqWSwpJX+QebzgEkkci4TXOs3 99klFdq53SFcn4IQ5GCGGpQNEhR9JJU30Mma5f43AA4Vm+yPUCMIwO0GXl9tgINyPfZ0Dv VMWQxFIDbu2dMOHuwyFznsOxs4/6GF4Gl0lPR4p+iRFZUfFQn92Oxf0enI2lSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfVQV4zWtzydr for ; Sun, 28 Dec 2025 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37dda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 19:53:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 63d1c3c43690 - main - bsd.sys.mk: suppress some new clang 21 warnings for C++ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63d1c3c43690ff3c3e76e1fb03c8640fe30a2663 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 19:53:22 +0000 Message-Id: <69518ab2.37dda.18041536@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=63d1c3c43690ff3c3e76e1fb03c8640fe30a2663 commit 63d1c3c43690ff3c3e76e1fb03c8640fe30a2663 Author: Dimitry Andric AuthorDate: 2025-12-25 18:44:34 +0000 Commit: Dimitry Andric CommitDate: 2025-12-28 19:43:12 +0000 bsd.sys.mk: suppress some new clang 21 warnings for C++ Otherwise, these lead to many -Werror warnings in libc++ headers, due to our use of -Wsystem-headers, which is not officially supported upstream: Suppress -Wc++20-extensions, due to: /usr/include/c++/v1/__algorithm/simd_utils.h:96:50: error: explicit template parameter list for lambdas is a C++20 extension [-Werror,-Wc++20-extensions] 96 | inline constexpr size_t __simd_vector_size_v = []() -> size_t { | ^ Suppress -Wc++23-lambda-attributes, due to: /usr/include/c++/v1/__format/format_functions.h:462:32: error: an attribute specifier sequence in this position is a C++23 extension [-Werror,-Wc++23-lambda-attributes] 462 | if (bool __is_identity = [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated | ^ Suppress -Wnullability-completeness, due to: /usr/include/c++/v1/string:1068:80: error: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Werror,-Wnullability-completeness] 1068 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n) { | ^ MFC after: 3 days --- share/mk/bsd.sys.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 2134886abcf5..50eb04b9fd15 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -93,6 +93,11 @@ CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter # Similar to gcc >= 8.1 -Wno-error=cast-function-type below CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000 +CXXWARNFLAGS.clang+= -Wno-c++20-extensions +CXXWARNFLAGS.clang+= -Wno-c++23-lambda-attributes +CXXWARNFLAGS.clang+= -Wno-nullability-completeness +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Sun Dec 28 19:53:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfVQX1f0bz6MGlT for ; Sun, 28 Dec 2025 19:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfVQW6FVhz3tBn for ; Sun, 28 Dec 2025 19:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766951603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lz3l8bp06CKk3bamMnC2jbVVvIuc/bFXhfiflwYg3yk=; b=eP9Bt7eof5f4XGY0TRHLOVA5obE5HUFEIMNfzGrCQNL4PmQd8kaQaEqz3WsVrZ4cACln+J 2TOiwuwse4ag6W8mqV5aRQehAUnFwrSO/DwOWHHHTV5aNPv7Jqg4A0I6ol30XMmlj2WBHZ UUDyfulzwLhFp5wm2MDiPDjJ7htXOZ97LUgbXifrjgdgNR0y3Mgk+nCpB7Y5CGGurJ/mkM qmk0CuzLz90jwhzwQ6Zrd2XiU5AuO9mCHvhdIincMPz0+nKj0A03SvU0X8Uu5h9PzXfu0g JpZLMO+eL1cSmaFgwPjmwOxsIeAbS7BVsFwqhXdEtpuaU1wZP5yfMXjOSTN6YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766951603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lz3l8bp06CKk3bamMnC2jbVVvIuc/bFXhfiflwYg3yk=; b=cL6s0g3tqGT+rG9bPEUb7sJOUXnjTitdzMIvyz48X/+x4pB8I5QiEwYBcMmDteChwnk11A nnncnu/YNEtSaWRxbN/OT71tZM4KnooN8FYxWKIQrnNjjVBppY+iKw0afZ2veP5MHJdz2z ux/lF8v0/sLzOUd1LtpqwuKupWerRlBOIgkWZAW/QcK76lJigvcY7YC3DCCfsBa4PjXF5y 98D4drss+DIE6Cv495z6LZDKmYmtnP3C/OJwc0fBj7nv4eWGLMVSH06tedXdarA2ASzWei Qby9e98ZSLkdeKeSzIThuPr/aAjbAFDFkEtFMnvhjBNEy1AdPbbJ3jABmoFLuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766951603; a=rsa-sha256; cv=none; b=jNI65/3z4PiW2670SlZ1yhv5m93DKsVbnB672D6N9eJLOp6aWkodTJH9suYTPLPDToPf/R qlgu8eH92CfOjZ5LwfXcySRt0r1QYxxD39FYt9XWtI0e50nF2f49aLcGZAOzcMNrlubpXB mXDe2j/bCEBFOH0HUnIgVLEhmeqUO0SgytBle4lO/rRh16TvjFPKYDHnp7oYS2EWL7lELk 1z10Tu35tH1Tv0neSdGa/JrVjSiKU/zZZRUw2Cpxj1WggprR/P6OIT2aWAVYBMb25VXTkg 7mmERADufRXwyQDtH9CzKHFFtRJOO8L6NKcI5o3INqEOTRfDjeqEZc2fyCBzmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfVQW5n6fzy4n for ; Sun, 28 Dec 2025 19:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c14 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 19:53:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ae31c10537ed - main - bsd.sys.mk: add NO_WCHARACTER_CONVERSION and use it for googletest List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae31c10537edc1ed77a852e60bf3bd31fc38cba2 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 19:53:23 +0000 Message-Id: <69518ab3.39c14.32e76fbe@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ae31c10537edc1ed77a852e60bf3bd31fc38cba2 commit ae31c10537edc1ed77a852e60bf3bd31fc38cba2 Author: Dimitry Andric AuthorDate: 2025-12-25 20:05:51 +0000 Commit: Dimitry Andric CommitDate: 2025-12-28 19:50:42 +0000 bsd.sys.mk: add NO_WCHARACTER_CONVERSION and use it for googletest This silences warnings about benign implicit character conversions in googletest's gtest-printers.h. --- lib/googletest/Makefile.inc | 3 +++ share/mk/bsd.sys.mk | 3 +++ share/mk/googletest.test.inc.mk | 3 +++ 3 files changed, 9 insertions(+) diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc index 43ebace19a15..b1f7fa814166 100644 --- a/lib/googletest/Makefile.inc +++ b/lib/googletest/Makefile.inc @@ -10,3 +10,6 @@ CXXFLAGS+= ${GTESTS_FLAGS} # Silence warnings about usage of deprecated implicit copy constructors CXXWARNFLAGS+= -Wno-deprecated-copy + +# Silence warnings about implicit character conversions in gtest-printers.h +CXXWARNFLAGS+= ${NO_WCHARACTER_CONVERSION} diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 50eb04b9fd15..c5f2c2bb783f 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -133,6 +133,9 @@ NO_WARRAY_PARAMETER= -Wno-array-parameter NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000 +NO_WCHARACTER_CONVERSION=-Wno-character-conversion +.endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200 NO_WUNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable .endif diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk index 9ef5a3ceac00..5f4445e76205 100644 --- a/share/mk/googletest.test.inc.mk +++ b/share/mk/googletest.test.inc.mk @@ -10,3 +10,6 @@ GTESTS_CXXFLAGS+= -frtti CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private NO_WTHREAD_SAFETY= + +# Silence warnings about implicit character conversions in gtest-printers.h +CXXWARNFLAGS+= ${NO_WCHARACTER_CONVERSION} From nobody Sun Dec 28 21:17:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfXH848Mtz6MNWg for ; Sun, 28 Dec 2025 21:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfXH81NWtz47sF for ; Sun, 28 Dec 2025 21:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766956628; h=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=8SQTX+0T7FMAQDEwXQAnsFfmGRewchXUj/2yDSne6Zo=; b=fwOxxR5sezcK1tz8GGteYoHgknT7e+gTh17Gy8RP0/2egvWCFKxsGzq+lc/oY89qyf9orM DkQwIXEL0HOBDmjD5itZ0knDc1xcX0SZQfFy8+4bEhdKHEG+W9lqfRLzN4bSIiMoQaSwbz /iH3xH5XNz/vyVYyiH2H4x7JM8QDlEMKVvT85zhyeI85u/TWow7gcxB5tQf7WWnKgGSIb1 xNUKTEiid1t9fSf187iu4ktTQ7MIGUuH6fYXW5eayA97pIl38aRXG7xlvI+baOYiNwVBLD ROF8mCfL/6/xN7N6ZVmf2tdjuqLFyRGzEeEX2aWncyrVWeg9VrYe3mvqkbjfyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766956628; h=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=8SQTX+0T7FMAQDEwXQAnsFfmGRewchXUj/2yDSne6Zo=; b=WtuNeatQrX+qafhmi/NO1hm4TstdoH5ycg8v7tsuIiCvKRyICM0PAosRW2fZ2VxHZFv7X4 +1muDkFfThGYwJuivlmqyF5I4Qn6RMRbcp0k/K+BgL9oiujTXtM5FLoZpyR5JHIh6s3F7V AHUDv21klSGojxG3lg+JDEYRx7DcegqtqUlJpIzexl5T+gOgtZPq4IHY+APuN3Fo2+Bmvo wLouK5XLEM68/jNzvZLtg6XtL9TqXzx0I8MxafK5VfiUPaI21m3njKRIe8T112/2rc4QbT Kd3IhUYfJXTrvVSCW0zmLTAllIzOV8WNFNIElu4G3eUxhFyy8niiRsQkRIZgmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766956628; a=rsa-sha256; cv=none; b=QlhosJbtDkoW0jd2w6Wl3MgVWaZ6pYxu7444z1GrkalfeWxDKBwykPEoti39pY0W+sG9wb sZE9BpGxJjIXeoE+d9PN3UNB10TAjHgxWvP1xB1HaAQuMsV3Q/qde4aEV4oPHFOF5Wjrer rySTi+soNSmAVmG04WP8EdQ9i/p37zwUs1CwfUdoOCSdFvusKhsgZPpBCUCLAaf/Y+LHyQ UEHx44fa5qKVpeUeqPw0Qtk68wKQpy8pgaGpBGKMtqJ1ygS66Qxm5tJ15CsubNFlVBw+GB dXHUHAf/bHv2ggkPGespJSJcEcvqyJOHFljVTUuhB4OJOqiidLUF3D53VdrqAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfXH80MDSz11cd for ; Sun, 28 Dec 2025 21:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 88eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 21:17:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 3c0ea1b62976 - main - ocs_fc: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c0ea1b629764c49611e3e3adfa0c44f9afa3558 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 21:17:08 +0000 Message-Id: <69519e54.88eb.7ffe9dc7@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3c0ea1b629764c49611e3e3adfa0c44f9afa3558 commit 3c0ea1b629764c49611e3e3adfa0c44f9afa3558 Author: Alex Richardson AuthorDate: 2025-09-16 04:58:36 +0000 Commit: Dimitry Andric CommitDate: 2025-12-28 21:16:24 +0000 ocs_fc: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week --- sys/dev/ocs_fc/ocs_ddump.h | 3 +-- sys/dev/ocs_fc/ocs_mgmt.h | 3 +-- sys/dev/ocs_fc/ocs_os.h | 2 +- sys/dev/ocs_fc/ocs_utils.h | 12 ++++-------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_ddump.h b/sys/dev/ocs_fc/ocs_ddump.h index b7d7eefad813..3cffff6d9670 100644 --- a/sys/dev/ocs_fc/ocs_ddump.h +++ b/sys/dev/ocs_fc/ocs_ddump.h @@ -46,8 +46,7 @@ extern void ocs_ddump_startfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_endfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_section(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); extern void ocs_ddump_endsection(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); -__attribute__((format(printf,3,4))) -extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...); +extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...) __printflike(3, 4); extern void ocs_ddump_buffer(ocs_textbuf_t *textbuf, const char *name, uint32_t instance, void *buffer, uint32_t size); extern int32_t ocs_save_ddump(ocs_t *ocs, uint32_t flags, uint32_t qentries); extern int32_t ocs_get_saved_ddump(ocs_t *ocs, ocs_textbuf_t *textbuf); diff --git a/sys/dev/ocs_fc/ocs_mgmt.h b/sys/dev/ocs_fc/ocs_mgmt.h index 7b59a3916ca8..9781aec18462 100644 --- a/sys/dev/ocs_fc/ocs_mgmt.h +++ b/sys/dev/ocs_fc/ocs_mgmt.h @@ -95,8 +95,7 @@ extern void ocs_mgmt_end_section(ocs_textbuf_t *textbuf, const char *name, int i extern void ocs_mgmt_end_unnumbered_section(ocs_textbuf_t *textbuf, const char *name); extern void ocs_mgmt_emit_property_name(ocs_textbuf_t *textbuf, int access, const char *name); extern void ocs_mgmt_emit_string(ocs_textbuf_t *textbuf, int access, const char *name, const char *value); -__attribute__((format(printf,4,5))) -extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...); +extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...) __printflike(4, 5); extern void ocs_mgmt_emit_boolean(ocs_textbuf_t *textbuf, int access, const char *name, const int value); extern int parse_wwn(char *wwn_in, uint64_t *wwn_out); diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 331d5b07aecd..55ee98b3cc58 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -711,7 +711,7 @@ typedef struct { * @return returns 0 for success, a negative error code value for failure. */ -extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __attribute__((format(printf, 3, 4))); +extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __printflike(3, 4); /** * @brief execute a P (decrement) operation diff --git a/sys/dev/ocs_fc/ocs_utils.h b/sys/dev/ocs_fc/ocs_utils.h index e3a952e0cf26..7c9c9ae85b74 100644 --- a/sys/dev/ocs_fc/ocs_utils.h +++ b/sys/dev/ocs_fc/ocs_utils.h @@ -103,10 +103,8 @@ extern int32_t ocs_textbuf_init(ocs_t *ocs, ocs_textbuf_t *textbuf, void *buffer extern void ocs_textbuf_free(ocs_t *ocs, ocs_textbuf_t *textbuf); extern void ocs_textbuf_putc(ocs_textbuf_t *textbuf, uint8_t c); extern void ocs_textbuf_puts(ocs_textbuf_t *textbuf, char *s); -__attribute__((format(printf,2,3))) -extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap); +extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...) __printflike(2, 3); +extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap) __printflike(2, 0); extern void ocs_textbuf_buffer(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern void ocs_textbuf_copy(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern int32_t ocs_textbuf_remaining(ocs_textbuf_t *textbuf); @@ -325,10 +323,8 @@ typedef struct ocs_ramlog_s ocs_ramlog_t; extern ocs_ramlog_t *ocs_ramlog_init(ocs_t *ocs, uint32_t buffer_len, uint32_t buffer_count); extern void ocs_ramlog_free(ocs_t *ocs, ocs_ramlog_t *ramlog); extern void ocs_ramlog_clear(ocs_t *ocs, ocs_ramlog_t *ramlog, int clear_start_of_day, int clear_recent); -__attribute__((format(printf,2,3))) -extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap); +extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...) __printflike(2, 3); +extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap) __printflike(2, 0); extern int32_t ocs_ddump_ramlog(ocs_textbuf_t *textbuf, ocs_ramlog_t *ramlog); #endif From nobody Sun Dec 28 21:17:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfXH94bwmz6MNSL for ; Sun, 28 Dec 2025 21:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfXH91qwcz47sG for ; Sun, 28 Dec 2025 21:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766956629; h=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=fWGSVxUrV5Wokq8YItvMWPYA+TMKcWFsHpNIHpV5APk=; b=vnqsR6xFCY8AgD47JGW5ao/WN4uJE4d8yDGELh7H2QbSXJOAAe/iKQcOmz6L4tf1ncHeif X9uH91YsvHE5M3J4EfVTjh8hYF8HA2HfK1k8IRf0sCQUsoUg4qNPLYg6xeUgJNf5yKTDD7 xUdsgNZG2GWJ0rbh1Sl/342OtAO9SrzcVtTHwjPI/f4VFEK2NVyExSnwL9hfQYTqVAuYw8 OAJcpZ4jw75xURHwaWVL4o7eU4gf4BsbcD6eJ7w3CVAsl4I2nm/3Zi7NyrhLYIxpyboTer 2oUu7kKGkuAhxT8FXwrv844L44Cdtfks/lEU/mofijVu5ZvEXPtFJO4EYDEq2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766956629; h=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=fWGSVxUrV5Wokq8YItvMWPYA+TMKcWFsHpNIHpV5APk=; b=EA91oYLbUNA6rBTyqrRIaVIS43Puyhab4eADNB+6doC4ezyrYbw1AJQqzgGr325ShnIj/0 xV1uljm6Tlv9DyADODZSZuD5f9eTd4xbZe+dNuOxxvcbcASqH2kEdm0jflM/AXojwSI6vj JTveVcVJ2fdg/90CB1zRLzT+36+c8nxauUSazHBo0MT3y3lW0+4udVSBzoocApIVSmuLmJ JvQtMbdxNvHpPTgxS652F8w//VNVAbt0/CEYB3mNQkQDOppjwcpTnXS8oME/uvsfhALcJF 6HiXoINFot4nwD3rrDKDAMYu+JigFMlhO++CyRqJHMOuxZuJnhtmL03ygmidhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766956629; a=rsa-sha256; cv=none; b=Q3vSzORrkOB+EXwP77N369bZvSSVEdCb4AO8JAvSoV2CQ+s5E5jQ12PREgD/GXTYgIHuEW GtlRMvdCioF7/AOyVIwHtjEzmOpNq7fJQytiqE71rQ251dwqdhHIiSCvY5TrYN7SIoQ4pw vjsdxlOAPFiP501fTU6W+/pqpe3GYk4WODVMNKRbKQ2NXiA5ryqBmEjpfZpbag6SYaKqBt 4yNo9mIYly5sJAhd/PnunfnfgYFHp+bmRLMavu9XuUnEflUmYvlyE8pvRC1Wgx0oRj6zfw yfFtxtsswDskScrkMI7KppnoJphEjRieLmFHjuQpgKTr9Xb3dlNaXgpM4a+NBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfXH91BH2z11sK for ; Sun, 28 Dec 2025 21:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8d84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 21:17:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: 4cd7be3e8186 - main - sys/xen: Use __printflike() instead of format(printf) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 21:17:09 +0000 Message-Id: <69519e55.8d84.497b2730@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9 commit 4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9 Author: Alex Richardson AuthorDate: 2025-09-16 04:54:36 +0000 Commit: Dimitry Andric CommitDate: 2025-12-28 21:16:40 +0000 sys/xen: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week --- sys/dev/xen/blkback/blkback.c | 2 +- sys/xen/xen_intr.h | 2 +- sys/xen/xenbus/xenbusvar.h | 8 ++++---- sys/xen/xenstore/xenstorevar.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index c6cba729b991..dcfdcafa9351 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -152,7 +152,7 @@ struct xbb_softc; struct xbb_xen_req; static void xbb_attach_failed(struct xbb_softc *xbb, int err, const char *fmt, - ...) __attribute__((format(printf, 3, 4))); + ...) __printflike(3, 4); static int xbb_shutdown(struct xbb_softc *xbb); /*------------------------------ Data Structures -----------------------------*/ diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 75c3dc7c6060..4965928cc8b4 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -182,7 +182,7 @@ void xen_intr_unbind(xen_intr_handle_t *handle); */ int xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __printflike(2, 3); /** * Signal the remote peer of an interrupt source associated with an diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index ee444c132c0c..0f4168f17e6a 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -151,7 +151,7 @@ int xenbus_grant_ring(device_t dev, unsigned long ring_mfn, grant_ref_t *refp); * printf arguments. */ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_error(). @@ -162,7 +162,7 @@ void xenbus_dev_error(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Equivalent to xenbus_dev_error(), followed by @@ -174,7 +174,7 @@ void xenbus_dev_verror(device_t dev, int err, const char *fmt, va_list ap) * printf arguments. */ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __printflike(3, 4); /** * va_list version of xenbus_dev_fatal(). @@ -185,7 +185,7 @@ void xenbus_dev_fatal(device_t dev, int err, const char *fmt, ...) * \param ap Va_list of printf arguments. */ void xenbus_dev_vfatal(device_t dev, int err, const char *fmt, va_list) - __attribute__((format(printf, 3, 0))); + __printflike(3, 0); /** * Convert a member of the xenbus_state enum into an ASCII string. diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 8b02262396e8..f34ad375bc3a 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -270,7 +270,7 @@ int xs_scanf(struct xs_transaction t, */ int xs_printf(struct xs_transaction t, const char *dir, const char *node, const char *fmt, ...) - __attribute__((format(printf, 4, 5))); + __printflike(4, 5); /** * va_list version of xenbus_printf(). From nobody Sun Dec 28 22:03:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfYK73mxPz6MQy9 for ; Sun, 28 Dec 2025 22:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfYK72NWyz3Gg1 for ; Sun, 28 Dec 2025 22:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766959435; h=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=hkYqrcWTt2cXlXb35H029QT/G573h8Ncqvfc6nnucRk=; b=XtjJ2KGZIdunoO/1E4qSBUuhCTny7OPFSqXL2ts7kkp9Kg82pmIcS6DxvXB+kWEiYrKQCo mDK98oYriIj+GHlBGlXpzM+4y7jXMBFR3T16fCGo8vubNoywMR0vlM+/CxGlARM1n4/zq1 XdPxy+GU/YroHQcOxGIU5L4jbZ8J17l7pJKaTQ2pyiC/QELw0SlRD2ughUZQUWODqUoB3m DTHoc+rWKqXIVZb9fBQtglVei5bBUiNzdblpYBZPfelghrUThF404IM7BSwdtCnTVAj0Y7 Zr/FgIYqK8+F+h+MLfxqpzf3yKNf5YooPFQQp45u7gJmaM29+zkde+Pv6Dbq/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766959435; h=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=hkYqrcWTt2cXlXb35H029QT/G573h8Ncqvfc6nnucRk=; b=qyJMCYhRdEx9XWOqX2jbufezIlVXr0BXdyVjtGvkju8NWEczjp5IZGBSDNCz/xsPueWhyV zJmsM42KfPnbEI/a66hW2i/aiYWioGFn9IKWQsCl9B8xo1GlCN2UYxyn6lMIfmcufB22nk +dm5HA+nlnumTamHhm/cGKxXQm0GiGc1FLEN5j8hCMHFJkcF908PH4rd65znIkzl5r5ubp UDNRV1LwmRelpso338O9Xbmkdnx08aMzD0n7nO/V8ARo4KrH+I+ZyzN291pkQJbmf64ERg cQZ3btzwp1+i2AEoM211qKjE9wj1hVWZSSRzHNG4/0V+ofNZjN1o2KapOt2WGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766959435; a=rsa-sha256; cv=none; b=NZYabVy0Wfq0w4SAiNz+eUOTPZc4YTF7bJO/8X/bFkmTHUcuuHWmrw0dtbSpFbP3Wpm6Mu /SNOJlSOdHUl+vjSRaJZ+kRdlI6lDrFNN9WozeGHCqLMZ8Cj9e9JdTJPx0sRReyCiuVv+O HAYGPrr9rQRyZvxJqGaeqI9qWk03F/WXW0yKFEfXlxFCdI+aJ9ac3ETk8MR/eI8tHPNOrA xNQ7tELDjmpgwdcaGnbF5jhesFuCaYwTmuOeDyQOLd946bmIzMTyEoyT8m3fn4CqkEY+KE 91N2rUEoCYNj97KLoKVTEymfUmAiGG1oq6E4OxB0dOQ4ts42GOKpVA0Rm+gGPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfYK71gw4z13QW for ; Sun, 28 Dec 2025 22:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e12a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 22:03:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kyle Evans From: Dimitry Andric Subject: git: 541a98d7e28a - main - compat: linux: use appropriate variables for copying out old timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 22:03:55 +0000 Message-Id: <6951a94b.e12a.483fcc57@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c commit 541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c Author: Kyle Evans AuthorDate: 2025-12-28 22:02:04 +0000 Commit: Dimitry Andric CommitDate: 2025-12-28 22:03:33 +0000 compat: linux: use appropriate variables for copying out old timers We copyout &l_oval but do the conversions into &l_val, leaving us with stack garbage. A build with an LLVM21 cross-toolchain seems to catch this. Reported by: Florian Limberger Reviewed by: markj Fixes: a1fd2911ddb06 ("linux(4): Implement timer_settime64 syscall.") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52985 --- sys/compat/linux/linux_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index ed9133359302..230be9572b85 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -131,7 +131,7 @@ linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec(&l_val, &val); + error = native_to_linux_itimerspec(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); } @@ -158,7 +158,7 @@ linux_timer_settime64(struct thread *td, struct linux_timer_settime64_args *uap) return (error); error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - error = native_to_linux_itimerspec64(&l_val, &val); + error = native_to_linux_itimerspec64(&l_oval, &oval); if (error == 0) error = copyout(&l_oval, uap->old, sizeof(l_oval)); }