From nobody Mon Dec 22 00:10:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZJSl5jfGz6LgMg 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 4dZJSl4Vxwz46vk 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 4dZJSl42twz12YJ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 01:08:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZKlh0FPpz6Lmvr for ; Mon, 22 Dec 2025 01:08: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 4dZKlg425Cz3H6k for ; Mon, 22 Dec 2025 01:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365727; h=from:from:reply-to:subject:subject: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=rPDlOFL7JYi6dIjYF7ntafDMvxm8VhkmqdibAgjxRj3XGgeB+WQtZclZ4iInxz/39iCIHC Re6nmSsxwZfD2CcMIreJnbO9qP6oZDuu9pWzqzuAYeKWZhUK5WSZprUblt7kAp1fCzjzVt LiSdHzWYtOF0iSf56nZmz4bYf7yRUxvsi3HtBr6mj4Z0TMUjRxnixc44BIR5UYEWo0vfLH /Ok6HlTBEcodUGK0DDH1cxQSFLP4vujz2X0BBaMeu+8Z2nOHOHCuwEy/uYmk5sJgDrqJKM 8xnTwZY+zq68jhA4hWlychZ63+0W1HxRTGy6KtDrCbGW61R3BKEuV1E9qrfbjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365727; h=from:from:reply-to:subject:subject: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=tHxPOHLfK9uOYv9TCZeaS3uwpb9ZYzBjjBsMsL5ioiQhQuTBkm9h0Qe+nOspJTCDlKJW0l olnZIXhDUFe+bknoPLb9HmpyCmLiY2PgrowKqPRO+gdfLpEonbunw34RDHiswp/sIDrCU6 UATqrfE5HRoB2Cg8uvWvWuFjRnUr39GU9Ui8y9/iEDnyQAkdAp/w1HOswL349rfeAtOkEi ffPMQFTUCltzaZ3X95rin89c743Li80BiMGgnuX1xP+a76C4JLGmllwkRHqDLgGUEdGuzy d/uCOzUZcKgUgrS5iciBVFI1e0KCUQxaw+1C6mBN4SBDEZotVzABKomHt5Au9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766365727; a=rsa-sha256; cv=none; b=xCedZAfReeTR6VZYHb0PjsI1i6+v7oSlRUuYAjsXyRn4aO38KQfoq9s7XlFs3/qaaKvJES ZIL2hdlV7o32HAJS9icN+YNJKq2r4YxRSQGSQGSGGxqNuFUmBzrcduL4pNX1vrK8nyW6Iq Z/R/8fcL5sRjmsRTNJJ1EvBlX60knhjIYOhF5sPFNDanNiLixvQTYJRlpaL5jB901Fzwcw RirnK8Jf+9d7IQficLzR2P7Bb7Aww6Ux1WMOufMOgBXHHrweTA8YHsAdDPJRTIJUpPrZwH WtIIKX/tHcAvNklXyuKC2gWXmBvGdWy2dpTdI4nZbuy7NdLQZvjhZYjJF4pcQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZKlg3V7sz140t for ; Mon, 22 Dec 2025 01:08:47 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 02:06:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZM2N2W1Kz6LtvS 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 4dZM2N20q1z3NvD 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 4dZM2N1bnDz15mt 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:23:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQB4DZbz6Ly01 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 4dZMQB35qCz3QpB 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 4dZMQB2f7vz164B 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQC6LL3z6Ly9L 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 4dZMQC3vmMz3RD3 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 4dZMQC3Mrrz16Vr 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQG0d8pz6LyCl 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 4dZMQF5Kknz3QvV 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 4dZMQF4pDlz15pZ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQD5rNYz6Ly9P 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 4dZMQD4YLPz3RD7 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 4dZMQD3zrmz16Vt 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQH34YSz6Ly1x 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 4dZMQG5zJvz3RH5 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 4dZMQG5JNHz16Vv 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQJ2Q8Lz6Ly9X 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 4dZMQH6j1Nz3RK5 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=1766370232; h=from:from:reply-to:subject:subject: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=ohxdNfBHvcpUmwq450MZmks/Yuman/ihWvSQOKOCkwutLIQjxRJRM2A0OR2wyYnZO432oA GjvgYSSGQ6OeRAUD//MoOKhgUKN9gAP2fIE38PSOyeqycWTFZ6DtBaehufQJMWjvuBMXjz gr3QyHw9UERQ8qXE5E0//EdEl6e3AumQHbMNwG2HNjY6/Wc6CDSR2TZEniqof+50/9BA/7 lu/ZNe5DX/Q2t+dVAeeZulPYNkMkfsRbGgtLRUfIKjY8nG+hHdxhLvFqvfzFy3fPx9WG23 kE4JSubWifH5FxzVyC4U+KXf1bJmDPiVOFfJMTnovH3fPrIxwrxjb1ROP1CKkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370232; h=from:from:reply-to:subject:subject: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=FGuPwjI1W1uY+3p3ek7dJekqfC9PaZ3AK5sI/Wy6h4lovnL00e7qG01k8oCGTBmqdde+z/ rAf8llY9W2sEzJyZkxUK+P0+M/Jt94NJSN6EkGTXSx4bYJezX7tZFpstcyXYF7njltFSb+ jU+fWqont9kRWAcpDcq/8yOU3m23v3LXwGw/5SnPUTpd5PxjXpTNh1uix7a5hw3Nens2zD dBXDEmtChOfnYmTEkmtBwo/+PxIujRNklIKmcZMJuFDnx8iEPttuyvqiWnZsa73H9A7RJt VuuZgfkucNXazQqS5AkqzkMMgcxJx4Wc9bGAkMBRJGaxItjRj8DBMPoohqvhvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370232; a=rsa-sha256; cv=none; b=DSaSj15rhyRKpbeIZWPQkgzMDLdnCagQ5aiiVhPk2FmESqg79ZrEmZmRk+1RnpoiZwPAYz sr2gqmQpKRnxUF8vsDLwaPlOf0lYXRjZjO/HgAcLFlCwYcbg2iVDZN+8K1sJdQQwr13oSa qAyCELHr5VAzIiEi8e26EcLTSKd6bw1XXtYDi+9staPMCwhqw2+/0BbZUddk5F6VQLEX5D hUqI7h++AdbaXCmumSuGb171j1gvxECBTHCaDr7nD8iiGZAjs27+tRh1Mxj8IoBCWnPIXo qJEK1xNynZiZXHvkHbyjR36TEli/kSRCOAOIwWegi8nhTnQO7ziyTNJthAvH9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQH617Nz15pb 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZMQK2sDlz6Ly9Y 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 4dZMQK0CjYz3RBP 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 4dZMQJ6nmbz16KR 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <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 09:31:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZXw75FVZz6KjF7 for ; Mon, 22 Dec 2025 09:31: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 4dZXw24Vgrz4DpL 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 4dZXw243Gtz520 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZc071SmLz6KyVj 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 4dZc0668wRz4Qk6 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 4dZc064zzgz8p3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZcxb2Gwgz6L3mP 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 4dZcxb19lJz3GFH 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 4dZcxb0lRhz9Wq 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZgwT20j1z6LHL0 for ; Mon, 22 Dec 2025 14:47: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 4dZgwS6Hh7z3SNX 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 4dZgwS5MRzzVpQ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZgwV05kSz6LHM6 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 4dZgwT5gz9z3SZ4 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 4dZgwT55x5zVfX 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZjK71GLmz6LMtH 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 4dZjK65hJhz3Y0M 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 4dZjK64PZxzYp9 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZk9B69GCz6LQv0 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 4dZk9B5ktvz3c8L 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 4dZk9B4WHMzZDD 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZlGc4N8Mz6LVw0 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 4dZlGc256Zz3h8M 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 4dZlGc0v7QzbhT 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZrkr02X6z6Ldpr for ; Mon, 22 Dec 2025 21:24: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 4dZrkq4WtLz47yN 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 4dZrkq3L6nzjgJ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZsM24mR4z6Lhf8 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 4dZsM22VXnz3Gxk 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 4dZsM224GKzkdn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:11:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZv6N43QKz6Lpyy for ; Mon, 22 Dec 2025 23:11:56 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic304-25.consmr.mail.gq1.yahoo.com (sonic304-25.consmr.mail.gq1.yahoo.com [98.137.68.206]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZv6L0PZCz3QwP for ; Mon, 22 Dec 2025 23:11:53 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=OJWOTbEx; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.206 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766445109; bh=3Y2lwnFpAAuSUAfjSZo5uYJEUFJklcdBW4SbZA/VjP0=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=OJWOTbEx1TA9bytiSZOIUGYiwHVeKbYMljpNPzONJ94Q8UePv+UajLYvrg0JPx/MVpDq+REIDJiIboYeTOj5GDy4z+I6q2m2tGuDS72OGNQEUkdnvpg1N0WpNAoo1oLi1U4LtBYeJDSkQ2uBTqgLAaebt/RbnIYW9xJ3EnZZeLtkahb3ld5ttCxy1zH453PKG89h+7nxwUleG1RRlpzN0yYcIvH+LM2AESh8d0Ju0jJ9DlhJ8TlugFisPTaV9mqLEbA812OvQ5+o0inHVJtaIeEiLZ2e4ghQYljauLENTpDFw6oE+8NVAZFrXxgAJlZQDigx3Tk3zjjvb11BlLmpXA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766445109; bh=WRt5HGs552oVLCP9s0jVz2zFyJgOtPs+nQUYnqa2Vgw=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=E7lA7dIvQ+sRBNa6h6AokLWFVx21AazcGA6x7DFw3p9utH6x0ffKgVghPN14m2KggiMuVnicnZZdbRxxhb8k6en61G0kYnsJnWapR1OtZJzTW1kxl6AwFuLOGqVmkujTnnfEcIalSYh55T+KO9qdI4uTzK+mR0WLflEEv6IEbqJfZdWNWFzWQvr0kJ1UykWh+2oXXTZ3FLxanoL82HNIYqMQEgUTUYeZoDAoCr2ht9uNCm8UJFJvb56thIP0Q64QJZkgTe/1Yk3cV76viUZo3etoinVQWBiaRcQqqosRvPiovVfGP097Bs06tMD/r3yVgxygfFyV6WNgfhw90TXmaA== X-YMail-OSG: y8_PQMoVM1nDK8Ev96V_YPuMXNSN0hKLe65nsk5usY5hl02cZT3_hK5pFpsZvJ7 kvXsnf0I.nMb67sj.VWzuuHSPuMVi97_0FkQs7ZNcCAzn6D6KMT4jZ6HvuDDwJdZBxoEYMgY2qNF Ap4ocV4nNj6ZKNAd44UND5KpkqoL4xZNoEs.Ayku8jzfUZTuK1lyzsX87_SR.mE101jdKvj8ct7C 025MZGK8wk5tfzExK3fVKkGDxdLnbuz6J.yFA_NR4ISrEyB3JTLFugFKC5fsgsHk5aabpD3HQmEx veBsbsXcFhXcL7v_2wYxJanuN1SQBDeWIUGlS7N8e4DAZjP.TC6JpMDNcK24nTp2bG1wcBbOY4pz __IUak.rBRsTiq8C33ca85NmVtfCR0RfkolByGNC.SFlvqkfxd_.BxynAqt6p03KBTAGv4xKRrLs DLqjnLgBK1NvGOQgY.huZuCfdZdadEOECvj4lDhKiGtxcHWqxHx7G45xZLW31ECJpj.LJPG0CNIH hDesFqrFIx5aeYJ7kXK6e8OD2gfrtQSuocea29vLiKNqoLn_k1dn0yhu49pMsnoJYSLkkU8DwiRa TtqQSZXTbd8bQfO2vxWLPaPlQEi1Da77GXtKgDYOLU17hCkHB2W8pb2IqucLpECkAIqYTdHyKwGM r.EeLKTAT3enCH40qsaUbbScuTM.YGs7vDPAgZ8XCXWh_cWDBumaOmSoe3PJSYsK8UIPCQ_.nA4B zsFUF5Pe7ZNoIb4fWqw6VucN_pA2Va7hZlza5hCGlruw.sXT6B5kC1T4.coSdzxdo3tp3hwuEyMH k0WJNCk7H95v.P.dqsHuG45_Fuxidt9l_faSPVgXoL3WEg0McoGyH0CtUIrLHyLQ4mEEoq9lJzxi FpIFSfZOKOzWh1ixI3EY8CXcn_2BBroJIxswzZotblUxAxPu5WSyDeip5b7ULWcXPX0RrzfqYxmR GyN7iPHHoOWxJPnp3QOGwxyU0B5yWzwZnMv.10d2oreXbg75hom6CRs8OEk9qODp.sSL9UzxSrT9 l.dO0a2.e4AeKv83Y.3yhi9XeumQ9pVGZDPXcl06OF0_SdMpNgIkYIIeTDRI5UOxibX5b8XaWrCJ fJzTOEBAr4dR6vf1EBccacdYJrbA8FpsHpDyuiazjC_QuLez8INlWwGqzSSLInD8fsMFcs.heb9a wVaBVNRTN.nRw2FpMSAYB9x7Jot5t93yd7qX2LCq7R6MjpL78kZftj9M_EA4H4P96_RNxCoMpvXG VqgBimpbTyUD1FB.dj2Hw1NDjKZrYdMLx51uD0aUHRzD9GIW91PsUzlYG9V.bfN.z35zA1IWX3Z7 cjGMVrzHQar.fdBPrE6e.PgKBy.8PEGLzn3cHe.fnz.RarrrDNbMIioS9i8wM5j2OA.Ptt0WdrbO ISJMc3xf.DzNDXSiiSmJVBbFEVQKD7qrZK6u9312AGe6sfpEOm2jJ5tPDMGNJLoTpn7kWcgHe6zy 8tABc2ihhTgBabWKPcpVrczLt4tktKRkP6wznTs6z8z8_IkMbOBHeIsOkyUVLZVhLxhLVvVauFr4 HyqLPOAT9Xt0A7oFbYxnYIgH9Ei3FKAYZvxx6_tQhsTyxESv4SwtvG_OsX7orJhdm87PO.s5TXl2 TLsUJOQGVLQnfW7UD2o1IjLGhZlyN_pqruyDDFtnxI.C6UNM5rRj2ZeeU4i74CbKeUT2q7PFalF9 A3mp2k0DSP9iJBk.46PG5XHeFvbHQHCed4bQbPXrQNQK9u8.nvJjQknm8r6ZlCX8wpXHrf_5paXv MlYF0Wf9G45Z_Af57eBZpCGWu_rCralX0uy062mzLcCcD1sryODBc0_5EGDGq6_ILSkseyMXtWoh 64MgTnXfemBzMmKiAoI0FLgtFq_pm0ag_SMnuRHYXpKuBBYIUTMDG6Cr2kBswHTSrsDWeKfA7BFv _osNH_lmGH8UObEdQ6I2fo8Tu2I_rrvzJuwyZx89IBkstBA4ZU5.Hv83R.ypBQWJDJ.3MfDEOxvV yYpR3nupxSrza1Dye3cv0TFq3ZvHvLUU1zGoeUf4JNp._baFCCu.3KDecznQxYitS5Fp20M_D2lx uAEpzlOrgKY0311h6ZV_c7sIw6cMU3PuNVlQmgAUamCGH.hcHB.PxHDfkmPbwaKEAhcSBlG1Hkbm O46jsaxhGseXeHEU32K3E3aXbW.Rf.f1j0X7kdXzA0lNL_uPvBxpQk8QboKvazbW5fMaxDwSLuJs DEaZKIxrL0S71x9aF8iepO4iIkWMIGuS9nyPA0eXQzyqLSLGlh9IY7zzEMc9_MN5XgWczyM4af1Y js3_E09W7e6f4sHcvoIHDNg-- X-Sonic-MF: X-Sonic-ID: 2ab2613c-f658-494b-9b8b-8d362a35bd76 Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.gq1.yahoo.com with HTTP; Mon, 22 Dec 2025 23:11:49 +0000 Received: by hermes--production-gq1-54bf57fc64-8j6k2 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 12c5ad89a6c16e6a6c929a0e49a136b3; Mon, 22 Dec 2025 23:11:47 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: RE: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. Message-Id: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> Date: Mon, 22 Dec 2025 15:11:36 -0800 To: phk@freebsd.org, dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.99)[-0.995]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.206:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.206:from] X-Rspamd-Queue-Id: 4dZv6L0PZCz3QwP Poul-Henning Kamp wrote on Date: Mon, 22 Dec 2025 21:24:51 UTC : > The branch main has been updated by phk: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1b1fb628a1aff05b661ebb063f1795aa= 24ab54c6 >=20 > 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 >=20 > 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(+) >=20 > 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] =3D { >=20 > /* 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 I've used a bunch of: rgephy0: PHY 0 on miibus0 rgephy0: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, = 1000baseT-FDX, 1000baseT-FDX-master, auto based USB3 dongles for a number of years, going back far enough that I also did some of the basic testing when if_ure work was done back in mid-2020 or so. (The dongles are all the same make and model and all or most from a similar time frame.) I've not had problems with them --not that my usage would be a difficult test case. Basically I use these dongles when the built-in Ethernet support is missing or is not reliable/performant. They were as reliable as the other dongles that I'd tried from back then --and were faster even for my basic activity. (That statement is for after the if_ure work mentioned. I remember that performance improved --but not much detail about before that if_ure update.) Anyway: ) Care to expand some on what "works much better" refers to? ) Care to expand some on how to test for the distinction(s)? (I'm hoping the change does not make things worse for my context, not that I think FreeBSD should make any choices based on my context.) Note: I've not gotten more modern USB3+ Ethernet dongles since back when I got these. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Mon Dec 22 23:23:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZvMt431Xz6Lr0t 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 4dZvMt2YzFz3Rvn 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 4dZvMt25CBzmrn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZvWk5N60z6Lr4l 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 4dZvWk40kMz3Tb2 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 4dZvWk3Tm5zmpb 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 Mon Dec 22 23:36:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZvfN2hNcz6Lrcd for ; Mon, 22 Dec 2025 23:36:12 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZvfN0BmMz3Vjv for ; Mon, 22 Dec 2025 23:36:11 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 6F387D7891; Mon, 22 Dec 2025 23:36:10 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 5BMNa9mH004409; Mon, 22 Dec 2025 23:36:09 GMT (envelope-from phk) Message-Id: <202512222336.5BMNa9mH004409@critter.freebsd.dk> To: Mark Millard cc: dev-commits-src-main Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. In-reply-to: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> From: "Poul-Henning Kamp" References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <4407.1766446569.1@critter.freebsd.dk> Content-Transfer-Encoding: quoted-printable Date: Mon, 22 Dec 2025 23:36:09 +0000 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: 4dZvfN0BmMz3Vjv -------- Mark Millard writes: > ) Care to expand some on what "works much better" refers to? I'm currently using a USB-C dock with a realtek 8153 and it it was so flakey it was impossible to use. After I switched to the cdce driver, it has worked flawlessly. As you can see in the file, I previously had the same experience also with a Lenovo branded Dock's ethernet. I guess it may be necessary to specialize the quirk entry further ? My device is: ugen0.3: a= t usbus0, cfg=3D1 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (46mA) bLength =3D 0x0012 = bDescriptorType =3D 0x0001 = bcdUSB =3D 0x0320 = bDeviceClass =3D 0x0000 bDeviceSubClass =3D 0x0000 = bDeviceProtocol =3D 0x0000 = bMaxPacketSize0 =3D 0x0009 = idVendor =3D 0x0bda = idProduct =3D 0x8153 = bcdDevice =3D 0x31fd = iManufacturer =3D 0x0001 iProduct =3D 0x0002 iSerialNumber =3D 0x0007 bNumConfigurations =3D 0x0002 = -- = Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe = Never attribute to malice what can adequately be explained by incompetence= . From nobody Tue Dec 23 00:04:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dZwGz2Jsrz6Ltgs for ; Tue, 23 Dec 2025 00:04:27 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-8.consmr.mail.gq1.yahoo.com (sonic308-8.consmr.mail.gq1.yahoo.com [98.137.68.32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dZwGy4h2sz3Z80 for ; Tue, 23 Dec 2025 00:04:26 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766448262; bh=m11sV2bsWxm6KmLj8B/XlsSVHhXatnj5afnDkTqZKXU=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=raCuejE0gOSHmwUwz1lBEjTp/dN8o1MZJlHurmMK5w5MfF1SkE5dOoRZW9si5QglAX3G05h78s3BBNznqDsEYM0Vh8/g07yKY/IgDrwWcOmN5NP9Y/SD9XHsmqWmA0s8JirO61zBoFXKf034QJXR7XlBCm3gUXirnTRgSPrns8mzFnVz5hOIzFbJDgANXYzuK1OaqgbAp3mKWak/1xv5G6JAR/IOj/tiiEg0Xub/AzlvH+do6hUuUM9qUelXYbV0qLtdJqeny6VEdDTkfo1EMNAv5S7uzQksq/yLafoofo3MgtSJOdavsbsiwZll5yOHRe8UkCtQZEP8zLj2ZbbjBw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766448262; bh=GSHMOUxp8o40YlC8wG5oeCZyMu6aUGRppLmUHyx/eBu=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=OoJ+mq8URyAQe7+QsmcSbxRUQZU2d5rXOim939NBHCe9Gi2uParsSt6VcW+bSyivX7L6cBr38W5BcpNq17s5218J/72MoWjJuKfkTx+QSrWuMXxRpyfIdmddr8LaKUsq+ZhpUKXajuNkygMdrVf/oi0M/V9F4Tq/CT83Lx8ytaOcJHEtczr5yc9vL2ENQxmTG0Og1+tQEt7LPGOga4G65tffUmTjTNo7v6KPMpevPO9Imbv6lBs47t/16YI/oECI0f55ffbsHG459AqXkt14B+sC9kN5mW2xMY1O3+xeQoMMCuN9cbOZ6Bhi1khzB7F5fykDlEE0caK0mB0TLqnMBw== X-YMail-OSG: 8NF2FPkVM1miPnl74BXiapYnbx1p3Efa.PsZ8NWIhmwZDZNE5GL_1c9acDUQbTR XSJ3w6zO0kgTScEdpl0YEVoWQ7.5f9TXmfZ1398DyeW8wHDEWlA.yvOAPn.oRWWd6c2n981gpXQK hoh1_eTQtbM8qHZLASTWXt.y2qpozvhZsgSj7mRzDDIReN2CBXdV0qJkJ5mNaWkJaZWfqsvdLjAG wRITNY1obdj11It1O2vJq1jWYCnyb1fEhQiI01b7qPdIJMy4W8OtQ9epXRH0hJdj.RxMp57P1rf0 hnHIx73chLvwDj0QobDR.y1N_ii8lzjhHRAk5PrQTgq39L5_OIBTK8Yu1CPLWWIzOd3xlu.6rD7W 9bLQp52CJPssgpg4Wj0L7umi4NQ3.R_zrWG4Uq5F4R5663.JVIyTx3J6g4XYzVOb3fpMcrhpnD6u _sVNyApt4FvmQG9_.w33Oki780JKJCoyNebdVPC4AjXSDAu_q2hNKi.2Mupba9HW4iW6otw92Hop zjas8D3AOhPgfxVe_GJGZWkdCc6FRHV02.sqB0lNQKAXJf7xyRsDXPmrz9Zfmdto9mEXWfvM6OCm h6Egi3h4Nq9Nuw5dJephE.3cxcZouBaQyNm4Rdf9ewzz0.clYqV80UrVj3OMnhrVA6L5QiwG_71k L2iJw2eUWO.pIDPiyISRZL5Snjg1j7U9q4VfdNYmVUDjAo.U9BgCa9HaLalTjU_rcwrn7mLyqC4Z ksn.Na.I1i3PmAvFVtwu6f0YP8fualBFaavWdVWr9JxgLZTAAVp512XAogLpX0irHs64TeFyH9LV cNYxiX8a_Z_w5aGM8Oei461t0WYWo4h7PpQVuGFpz9ZL.2EGy1XPB0mnrsLCKT8NXudWcSakEmBB 97xSwyBihz3Pvnpnn4QW7z5otGxuSRisgGUpNotKvPwb52ZaGOGkjIClzrJSnoJevWTz6naBZd4c xzBvx5DD2d0wfT4SLdX4PlDxg1ALEc2P27FtwLEzuurV1I5lTjKILLRiQJp7vlU7H8jh2wGazFh8 GlingipU52ySkDPQUnm53xmQKutSLWNyAoOYpm5YdUpvDDTIfJKyKGzckK_4qWkpY.sTIUHQPDVP hRTIR4OJ4HFqSX1G7gCfH6XfWXHREUYiGSrNTjX4VuhswlXfDN2OLlW..nNuQdOD.Zsg0nnzLnxz tQW8sxhWBzw41SzkRZ3wZ1QuH47CdeZpWwma0u4NOYothUXnrUDv2WjdKCfp644Pg8kHbguBj1EC SAvGzMRZxRfSEFj1x_Y_Fj9dv5E7Mw8kRyV3rcdMZ9WCX.IBIV3sEodAxsIEbk3kmBHeOk7QNuQk 26_78BOQHiyRr4dtpyYGYST_tmSDFM3bva99sJlr6U3HXFIS5VUeNtKXfk.K0jLkHBL0RWmKhyqo cN3SN1IKy74GrYbEYtWf8GdAodQ84ibEy9C5ljkQdkvfFwxU6agmzOorwNYFJqaSF9dKtjTqD4HZ N01igdO62nMwp.233g9HirvlGmJXfuifiyq1RhEyGCRoKH_vcJx5R_SIj957pGgGNUrlCjtBdo2C 0crQCUXT8BSHW7HQhZAI56n3Bn1pEZ4MzQ15V3xHAWUqaiXpIGJGxLOOv.ge3egsRRJDyZqvf5at om4x6HJbHpszZZ_4IMDxO0H_29NfnLJoLjvvlPwE_KAU16mObY4x47pI7dOVpuOLDsGRxnfFXffs cSe8FkG6OX.az_m2MS1iIs9HRLiRD3qpl27NPVFltTRBRJ8wXUqX__r0UPOHggtd7Y5hX1igMKuB g.80b03PXFCJ3doRAM.gboSJzuXoiq0QI1xPej3.L86wwpQsVKUSeZagsQk07V5JPE9MTiaz.Uq2 RWHDOxIkZrxK12qR3zM.B2JtUynV.Y_UO3Ocjwd3CQZVvJJbop2KF3bEfIJBn4hZp0SkuVYculQ7 iCc87sau9OGQudDpuMjzZObp2AdRuWRK778BBYwnA4JJLQV0FiDZUdPfr6lsQ.XQk4nvSTgrjR7r iyrq.iFr6F54Qw89XNAVySaFzhlIaLpN6o2MywmJbIjpAEAq.cEiiIcDLfVuW8g45Q7snBrHTTyN eC_maazu2mUiRkt7MMaUxhzWyJj_E49S1Ho0lxibRQRN1lgU6zJkmzqKrvxgINQSNAJQ.KWxofJ3 3oswhJH2jH_edN4xEQfLkCwiRV7yaxLgOg5cLxwhdxqbds3d8Ci_zck7n_1LgExz7ExVWAR4g6fS 1XJyB6m88YOgMJgOZuj_hmWByzSBjZAudH_XIpEPh9c0E9hr8a5KAD.9Afmt2raVeDosFzpZ9awW nBr8nuA-- X-Sonic-MF: X-Sonic-ID: 1420d42b-ae60-47a7-afbd-f703ef478e1e Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 00:04:22 +0000 Received: by hermes--production-gq1-54bf57fc64-m67qp (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 65cb0d9bbf1b035d6232f9fd9263501a; Tue, 23 Dec 2025 00:04:16 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. From: Mark Millard In-Reply-To: <202512222336.5BMNa9mH004409@critter.freebsd.dk> Date: Mon, 22 Dec 2025 16:04:06 -0800 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> To: Poul-Henning Kamp X-Mailer: Apple Mail (2.3826.700.81) 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: 4dZwGy4h2sz3Z80 On Dec 22, 2025, at 15:36, Poul-Henning Kamp wrote: -------- Mark Millard writes: >> ) Care to expand some on what "works much better" refers to? >=20 > I'm currently using a USB-C dock with a realtek 8153 and it > it was so flakey it was impossible to use. >=20 > After I switched to the cdce driver, it has worked flawlessly. >=20 > As you can see in the file, I previously had the same experience > also with a Lenovo branded Dock's ethernet. >=20 > I guess it may be necessary to specialize the quirk entry further ? >=20 > My device is: >=20 > ugen0.3: at usbus0, cfg=3D1 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON = (46mA) >=20 > bLength =3D 0x0012=20 > bDescriptorType =3D 0x0001=20 > bcdUSB =3D 0x0320=20 > bDeviceClass =3D 0x0000 > bDeviceSubClass =3D 0x0000=20 > bDeviceProtocol =3D 0x0000=20 > bMaxPacketSize0 =3D 0x0009=20 > idVendor =3D 0x0bda=20 > idProduct =3D 0x8153=20 > bcdDevice =3D 0x31fd=20 > iManufacturer =3D 0x0001 > iProduct =3D 0x0002 > iSerialNumber =3D 0x0007 > bNumConfigurations =3D 0x0002 I got to thinking about it and looked at the Microsoft Dev Kit 2023 that also uses if_ure for its built-in Ethernet and has been working fine: # dmesg -a | grep RTL rgephy0: PHY 0 on miibus0 rgephy1: PHY 0 on miibus1 Only 1 shows up in usbconfig's output and only one external Ethernet port is present. (But ifconfig does list ue0: and ue1: --with carrier only on ue0: . # usbconfig -d ugen0.11 dump_all_desc ugen0.11: = at usbus0, cfg=3D0 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (72mA) bLength =3D 0x0012=20 bDescriptorType =3D 0x0001=20 bcdUSB =3D 0x0300=20 bDeviceClass =3D 0x0000 bDeviceSubClass =3D 0x0000=20 bDeviceProtocol =3D 0x0000=20 bMaxPacketSize0 =3D 0x0009=20 idVendor =3D 0x0bda=20 idProduct =3D 0x8153=20 bcdDevice =3D 0x3110=20 iManufacturer =3D 0x0001 iProduct =3D 0x0002 iSerialNumber =3D 0x0006 <011000001> bNumConfigurations =3D 0x0002=20 . . . As for plugging in one of those dongles somewhere and looking: # usbconfig -d ugen2.2 dump_all_desc ugen2.2: = at usbus2, cfg=3D0 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (72mA) bLength =3D 0x0012=20 bDescriptorType =3D 0x0001=20 bcdUSB =3D 0x0300=20 bDeviceClass =3D 0x0000 bDeviceSubClass =3D 0x0000=20 bDeviceProtocol =3D 0x0000=20 bMaxPacketSize0 =3D 0x0009=20 idVendor =3D 0x0bda=20 idProduct =3D 0x8153=20 bcdDevice =3D 0x3000=20 iManufacturer =3D 0x0001 iProduct =3D 0x0002 iSerialNumber =3D 0x0006 <000001> bNumConfigurations =3D 0x0002=20 . . . =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 02:53:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db02G2jpXz6M9R8 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 4db02G1njzz3wvy 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 4db02G1KllztVN 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db3zf14dKz6MQgx 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 4db3zf00mFz3L8g 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 4db3zd6ccXzyxj 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db5sL2tm5z6MXyR 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 4db5sL05N6z3TBD for ; Tue, 23 Dec 2025 07:16:22 +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 4db5sK686tz123B 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:07:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db70G3stBz6KthY for ; Tue, 23 Dec 2025 08:07:26 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4db70F6xhCz3XQs for ; Tue, 23 Dec 2025 08:07:25 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 9B3B8D7891; Tue, 23 Dec 2025 08:07:23 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 5BN87N5I005750; Tue, 23 Dec 2025 08:07:23 GMT (envelope-from phk) Message-Id: <202512230807.5BN87N5I005750@critter.freebsd.dk> To: Mark Millard cc: dev-commits-src-main Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. In-reply-to: From: "Poul-Henning Kamp" References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <5748.1766477243.1@critter.freebsd.dk> Date: Tue, 23 Dec 2025 08:07:23 +0000 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: 4db70F6xhCz3XQs -------- Mark Millard writes: > > I guess it may be necessary to specialize the quirk entry further ? > > > > My device is: > > > > bcdDevice = 0x31fd > bcdDevice = 0x3110 > bcdDevice = 0x3000 If if_cdce does not work for your devices, we will should make the quirk specific on bsdDevice... -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Tue Dec 23 08:36:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4db7dd5j17z6KxHR for ; Tue, 23 Dec 2025 08:36: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 4db7dd5BZ5z3Z7c for ; Tue, 23 Dec 2025 08:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766478981; h=from:from:reply-to:subject:subject: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=YKXkS/9tE3J9ydMbYOr97fQKFJCbOLsdkPX0Q+hKnJr0OTvK9qPm7cPhCHh9qxHVGvmstK OVDe4YV1/6FoEetTdEarZ4uBr7YTCLzBKltLmdV/1Ei/pGSbfiaN4AdG1PtAwaSWXnHTaw teewCvpqLd4KDm7LkWHztjf2m6YzMNTZ561XwW50fHxX50c0WzZHrftDwO1W7YTjC2HZ4m Up1gKuu4e74cuydro3Sd/bouIjH99QrPqNQ//AxCpre+0VpRfyYRuzCA/IxXGRw53s8/h5 xmap+i2cAguky6W0tn5lvwtt1mjyU9rvr+wb9QlgmllspMOYO9VsevVQ8WXWhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766478981; h=from:from:reply-to:subject:subject: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=m0mgCIyIcD+zrflK7O6O1vvNs5BDw/aIA3kqCHVF/T+lr/e0VL5jiE2pwtLlV/139OTU05 3amTzPE6nBnzOcfCKnX55Trez3qWgYrBVy4jRg2gh8vjlyNWdLK/VzOMRsXzJzMwFGH7+G wPByerfxJHdOVw3Yuz65nglyZgTvyva4IPKJmCQuSWXVFiAf1QZJ9EM6OH4DuvTEHfuWF6 WX9nmlldKMSfFI+h5sPKsuxQZ91mwIB7X5qu4pYYUgzMOA7iZS0vY8IWgc7qPh5Qu34sUJ gmpi7xTZT4PzzlunReJY5Xqdjuh3vqOzxR+Hae3TwpqDyeMlG+tNwWJPXbwO9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766478981; a=rsa-sha256; cv=none; b=SZiZXzz0Pi7jGMhpzVOgJKfOiOetQxCFIfH2lKXp8ext9apbfKDWkkgYFf3qwmb6/Yrw8F ht6VjE7+02ivUyX6JzIAU8gahUhsCjONKCM4VQH714X/yR44f6M5CDo9yzb1gLN/BkXLhz vemCihvMsNh/TlYNVbyZ7l7zTkss+pwwl0eAwZOTXQSfHXFCkLo5bC9dY6t4c63d/h0pVb 4HP6JVznFMU/CARl0xpyFZ7EUr4/TgWdiAkhh9wUpJUi08QwsIRjwLUDEYxBGldjkC/x1A FLlR7DKvnyDmsNXYtEhRXi7M849JrUxagRwwSM0GYSHLjMqCRn+fwLlLkp5cmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4db7dd4ljbz14Lw for ; Tue, 23 Dec 2025 08:36:21 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbBLd4JM6z6L8HJ 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 4dbBLd3WK2z3nV4 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 4dbBLd2b4Yz16tn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbGNl4NbDz6LRFt 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 4dbGNl3ggdz4D69 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 4dbGNl319Bz1Cnq 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:59:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbGnw6tmrz6LSZD 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 4dbGnw4twdz4G4r 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 4dbGnw4LFlz1DJL 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 13:58:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbGp11PVfz6LSfT for ; Tue, 23 Dec 2025 13:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbGp04t6Yz4FqW for ; Tue, 23 Dec 2025 13:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766498344; h=from:from:reply-to:subject:subject: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=fhWCoCnJw4Lerq1W2mjVQfg1CpEsZhZJwnzQ7w4vrn8fBNOzHBr9TLGygB232YK0QRXZF0 vF4lnsweP03BRXVIFMO4oYvIV+8KV/BHHIp+dornvE04ujY+l76C/cfPzlwpNNllmSoRKO DAYWkzRO+YXmcq6eyZDy9eiUKpQMKBVRhRP53sonS+A6nXib5HZ8c6pkFBCYwQJf+gd4/6 lETyfP0zOvuTi6HhS6jl/UdiJSNikVmgPm0OXAUOHQTjxIGPYu8xZE0QtIIT6pb26E+A0m oNGDx7bkYf8YZL7Ln6O/2c9H/frO3c721tkNd2FxZs3ET1Wqh/k+hFlPXgaQmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766498344; h=from:from:reply-to:subject:subject: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=GBbBOBC1vhIGd2SgsZdkmUVb48uwf07fXtEUnlqVnC8sOKpD/tYlFdSYAlEupFwx+ayP20 LYnDxhXVfvH1MgdVX09OLxJdGRXcGgH2HxObV0n9ecLE0ima16SOt1aGaJUZMiwY7yW4jE NDYsKyYoy0Xl3BcERQEEDWMU7x/WYkCfTuXIO++WVfAb1JPSA9PZS0/EAwMCh0V7bsq77y KSQK8fqWOm6FzH+HapYVj4coyNCnykVvcLdnNusZvAlpnjxZSYXcBpUtk7sIhILJxq9BsW s2c3c3MH5F5yuS5PHOyXvI8uqqTD0g55lk6qf4kezOxeFKd/DzGUKzDW7vQd/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766498344; a=rsa-sha256; cv=none; b=fKE5enjJ+sdMeSIU2yChAPYvH3B1mOEcSn6zXi+eoGFDCt1MM7IWA1fqxNRy7Ys1UL4VqT 91Ku/WDQOwTxNq/QzLeBFfwoqu7KoT8GUc2GCYJOlt9zKbVtyzL+IgZqWagosl9kLjy1rJ tBdz7V3LhPpe0h02x3gN/cc2I7ur7Rx54tcYlq0DZpAc1XQsl0SVl7rKzsht9NkBLIYH9M Ud4oLWOCgwkfv+FnS8ojyMnC9EioJNOsrbuhzvt9Wmka00WUyvLe+8tCSp1yVa62K4Pt4i V15Qwv313j2lZvpRgY51qZlhfm/qNvEAxlXt++5ipDFeodIht4mR0CgVwvwqZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbGp03yz3z1CWV for ; Tue, 23 Dec 2025 13:59:04 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 14:40:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbHk81YPGz6LWgf 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 4dbHk80sk1z4Mvv 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 4dbHk770clz1FGy 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbJ7L6g2Tz6LY1D 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 4dbJ7L4T0rz4Ph0 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 4dbJ7L3CNLz1FZy 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 15:11:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbJQK0CWFz6LZSt for ; Tue, 23 Dec 2025 15:12:09 +0000 (UTC) (envelope-from vishwin@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 4dbJQJ6SY4z3BrX; Tue, 23 Dec 2025 15:12:08 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766502728; h=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:autocrypt:autocrypt; bh=UozIeFX82WJRybH6Zb640lSrm1ow25A12V/OnKtlLr0=; b=PmW1es7MSMndYq0yhBSknxW+cfEEH+MUEK9jDCqazEFYkAPQ2t2JLhFY4d3x3Krjg0feGz q3j7UlSsNo6gab76JikkeBpz+VXwUl4dzWKdPFoou2Jz44+FsxnPoh40kv7moJbTk/GBxU lOhUVb+WQgSRRX14ZevIbCwMKV3yf8AtgTDQSFpxfhv/7dwVwxVH4MIcATMRsBC3shWM9b qqpE5A0e3mkzn/E4kGrZRZCeXW+Z9kk9aqyJWaP9EM8F2yOzDQ24omJXGZIeYHotb6PJsD K6TqID+TTEAgf0wKl1IEVbLHOfj3AqpDmTmZySqzbEqezj6lt53HWEHlBE2Idg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766502728; h=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:autocrypt:autocrypt; bh=UozIeFX82WJRybH6Zb640lSrm1ow25A12V/OnKtlLr0=; b=ZlV63UlcUwUzLeqogtvScBt0rGjr1EYFJRp4sgw/jk6pWaw6KMyDsXN7D5/rzoor69V/LC fE9/mVGs/slTPoh6RRtPfhr8/ON1kRLAyiLSemLzQTNfYe5WvhjzIb0JIoMOm+UwxPphJg gQHZyXfLczW4mQEhaPrdiLz7Rawva8Xgs1f4xOpUDjmsPz+iAgQT8uWXXXk8QSYAolvlvi 68fEZ05XvDHEjPruKwHC11UMHnoW6YS6QDcuHwunFBteEBDZ7iS3MPORctA3l9QEJ56YAG WlT8+vyMxN0W1EUs0/v2SfYDYJha86gI5QrAT9/fpUC3eG3tSg9ZX1CLrmREUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766502728; a=rsa-sha256; cv=none; b=Ij60/HIdmGnGtIxQAN1mSwrzD7Bk6ONSDdwye0JLAsicuQPi6Z/7Wliskxvj07lHaZTQWu gfRyXUIexO+wPCjJk55pxODaHULvjLXUS5u+Ju5BSXHpx8B/l9nLnn23pey0jAW4LPdNVz KYrVXGh0wEIMDf7fVrrFWkxx51QLACio2vzQWSuWUyhqFsv52xcTTfd6rXFaIBfH5VBg1Z gOpm1mhiGbKL0kgtvNR+5iWDnsbFYTpzT7DRQbAwz/EG9kzq0DcNLUqTm7kgCEPAtCO7V5 7Wu0ujlmcPNeOiZtky7Hy1AjFNUikjxMPVXwP30lpxPT5Vwrv4gaQRsQ2frY9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:98a:d00:c180:56ee:75ff:fe50:69b5] (unknown [IPv6:2601:98a:d00:c180:56ee:75ff:fe50:69b5]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dbJQJ4lJKzPQh; Tue, 23 Dec 2025 15:12:08 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <49bd4659-ff18-43eb-8400-9bde76cb5236@freebsd.org> Date: Tue, 23 Dec 2025 10:11:41 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. To: Mark Millard , Poul-Henning Kamp Cc: dev-commits-src-main References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> Content-Language: en-GB From: Charlie Li Autocrypt: addr=vishwin@freebsd.org; keydata= xjMEaEicoBYJKwYBBAHaRw8BAQdAZBuydpjFLGem4uRJPWaYMXX2e+BN1jDhbD3tcqbxhdfN MkNoYXJsaWUgTGkgKEZyZWVCU0QgUHJvamVjdCkgPHZpc2h3aW5ARnJlZUJTRC5vcmc+wpkE ExYKAEEWIQTHxcCLnAXo3rFg6k7P+1cn7slqBAUCaEicoAIbAwUJCWYBgAULCQgHAgIiAgYV CgkICwIEFgIDAQIeBwIXgAAKCRDP+1cn7slqBM/bAP9bhA4e0LxJYFYJlftZM5WHrMSPpUe6 G2pVqmQWTQ0EZQEA0PNryfH3qRWWPSI8mFNRnG24hi5/aXFqCnHj1tcJ9Q/OOARoSJygEgor BgEEAZdVAQUBAQdAUT4TzYFmV6ueIGwjX0N+445KZV6ns1Wiw67QMsJZxHkDAQgHwn4EGBYK ACYWIQTHxcCLnAXo3rFg6k7P+1cn7slqBAUCaEicoAIbDAUJCWYBgAAKCRDP+1cn7slqBPO/ AQCPuGiyyfJClICRs/ToG0MsT8YcPdBygzuUIIeGpkjJpgEA7AoFCQ0Y28Y3hIDFn2k9PH3B nGWL3g05W0ds2qoj+gQ= Organization: FreeBSD Project In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------U0rQ4FW4zcnzZ2HZ0WQXks4l" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------U0rQ4FW4zcnzZ2HZ0WQXks4l Content-Type: multipart/mixed; boundary="------------vj3lqnkInVomzrVl0pIou5sG"; protected-headers="v1" Message-ID: <49bd4659-ff18-43eb-8400-9bde76cb5236@freebsd.org> Date: Tue, 23 Dec 2025 10:11:41 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. To: Mark Millard , Poul-Henning Kamp Cc: dev-commits-src-main References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> Content-Language: en-GB From: Charlie Li Autocrypt: addr=vishwin@freebsd.org; keydata= xjMEaEicoBYJKwYBBAHaRw8BAQdAZBuydpjFLGem4uRJPWaYMXX2e+BN1jDhbD3tcqbxhdfN MkNoYXJsaWUgTGkgKEZyZWVCU0QgUHJvamVjdCkgPHZpc2h3aW5ARnJlZUJTRC5vcmc+wpkE ExYKAEEWIQTHxcCLnAXo3rFg6k7P+1cn7slqBAUCaEicoAIbAwUJCWYBgAULCQgHAgIiAgYV CgkICwIEFgIDAQIeBwIXgAAKCRDP+1cn7slqBM/bAP9bhA4e0LxJYFYJlftZM5WHrMSPpUe6 G2pVqmQWTQ0EZQEA0PNryfH3qRWWPSI8mFNRnG24hi5/aXFqCnHj1tcJ9Q/OOARoSJygEgor BgEEAZdVAQUBAQdAUT4TzYFmV6ueIGwjX0N+445KZV6ns1Wiw67QMsJZxHkDAQgHwn4EGBYK ACYWIQTHxcCLnAXo3rFg6k7P+1cn7slqBAUCaEicoAIbDAUJCWYBgAAKCRDP+1cn7slqBPO/ AQCPuGiyyfJClICRs/ToG0MsT8YcPdBygzuUIIeGpkjJpgEA7AoFCQ0Y28Y3hIDFn2k9PH3B nGWL3g05W0ds2qoj+gQ= Organization: FreeBSD Project In-Reply-To: --------------vj3lqnkInVomzrVl0pIou5sG Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 TWFyayBNaWxsYXJkIHdyb3RlOg0KPiBPbiBEZWMgMjIsIDIwMjUsIGF0IDE1OjM2LCBQb3Vs LUhlbm5pbmcgS2FtcCA8cGhrQHBoay5mcmVlYnNkLmRrPiB3cm90ZToNCj4gDQo+IC0tLS0t LS0tDQo+IE1hcmsgTWlsbGFyZCB3cml0ZXM6DQo+IA0KPiANCj4+PiApIENhcmUgdG8gZXhw YW5kIHNvbWUgb24gd2hhdCAid29ya3MgbXVjaCBiZXR0ZXIiIHJlZmVycyB0bz8NCj4+DQo+ PiBJJ20gY3VycmVudGx5IHVzaW5nIGEgVVNCLUMgZG9jayB3aXRoIGEgcmVhbHRlayA4MTUz IGFuZCBpdA0KPj4gaXQgd2FzIHNvIGZsYWtleSBpdCB3YXMgaW1wb3NzaWJsZSB0byB1c2Uu DQo+Pg0KPj4gQWZ0ZXIgSSBzd2l0Y2hlZCB0byB0aGUgY2RjZSBkcml2ZXIsIGl0IGhhcyB3 b3JrZWQgZmxhd2xlc3NseS4NCj4+DQo+PiBBcyB5b3UgY2FuIHNlZSBpbiB0aGUgZmlsZSwg SSBwcmV2aW91c2x5IGhhZCB0aGUgc2FtZSBleHBlcmllbmNlDQo+PiBhbHNvIHdpdGggYSBM ZW5vdm8gYnJhbmRlZCBEb2NrJ3MgZXRoZXJuZXQuDQo+Pg0KPj4gSSBndWVzcyBpdCBtYXkg YmUgbmVjZXNzYXJ5IHRvIHNwZWNpYWxpemUgdGhlIHF1aXJrIGVudHJ5IGZ1cnRoZXIgPw0K Pj4NClRoaXMgd291bGQgYmUgYSBnb29kIGlkZWEuIEFmdGVyIGlmX2NkY2Ugc3RhcnRlZCBj bGFpbWluZyBteSBvd24gDQpkb25nbGUvVVNCIGh1YiwgSVB2NiB2aWEgU0xBQUMgKGllIHJ0 c29sKSBzdG9wcGVkIHdvcmtpbmcuDQo+PiBNeSBkZXZpY2UgaXM6DQo+Pg0KPj4gdWdlbjAu MzogPFJUTDgxNTMgR2lnYWJpdCBFdGhlcm5ldCBBZGFwdGVyIFJlYWx0ZWsgU2VtaWNvbmR1 Y3RvciBDb3JwLj4gYXQgdXNidXMwLCBjZmc9MSBtZD1IT1NUIHNwZD1TVVBFUiAoNS4wR2Jw cykgcHdyPU9OICg0Nm1BKQ0KPj4NCj4+ICAgYkxlbmd0aCA9IDB4MDAxMg0KPj4gICBiRGVz Y3JpcHRvclR5cGUgPSAweDAwMDENCj4+ICAgYmNkVVNCID0gMHgwMzIwDQo+PiAgIGJEZXZp Y2VDbGFzcyA9IDB4MDAwMCAgPFByb2JlZCBieSBpbnRlcmZhY2UgY2xhc3M+DQo+PiAgIGJE ZXZpY2VTdWJDbGFzcyA9IDB4MDAwMA0KPj4gICBiRGV2aWNlUHJvdG9jb2wgPSAweDAwMDAN Cj4+ICAgYk1heFBhY2tldFNpemUwID0gMHgwMDA5DQo+PiAgIGlkVmVuZG9yID0gMHgwYmRh DQo+PiAgIGlkUHJvZHVjdCA9IDB4ODE1Mw0KPj4gICBiY2REZXZpY2UgPSAweDMxZmQNCj4+ ICAgaU1hbnVmYWN0dXJlciA9IDB4MDAwMSAgPFJlYWx0ZWs+DQo+PiAgIGlQcm9kdWN0ID0g MHgwMDAyICA8VVNCIDEwLzEwMC8xMDAwIExBTj4NCj4+ICAgaVNlcmlhbE51bWJlciA9IDB4 MDAwNyAgPERGMTMwMEUwNEM1ODFBOTA+DQo+PiAgIGJOdW1Db25maWd1cmF0aW9ucyA9IDB4 MDAwMg0KPiANCj4gW3NuaXBdDQo+IA0KPiAjIHVzYmNvbmZpZyAtZCB1Z2VuMi4yIGR1bXBf YWxsX2Rlc2MNCj4gdWdlbjIuMjogPFJUTDgxNTMgR2lnYWJpdCBFdGhlcm5ldCBBZGFwdGVy IFJlYWx0ZWsgU2VtaWNvbmR1Y3RvciBDb3JwLj4gYXQgdXNidXMyLCBjZmc9MCBtZD1IT1NU IHNwZD1TVVBFUiAoNS4wR2JwcykgcHdyPU9OICg3Mm1BKQ0KPiANCj4gICAgYkxlbmd0aCA9 IDB4MDAxMg0KPiAgICBiRGVzY3JpcHRvclR5cGUgPSAweDAwMDENCj4gICAgYmNkVVNCID0g MHgwMzAwDQo+ICAgIGJEZXZpY2VDbGFzcyA9IDB4MDAwMCAgPFByb2JlZCBieSBpbnRlcmZh Y2UgY2xhc3M+DQo+ICAgIGJEZXZpY2VTdWJDbGFzcyA9IDB4MDAwMA0KPiAgICBiRGV2aWNl UHJvdG9jb2wgPSAweDAwMDANCj4gICAgYk1heFBhY2tldFNpemUwID0gMHgwMDA5DQo+ICAg IGlkVmVuZG9yID0gMHgwYmRhDQo+ICAgIGlkUHJvZHVjdCA9IDB4ODE1Mw0KPiAgICBiY2RE ZXZpY2UgPSAweDMwMDANCj4gICAgaU1hbnVmYWN0dXJlciA9IDB4MDAwMSAgPFJlYWx0ZWs+ DQo+ICAgIGlQcm9kdWN0ID0gMHgwMDAyICA8VVNCIDEwLzEwMC8xMDAwIExBTj4NCj4gICAg aVNlcmlhbE51bWJlciA9IDB4MDAwNiAgPDAwMDAwMT4NCj4gICAgYk51bUNvbmZpZ3VyYXRp b25zID0gMHgwMDAyDQo+IC4gLiAuDQo+IEkgaGF2ZSBvbmUgb2YgdGhlc2UuDQoNCi0tIA0K Q2hhcmxpZSBMaQ0KLi4ubm9wZSwgc3RpbGwgZG9uJ3QgaGF2ZSBhbiBleGl0IGxpbmUuDQoN Cg== --------------vj3lqnkInVomzrVl0pIou5sG-- --------------U0rQ4FW4zcnzZ2HZ0WQXks4l Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTHxcCLnAXo3rFg6k7P+1cn7slqBAUCaUqxLQUDAAAAAAAKCRDP+1cn7slqBLXt AP49wQlJTtmcN/Hd5lox3LF1W/jPKRq0Czt4lmKYmj/0JwEAyk/86KAJDY+DSUckCNHrLOP0FrqX xmPmILtg8Oe/NgA= =bEUt -----END PGP SIGNATURE----- --------------U0rQ4FW4zcnzZ2HZ0WQXks4l-- From nobody Tue Dec 23 16:16:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbKsJ13DMz6Lgyb for ; Tue, 23 Dec 2025 16:17:08 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-54.consmr.mail.gq1.yahoo.com (sonic316-54.consmr.mail.gq1.yahoo.com [98.137.69.30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbKsH2k7vz3Mb6 for ; Tue, 23 Dec 2025 16:17:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766506623; bh=FwtvpgNaHgmgoVCArXmSRY5E9nrZ1Xq1QChipPnUd2w=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=A3If1QUsQMT5UZyz41pF/WWwbeCKeSL0/tikpWPTiwIYqsZvVANnAtNoLl3l4FH5Y7rhnVArxNDHPcyYqAv/DOQyfKjytcAKSDAROX0O91AwUX+ilbmtznynSQSkRp0nDSWzNi9HhojoFjkQCjcbSt6idEjYdCboSwrkSq4LqYu/rGsfFOQD4kAVEZfwy10Xv5nDd2C8JvrfCC0miGvfDruW9FeKLrAE1MpzfZkG3ERR5U72W8G37qr4xXYAKKIdks1QFTNEF3HhZ6IDiGBQ9clqg3m80bsTTmEGa6Q5qomM3RmbQzEl+43QvanEqBKWZDDK8lCTWFGH9UHc4hPF0A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766506623; bh=FkodFUBg18ar88Pm/tptSSlh+gHWNVUp8W6cOfO4Jxt=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=YsY+RPLQRYKCMV9TrQB1cBhxnp+Z/ioTwIFnoVH6cSo1vhGHtxkpILEz6FC9pXVJn6kDOqavg8XRNL/e+L2m0i0kBn/SOdRuJMf1IVfAmzNlNw0eCZ7XxgKbX+Y5rNAZzr+8S6kzsEeYfpb4vB/NGx5GH/twrSJ04F5ArPnXC4vnvCKK4iuQcuUiHRc+HxoM6ukaBxOnWtsuA4g4453iBLefzphXu+UNC4rxxUYjtRG5Mdg9t489Ry73YF/BFlAph5GT6laYmWvKjRzRYOrTZNi89cdUp/fh7x2jwBtL1DunSIE7B39OK0Sp3BpyxHWfQr8GP5MiAIp0Tm3c/9hDaA== X-YMail-OSG: xlSRtbAVM1nrUbFXmPgraiphPPbDkcBz4zcUmutrL_xPJHEZBZHQ8jbsR3NISMD bd9lycXwCCbiQo7Gja5leEKWHwvdE2KbDJhtm0cjxU5Q5irj0G4JsmFDmiI7KoERe.M9z982q9Kc xLyiIJYOLkT8oEa7tx2w9usjVBHQCsgr_cO.fPL3KosUkY7oW2Z50lJGYnZYLFwhsh2qym4ZjafO aPBJOc8aEQDLAVuhZjI7R1_14OzX4qmdiLZ4BIZ9gvNaLnYOKddg3bL8dQyrq_KQwNlvPYwicXQX ePjqByZ_w7J6qiMjyC6Z3Rn9gp0AkL8NtT8EmrJwz.w8YGGMBgheGocGOK2kCt67CewPnoOum9xW emx_xtUgEH1MAIQg_xTR7WmHy0I9w2iJnpScWSAxKVAMU1DmgzTlsAj5k4IjEv54HCaIombql1ME PoHlLtkbeXre0T6OTbcrf5_hcuDd9C5iPq9X6e5OmeiRlZNOCAW4xJtK.s5LzKEqnNZUxZ_zZS3p o9FYt_QqrWt_4TR7DUkRNxm0xy9yIbIhfTmH6r5zvkyZieoLabVE71eA0y.FitjbmLIT5iGCZfcg gTdhcaV96tVfQDz9PektUYRRQ5EXVLCyOi.aatjQYxlJwsBGiaJQK9oHs3G5f0DxcAtLNd33AjYm LCZTrBUupAd3zH9X3qjWeqxMhJFduNZTKyUr1yICOMAoSluhV0j6F1SBXGuORHQjP.KSE8Dk8xcw T2kdabJsZg9CR5BcyfXtZF9.Fbz3SPa6CW0xPPdCPr1TItyO9kLC_j6JSZaUpAboBptBAw9Q0wS9 mZy1E9uhBbWv1PiIcccEeTQR3nK.jq_EsgUEjjRiF_46UpusUizWAJ7LSRp4E9xjSXuT1sG.sIcJ fA3Xx53DHSwhWOchx_darRgN_pcZ0i6DEUVYRXGq5E2An0Jc9Q_HJDSVmLlVyGPjuxcSrvYoFXAy 63cvVK__9QZuhwz417FImSOX.fjElZ406jRaoleFLotV0OReccMy4GrEj9DxWNMv7OX1nUj739mE j5KqKFXmQEnrpONDu956KgVInC6HXMlfV5ScMLMedxCrU7W.1NO564MuhwN8dTRg3lj_SWjWT3L9 8cA0pwVGKG3fPnfG_t6WGo.QHPYZHDRZlEfvAh1QrxNceX76Z2j7ltzK3VNXkgi2sHdJD41_DWHq yIrmhV_Z8O62KOwmT.EJHO9R9f5Cp6KfvGE_RlEQ7b8gqmLX4xdoens1H3iIwMxKbbLiszslMDTP 2IsJBq6eOlQznsOaGoSQyqSsylPLpuX44CQhRKm5iLjqpWaSX83EYl1l.w8iSZ0uNV8whclXfheQ WwjUIDCO_yU8xLKaRU5ASo_Sr7e3ljNQ5kzuESLc8B7jN_I9EnSmDqCTs72.E9VV94Wrmb0RbjUp yW1gYPFoBEsh3dBtUGNDgqaAQUQ5aCGwIGWSgJ72r3jplzzPhag_0Rnwsbiz22dlElYSHT6o8NC3 sqOZIWyQVYW53pLqNT3SJRmt7NJ1_w0dyZzGIV01WFqogCgo.E0.3iZosqWR7tX5oCWT3fMYuvaO Zs2h.POnUK9Q1zmdxkNTgMojkp8h6cNmJCagp27_Yc1US_.NIJlQEuOSUb7zNTNGV1mgH793n.fV 5QSfpnsXNyvKzDJUtemtuIdfFgVyd8Kn6iK.lSzGnq9f8t2pLhYqi8Qd4vteMNC8FKawn4gbvN6Q cFg2KJ.zPx1AWrGFaX1USFa4DqP9U1wWfNcTSEcHd.DD.VJHqQUUMYOzEF1DPxHl_TcVI6mWouIk Slwepr4IJStUUBgD9wyABJmLEw7huQdY4LxYHulVzHPpGyO14euz1_1VgA1vbAGG_qipfJw08eUe ICHx9NEPLCRLZIY2wwxnjrGGw7OYG08bcrQOMY4BI8MqzgWbXnFlclc.Bq7X.CwuU3_Hvlnld4Kh 5sPLqWLJXzFtNOu1e19bThqiCXppzEYFUsDYM61RweWD1lMLhTx9g_bwNQ_AiMmZcLC4ZoREEEq4 35U9nMilD7zD3kemk__pz128zMTKFiNCrWTsh5uBmGtZJz7l.W_2uWwNQoDckzFthVy_qQ4e3.Py VPdNRVmvLAVR2yDnB6mjPiOjGCmw6PuQGxkHQpjfMtNDyEBLcbVnTOFK7fZWJlCDc.E9Ih4m3OXq 8.hnR8tOB1hfHYirMWx3taaCeG1ARJPLgkuMaQT67t_bkT8dlSFb9O4kimxbY.i.DPR2FDXb2Xxd e9mfSONh0OTw3qx_jNZpE1_Y4Ex5HttUAEPG5GN1Wf1dOaDtnPf.5dpjWWB8OJBcNDNG.frTI2ay q X-Sonic-MF: X-Sonic-ID: ac9f8dff-d614-4c18-a5bb-b27b5acee2d9 Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 16:17:03 +0000 Received: by hermes--production-gq1-54bf57fc64-v95fx (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 39f2470a87d6614525ed7971e76a2026; Tue, 23 Dec 2025 16:17:00 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. From: Mark Millard In-Reply-To: <202512230807.5BN87N5I005750@critter.freebsd.dk> Date: Tue, 23 Dec 2025 08:16:49 -0800 Cc: dev-commits-src-main Content-Transfer-Encoding: 7bit Message-Id: <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> To: Poul-Henning Kamp X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dbKsH2k7vz3Mb6 On Dec 23, 2025, at 00:07, Poul-Henning Kamp wrote: > -------- > Mark Millard writes: > >>> I guess it may be necessary to specialize the quirk entry further ? >>> >>> My device is: >>> > >>> bcdDevice = 0x31fd > >> bcdDevice = 0x3110 > >> bcdDevice = 0x3000 > > > If if_cdce does not work for your devices, we will should make the > quirk specific on bsdDevice... I'll note that there is already a report of: "After if_cdce started claiming my own dongle/USB hub, IPv6 via SLAAC (ie rtsol) stopped working." by Charlie Li. So far it appears that your contexts are the most odd at this time. But, relative to your request, for my simple usage, . . . This means that I'll have to set up and do before vs. after-upgrading-FreeBSD-OS testing for comparison/contrast. (My contexts are currently official pkgbase distribution based, not source based.) I'm not sure of the schedule for this. === Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 16:29:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbL7m4d01z6LhZb for ; Tue, 23 Dec 2025 16:29:40 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbL7m2Jzvz3Pcj for ; Tue, 23 Dec 2025 16:29:40 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 4F904D7891; Tue, 23 Dec 2025 16:29:38 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 5BNGTbdU011559; Tue, 23 Dec 2025 16:29:37 GMT (envelope-from phk) Message-Id: <202512231629.5BNGTbdU011559@critter.freebsd.dk> To: Mark Millard cc: dev-commits-src-main Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. In-reply-to: <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> From: "Poul-Henning Kamp" References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <11557.1766507377.1@critter.freebsd.dk> Date: Tue, 23 Dec 2025 16:29:37 +0000 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dbL7m2Jzvz3Pcj -------- Mark Millard writes: > This means that I'll have to set up and do before vs. > after-upgrading-FreeBSD-OS testing for > comparison/contrast. You should be able to do it at runtime with usbconfig -d X.Y set_config [0|1] -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Tue Dec 23 17:04:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbLw10928z6LktY 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 4dbLw06fD4z3TQj 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 4dbLw065fyz1KLv 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:11:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbM4c3Kv9z6LlQB for ; Tue, 23 Dec 2025 17:12:00 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbM4c0rLFz3V55 for ; Tue, 23 Dec 2025 17:11:59 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 6C63DD7891; Tue, 23 Dec 2025 17:11:58 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 5BNHBw4p002415; Tue, 23 Dec 2025 17:11:58 GMT (envelope-from phk) Message-Id: <202512231711.5BNHBw4p002415@critter.freebsd.dk> To: Mark Millard cc: dev-commits-src-main Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. In-reply-to: <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> From: "Poul-Henning Kamp" References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <2413.1766509917.1@critter.freebsd.dk> Content-Transfer-Encoding: quoted-printable Date: Tue, 23 Dec 2025 17:11:58 +0000 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: 4dbM4c0rLFz3V55 -------- Mark Millard writes: > > If if_cdce does not work for your devices, we will should make the > > quirk specific on bsdDevice... I have specialized the quirk entry to the specific 0x31fd version in my ga= dget. Searching for the obvious words reveal a major world of confusion as to what works for which version of the 8153 and what does not. In my case, the if_ure driver fails to even get the link up reliabily, switching between link-up and link-down every few seconds. The if_cdce driver at least works, even if performance sucks (185Mbit/s tx, 89Mbit/s rx) -- = Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe = Never attribute to malice what can adequately be explained by incompetence= . From nobody Tue Dec 23 17:31:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbMWV3cJVz6LmsS for ; Tue, 23 Dec 2025 17:31:50 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic301-22.consmr.mail.gq1.yahoo.com (sonic301-22.consmr.mail.gq1.yahoo.com [98.137.64.148]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbMWT4SjWz3WTS for ; Tue, 23 Dec 2025 17:31:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766511106; bh=wBhAnQ/FX5vaoXXAnXD0z9jWI70GAL9yeSXU2xTglkM=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=JK0CVpZDt6dDJlkV/a3QnKaAYRxcL1RYC1sWc1B6yq4RjpwlvPGuY/TWJqNPHrnRhyvXlRYujCGeO0nEcnP+i2KOAjdrO48D6tOaoryYdlDsRl0Os4DPdwYmGwlNRqzywURJ5KTV4VJgBXNgXS1XE3W29P22saAA/ZkGMT47TX+pMmTHJvjLe8hpSTjDmViViDnyVFJEF/K3D3/uk3v41fICI79J/UHQVLdDhY/b3vjvV91tofaKMBVc6CEQQCcULB0n/ZT9Z0x7uNVS/8xi1AgmfB3Hbl6v+EFShtAmaxJOspVh6iXeTLMPtRyFGw50FreRg2K+FIP/Z9eTs8ORxw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766511106; bh=2Qjz96qWpirhyQu6W8bWiX4FGcdUmFvVrIFy/kTRgIg=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=fkddIHf1NKjXnIWCD9fcfab9tE0+mihLMnOypjwsp++XGmjPhxNpoNercHIDFefIl+BRGiVmzs5xwzyMpvznDxIuwv8+iecHWBJDg6kVM53hs5QO5Zw5V1CAKwAD1E0hYgimmq5dtHoZMQRQqVsf9IjxiRcPYQveh/gPfW06NNNzyXnJWcF2/6pXMTM2qPzlZzEXoKONnXFPUc352PdttZIHVxnmEhY8BhuVyxd1SbCyYzr1zvcfvY2V1CoWihSW4zD6UMUB3n/TfyE76PIHJ7Hk0/JdCn61nUrohabZTa4z8blvJtNm4wcbMklsfRcmRF+VccVrtaGkigNfyRogdA== X-YMail-OSG: kTrW8kEVM1km6n0PDsPbDFc9WwlqZ2_HG87Rbrjo24u.ZcTSzViJpQI7jmkJRg. RLIsacItUT697Q9pBgDd_DdqlVjGI1PjRjBx8bsvh52_TRGhO8oCNRV6JPYYi_lmFzINEKU1aFSA sxBa2f45wRXZ.6PFMgWWoEzyINGQq4iDDmy8A5wfGY5lvEkr3lC6j97h9ApwtuPJrTdoIw.88XEC 7_hGmjUiww.DqqQ.ODgh9pFr.qbAIZWk4bOMqjZk_Sh8uPI6rLJCSGNjoCJkL5pzttV6L3oRuvoC 6MsGwPo6fO02f02lFI4Lig.wN9SezybjoGuo_sJ6pDUyxy.IG6H4ZS.5lsALHnKMBnVjWYt3aLQp HzTZqCDDQVGLtg4uTCf3Naz5wLU83S5eubbdWr4qzQZgMEANgHH0oVXgriNM7PGEFGc5RggH_z76 CAEe5uEQFPpWLYX5i7KS090yUTe1yBzNJuLH5cmkoDDVxL5WhPWIbDSd96pYC92LiOvp8uK2a20j Y4u8Gwu3OYzDa_PPvSI47VAwEsFjXuMe6bMjly7DZcqZ4Xu5si2GCGpdM07QOKSOiQ6YO3Vg_zTn 5IsfdGMM4BAGVhw3OcJRI7mL8svb1HCyGgzVRnApQP3xS_Pcbo27zP1NfFBA6L2o609Hr8Rfk5Iw UelifnpH7cZOA9tJ.AlCZBKXwYswxZ2FKa887OdHGAi85s6Vw3_GwCZ2rVj12vMM0FtXngwKnZh8 3cZ87ruZtJ7AYJyPt8x7KimxDbWZMwZ5NhXeIZIv1Q.8PztWGbfZmGr9Z6qPBCafTYzZLJEqbvPk xsXrEy_xvya.M3bVSkF8eUxR4lRn9Gp80lknMpHu5tC1E3iWWccwxOH42ym9isKwSjTRvSpN7aBR rsLbja2mR_HMhmwpx4JsJ.oFEWEsf7fsjCjhZ7lBs9vxWv4GwxKAEPdMzdKLWDtMzFnN_Xh5TILd VZwa3vldwVoTNk.h0ReD3NPMMPPZAnYtVDZ7LDzGbiYDWJGkA8ZIaPPjdoh1Ffaew4YJY8dXV0k3 PsvfDhHsIDhRRS_sl1qoRTddP.Mu1_rPE3aBzsDrMJgV5JoqLPmAaAYBs_3aRcK9Htm2QKpx7ZPj HpQWa90.ezxY0dCBOGv8hGLeWTupuywQxeWWvo3ggHtC4ThYgy91unZGga.mhRuLSkJqkhYZHiUz g8.MTVzx1lTupErIAyTp3qZwD0aiVsQiMojH6HKTzZlJ9cfdtANzIGgy2J5wxJXUFcTiTikVAs99 mm8SlZ4OImxJPyITsJCj.hXwRRVLp47KCLApJPqsOUnDGAexbGIrNyzgE2D4wSGjuH1Tx8EAIkZL E2D4fPubDvm9zADFt4Ubm0syWhaOl_Q_CNI546WsJozq1G2C1ryJW3XEHrrXK3gyvZJsPQ0P5PGO CPt2sJkKwJXk8w6yzEaCbknBz3pI1n9F4HhfsTQR3NJeumubRHhBQntHi1C257Er1CWbkxGCsE8K F.VjJ0Wc_QVwn4RQAHyraUNU28HmRnsGFyX.8CMG_AfdLrL2cBZEgXpSUkoysLOoC1wVsyliPGEa y7kfzdwlbUZTIblF2K6uAHnyHNDN8E4F8GKfLK7CkKLhfvAZUsWSBoFerBXgDeuYj4jerHHyCans jgSGwd4jcbUlwWGhmxPWmbjUaiFbx_YlY7VtzSW1nMy5i1L.CAeczctAjUlyBaLLEF6KqeKxUK3u dN7lXyYcwyR3nuLoaQmaIyI0fKf8gR6beb5bYr2mGkWG6j_tN8In6NtWyIVnn7c_ws3DLSGhsQIq VxWz5yTMR1XUFWw9LPEmfClky7n9ih3e6z1LZpT4Eg9AxDHLT2y4SkPuUcNabTmIRANUbwQCWG5S VFRlQXaGX6s48m3LKYIGEXzRAKI08kk7DsfC4cOblxQvfKy1s2Ng_MRQXvbesIdeRMfgwr_APz25 3.XQ3q5yRV_uH5RUXjhDUSxHNjEOhREYeCkqlAgHWA0y0P.Ikbm0e2Y4IszQgpZOuSmzZAXHd.4g SEZnL4VBFL6XXP2saiRnbuekTiMDzICR.cOTP0B6CYQayefBM3Nsmh9CL4clHWn2KD8FXm1It.aE ycaj90nsClzXc7xdj8XPpaN5JZXnkL4HcKwnwmuAencjxfAw85vJmVQ7JTMB.LW_cDJDU26.FZkd yqrTDuDl1lKL1SGdGRgJVyvMlpXjsvyagzm97OFDE3Bw.s4F4xYbf1mkpITr1ZQiyyNEuQeGCbL9 dh1LH9Xz6eGpUrmW68utW22QQlLvQWGiZ8PMPSHn6uNwl2QYfB30scHhX1tRXRZTEC2t0x7HUb8M 41w-- X-Sonic-MF: X-Sonic-ID: e4cc5fe7-45d9-4852-b23a-115a86946003 Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 17:31:46 +0000 Received: by hermes--production-gq1-54bf57fc64-hm72l (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID ff6cb450224581aa1dc00b3d3768a1e9; Tue, 23 Dec 2025 17:31:44 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. From: Mark Millard In-Reply-To: <202512231629.5BNGTbdU011559@critter.freebsd.dk> Date: Tue, 23 Dec 2025 09:31:33 -0800 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> <202512231629.5BNGTbdU011559@critter.freebsd.dk> To: Poul-Henning Kamp X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dbMWT4SjWz3WTS On Dec 23, 2025, at 08:29, Poul-Henning Kamp wrote: > -------- > Mark Millard writes: >=20 >=20 >> This means that I'll have to set up and do before vs. >> after-upgrading-FreeBSD-OS testing for >> comparison/contrast. >=20 > You should be able to do it at runtime with=20 >=20 > usbconfig -d X.Y set_config [0|1] Cool. I rarely do these sorts of activities and have to refigure out the details each time. . . . However, the result of: # usbconfig -d ugen0.11 set_config on the Windows Dev Kit 2023 was: Fatal data abort . . . panic: vm_fault failed. So all I have so far for testing is the prior cfg=3D0 test . . . The FreeBSD OS here is pkgbase main with the GENERIC-NODEBUG kernel on each machine. For the below the "iperf3 -s" was done on a amd64 7950X3D system using its build-in: # pciconf -l rge0 rge0@pci0:8:0:0: class=3D0x020000 rev=3D0x05 hdr=3D0x00 = vendor=3D0x10ec device=3D0x8125 subvendor=3D0x1043 subdevice=3D0x87d7 Windows Dev Kit 2023 (so: aarch64) . . . # usbconfig -l -d ugen0.11 ugen0.11: = at usbus0, cfg=3D0 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (72mA) # iperf3 -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 [ 5] local 192.168.1.143 port 50986 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.00 sec 113 MBytes 945 Mbits/sec 0 488 KBytes = =20 [ 5] 1.00-2.00 sec 112 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 2.00-3.00 sec 112 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 3.00-4.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 4.00-5.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 5.00-6.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 6.00-7.00 sec 112 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 7.00-8.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 8.00-9.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 9.00-10.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver Server output: Accepted connection from 192.168.1.143, port 61091 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 50986 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.06 sec 119 MBytes 936 Mbits/sec =20 [ 5] 1.06-2.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 2.06-3.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 3.06-4.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 4.06-5.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 5.06-6.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 6.06-7.05 sec 112 MBytes 941 Mbits/sec =20 [ 5] 7.05-8.06 sec 113 MBytes 942 Mbits/sec =20 [ 5] 8.06-9.03 sec 109 MBytes 941 Mbits/sec =20 [ 5] 9.03-10.01 sec 110 MBytes 942 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver iperf Done. # iperf3 -R -c 192.168.1.195 --get-server-output you have mail Connecting to host 192.168.1.195, port 5201 Reverse mode, remote host 192.168.1.195 is sending [ 5] local 192.168.1.143 port 17266 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.06 sec 118 MBytes 941 Mbits/sec =20 [ 5] 1.06-2.04 sec 110 MBytes 942 Mbits/sec =20 [ 5] 2.04-3.06 sec 115 MBytes 941 Mbits/sec =20 [ 5] 3.06-4.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 4.06-5.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 5.06-6.02 sec 108 MBytes 941 Mbits/sec =20 [ 5] 6.02-7.00 sec 110 MBytes 942 Mbits/sec =20 [ 5] 7.00-8.06 sec 119 MBytes 941 Mbits/sec =20 [ 5] 8.06-9.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender [ 5] 0.00-10.00 sec 1.10 GBytes 941 Mbits/sec = receiver Server output: ----------------------------------------------------------- Server listening on 5201 (test #2) ----------------------------------------------------------- Accepted connection from 192.168.1.143, port 64359 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 17266 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.06 sec 120 MBytes 947 Mbits/sec 0 730 KBytes = =20 [ 5] 1.06-2.06 sec 112 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 2.06-3.06 sec 112 MBytes 942 Mbits/sec 0 730 KBytes = =20 [ 5] 3.06-4.05 sec 112 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 4.05-5.06 sec 113 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 5.06-6.06 sec 112 MBytes 942 Mbits/sec 0 730 KBytes = =20 [ 5] 6.06-7.03 sec 108 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 7.03-8.06 sec 116 MBytes 942 Mbits/sec 0 730 KBytes = =20 [ 5] 8.06-9.06 sec 112 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec 0 730 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender For reference for the panic: #8 0xffff0000005293e0 in vpanic (fmt=3D, ap=3D...) at /usr/src/sys/kern/kern_shutdown.c:962 buf =3D "vm_fault failed: 0xffff00000074c5dc error 1", '\000' = other_cpus =3D {__bits =3D {127, 0 }} td =3D 0xffff0000eb228640 newpanic =3D bootopt =3D #9 0xffff0000005291d0 in panic ( fmt=3D0x12 ) at /usr/src/sys/kern/kern_shutdown.c:887 ap =3D {__stack =3D 0xffff00010cfec1a0, __gr_top =3D = 0xffff00010cfec150,=20 __vr_top =3D 0xffffa00080cf7700, __gr_offs =3D -56, __vr_offs = =3D 0} #10 0xffff00000095ea5c in data_abort (td=3D,=20 frame=3D0xffff00010cfec270, esr=3D2516582404, far=3D,=20= lower=3D) at /usr/src/sys/arm64/arm64/trap.c:410 sig =3D 11 ucode =3D 1 pcb =3D 0xffff00010cfecb20 map =3D ftype =3D error =3D handled =3D #11 No locals. #12 0xffff00000074c5dc in in6m_disconnect_locked ( inmh=3Dinmh@entry=3D0xffff00010cfec498, = inm=3Dinm@entry=3D0xffffa00087100b00) at /usr/src/sys/netinet6/in6_mcast.c:604 curelm =3D 0x0 ifp =3D 0xffffa000870f9c00 ifma =3D 0xffffa000872cc500 ll_ifma =3D ifa =3D ifa6 =3D imm =3D imm_tmp =3D #13 0xffff00000074d840 in in6_leavegroup_locked (inm=3D0xffffa00087100b00,= =20 imf=3D, imf@entry=3D0xffff00010cfec4c0) at /usr/src/sys/netinet6/in6_mcast.c:1404 inmh =3D {slh_first =3D 0x0} error =3D timf =3D ifp =3D 0xffffa000870f9c00 #14 0xffff000000752550 in in6_pcbpurgeif0 (pcbinfo=3D,=20 ifp=3Difp@entry=3D0xffffa000870f9c00) at = /usr/src/sys/netinet6/in6_pcb.c:857 inpi =3D {ipi =3D 0xffff0000435dad38, inp =3D = 0xffffa00087a8bc40,=20 match =3D 0xffff000000752590 , ctx =3D 0x0, = hash =3D -1,=20 lock =3D INPLOOKUP_RLOCKPCB} im6o =3D 0xffffa00087470260 imf =3D inm =3D 0xffffa000870f9c00 inp =3D #15 0xffff00000074a348 in _in6_ifdetach = (ifp=3Difp@entry=3D0xffffa000870f9c00,=20 purgeulp=3D, purgeulp@entry=3D1) at /usr/src/sys/netinet6/in6_ifattach.c:877 ifa =3D next =3D #16 0xffff00000074a88c in in6_ifdeparture (arg=3D,=20 ifp=3D0xffffa000870f9c00) at = /usr/src/sys/netinet6/in6_ifattach.c:918 ext =3D 0xffffa000870f4340 #17 0xffff0000006834bc in if_detach_internal ( ifp=3Difp@entry=3D0xffffa000870f9c00, vmove=3Dfalse) at /usr/src/sys/net/if.c:1122 _ep =3D _t =3D 0xffffa00080cf7700 _el =3D 0xffffa00080376a80 shutdown =3D ifa =3D #18 0xffff000000682c54 in if_detach (ifp=3D0xffffa000870f9c00) at /usr/src/sys/net/if.c:1029 saved_vnet =3D 0x0 found =3D #19 0xffff0000006913e0 in ether_ifdetach = (ifp=3Difp@entry=3D0xffffa000870f9c00) at /usr/src/sys/net/if_ethersubr.c:1045 sdl =3D #20 0xffff00000033caec in uether_ifdetach = (ue=3Due@entry=3D0xffffa0008785b000) at /usr/src/sys/dev/usb/net/usb_ethernet.c:315 ifp =3D 0xffffa000870f9c00 #21 0xffff00000033579c in ure_detach (dev=3D) at /usr/src/sys/dev/usb/net/if_ure.c:591 ue =3D 0xffffa0008785b000 sc =3D 0xffffa0008785b000 #22 0xffff000000569bb0 in DEVICE_DETACH (dev=3D0xffffa00087534d00) at ./device_if.h:234 _m =3D 0x0 rc =3D _desc =3D _cep =3D _ce =3D #23 device_detach (dev=3Ddev@entry=3D0xffffa00087534d00) at /usr/src/sys/kern/subr_bus.c:2709 error =3D #24 0xffff000000569744 in device_delete_child (dev=3D0xffffa0008786e500,=20= child=3Dchild@entry=3D0xffffa00087534d00) at = /usr/src/sys/kern/subr_bus.c:1550 error =3D grandchild =3D #25 0xffff0000003175e8 in usb_detach_device_sub = (udev=3D0xffffa00087847000,=20 ppdev=3D, ppnpinfo=3D, flag=3D) at /usr/src/sys/dev/usb/usb_device.c:1253 dev =3D 0xffffa00087534d00 err =3D pnpinfo =3D #26 usb_detach_device (udev=3Dudev@entry=3D0xffffa00087847000,=20 iface_index=3D, flag=3D) at /usr/src/sys/dev/usb/usb_device.c:1315 i =3D 0 '\000' iface =3D #27 0xffff000000316538 in usb_unconfigure = (udev=3Dudev@entry=3D0xffffa00087847000,=20 flag=3D0 '\000', flag@entry=3D144 '\220') at /usr/src/sys/dev/usb/usb_device.c:623 do_unlock =3D #28 0xffff0000003161f4 in usbd_set_config_index ( udev=3Dudev@entry=3D0xffffa00087847000, index=3D1 '\001') at /usr/src/sys/dev/usb/usb_device.c:686 ds =3D {wStatus =3D "\000"} cdp =3D 0xffff000000e79000 err =3D selfpowered =3D power =3D max_power =3D do_unlock =3D #29 0xffff0000003205f4 in uhub_explore_handle_re_enumerate ( child=3Dchild@entry=3D0xffffa00087847000) at = /usr/src/sys/dev/usb/usb_hub.c:479 err =3D do_unlock =3D #30 0xffff0000003212c4 in uhub_explore_sub (sc=3D0xffffa0008767b000,=20 up=3D0xffffa0008786e49c) at /usr/src/sys/dev/usb/usb_hub.c:527 bus =3D 0x0 err =3D USB_ERR_NORMAL_COMPLETION child =3D 0xffffa00087847000 refcount =3D #31 uhub_explore (udev=3D0xffffa00087658000) at /usr/src/sys/dev/usb/usb_hub.c:1107 hub =3D 0xffffa0008786e400 sc =3D 0xffffa0008767b000 x =3D retval =3D USB_ERR_NORMAL_COMPLETION up =3D 0xffffa0008786e49c portno =3D 2 '\002' err =3D do_unlock =3D #32 0xffff00000032130c in uhub_explore_sub (sc=3D0xffffa00087473580,=20 up=3D0xffffa00087448a9c) at /usr/src/sys/dev/usb/usb_hub.c:547 bus =3D err =3D USB_ERR_NORMAL_COMPLETION child =3D 0xffffa00087658000 refcount =3D #33 uhub_explore (udev=3D0xffffa00087440000) at /usr/src/sys/dev/usb/usb_hub.c:1107 hub =3D 0xffffa00087448a00 sc =3D 0xffffa00087473580 x =3D retval =3D USB_ERR_NORMAL_COMPLETION up =3D 0xffffa00087448a9c portno =3D 2 '\002' err =3D do_unlock =3D #34 0xffff00000032130c in uhub_explore_sub (sc=3D0xffffa00080d88b00,=20 up=3D0xffffa00080da9bcc) at /usr/src/sys/dev/usb/usb_hub.c:547 bus =3D err =3D USB_ERR_NORMAL_COMPLETION child =3D 0xffffa00087440000 refcount =3D #35 uhub_explore (udev=3D0xffffa00080de4000) at /usr/src/sys/dev/usb/usb_hub.c:1107 hub =3D 0xffffa00080da9b00 sc =3D 0xffffa00080d88b00 x =3D retval =3D USB_ERR_NORMAL_COMPLETION up =3D 0xffffa00080da9bcc portno =3D 5 '\005' err =3D do_unlock =3D #36 0xffff00000030c65c in usb_bus_explore (pm=3D) at /usr/src/sys/dev/usb/controller/usb_controller.c:409 udev =3D 0xffffa00080de4000 bus =3D 0xffff00010ef84428 #37 0xffff000000326434 in usb_process (arg=3Darg@entry=3D0xffff00010ef8453= 8) at /usr/src/sys/dev/usb/usb_process.c:160 up =3D 0xffff00010ef84538 td =3D pm =3D 0xffff00010ef845e8 #38 0xffff0000004cc260 in fork_exit (callout=3D0xffff000000326320 = ,=20 arg=3D0xffff00010ef84538, frame=3D0xffff00010cfeca00) at /usr/src/sys/kern/kern_fork.c:1155 td =3D 0xffff0000eb228640 p =3D 0xffffa000824acaa0 dtd =3D #39 =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 17:52:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbMzq6mPpz6K5T4 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 4dbMzq5tsJz3Zt9 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 4dbMzq5NwSz1LZN 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:04:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbNFV4dq6z6K67Y for ; Tue, 23 Dec 2025 18:04:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-54.consmr.mail.gq1.yahoo.com (sonic316-54.consmr.mail.gq1.yahoo.com [98.137.69.30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbNFT6n1nz3dMy for ; Tue, 23 Dec 2025 18:04:45 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=a+EtFqwh; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.30 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766513078; bh=xmFxnMGIBBOBccMXQ0iYiv6Lb3BCT+bHAah9x98vOXE=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=a+EtFqwhWJi01X9NDqdpDlIQ3d+dB2gEhVjeTLk4tl7iWwwQr5P8alWU6FG+BInQyiKcrVHhQr3AfhgR+WsMVySf71g4GAJ6DmVYHhMRRTzYcVg2V/FMnJdYa+KzsNQbOLtcgaEeSC+rFib6QGNdcZf2ynFlhhgSefUgS5171I3+AX4dkcx6ErdUIcrvcWw6uVcMk9FhXV15mxZoch8OXG789Gqzz0QqHAkJseBztU/BB48jWvTdunTSryr4bNg0X/nUvPmE/qDSWcuWnAYCZPhedJvV/2YvExD0CDKIvxlIdbJoyEh/R4Xs6lwqwRgjnvKzSdsZKuK4oZ9byXcEZg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766513078; bh=c6FSjqGg/p+0JaAq2kLV5YA/jaW6t+711vSxcLjrYcW=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=SJRx2vLNa9MSK+xM2vi1phyG+e25PZsvQA4SAJxLmGoA38iuLU0e7IePTScMnQ1+B6RvZx4ARRaJIScuKIf9N7CQb2Bd9EPC6s6yvD8iKPNAcGtjmAbekzES02FZbwx1KdnAiksFWxX1Kh7UsNuwpwEsa/cmNOVFkkzv7e6n1FMwA+2qmCZF3Tik+jxS407ANEiqULcQ3AwKBtyLlw7af8mGd7Vda58L2Hl9Y27PhLRgfvRa+vXoB7OedVwtkmhtzF6qKY3VisPfe7sraR7GQ7Qgi5PoCUXEl4XwESamTEOFvCZo63Ftd312duVqvIKiWN1z3veiZPi/FddVeIY54w== X-YMail-OSG: wSfBQkwVM1lkPFoKwVWHLDp6_OhVNlw992bJ_Z0YHYrm.OiGQtbhd7XNnBj9q53 0Zrgwl7xKyJvpN75uTMz3sLGPcHxUKXTZtMkh0lFoWSCqO12IDGlkVDrgdtBHQ1tjr8DVvcPnHVT vT6.Me1FvpK6owTAAOVtPWnzYZojCgJ_MZUWR.sXejQ0fNYvr_tszeOX_KerAEu2QIOwcY2XOek9 3uB9kup9fiNtjIL8djIZsQI2PbdSvIzh1vAK.sABFD0tJcJGFKCPm4mz38sn29JdCtLYPUcbAOjn GxfvIgo20eS.k74yTBv06AsHhYveG1..ScEXHNT2wGiCH7.rEEtpMUbrWsQlZLHr9tfHk5N8vSVV e5AEyoDx3fbF3PlRjkJlMzMoLpvEsMZyYt8KrPp2lCPtqY4tu0nxZxsdpIbTm0soVBOZfxR0eTfn 38bDdSS57ORbwCwVTiUB8ZNKsD7_2u_ZoB6J2pJU8eGtVQzCPV8f163SH_yll5iHBPIMUJ7bz.Of 15ZbhD_qXz_2OORZy5L1IItU4hxteg3SXoVhl_vPfpTRcO0vcrXcALuWyqNI6hktCocYaddUDpIW qJzjZR0DR07lOm.ikkuv.7hRv2H02BnGhgCf2rDT6M4Oh1jEegz.PphtWGESuNIkeiuKOSPvNsr3 YOTnjn3CYkx9KWA7ExmPTFgggA5ed1KpK6fmTmaoHBysafj4qXBUGDc__NbhnLgAnFKgOkd0Qwnx 1tprTZ9Rqt.S.C8_lrKqB9fS_QOs8u7Znww_kGR.y4IRl7kRYgkQErJIO0fffKiNxhBayUNO2ddi v2lB1KSr5YZ_1qHe9uxdbMXxHezdUJnhVKvuKtizrloJhP4yIuMeWa60.9ricilFOV4V09SGPnSq tMfXaXqvqg3JDpsI4XgmRkacq_ifymusjtO4UMMzxihRl.F__ahWpqI5PbPkCG7pTqF8MTY252UW FZ57DlvKraPrUKTXbSsaOlaiprNDZJUMTDo_eUkBN._WVoHpiLOEaf8asN5QOh.MFYLups1rMqxw OQTKpNK.KJ2FOSA02d2ENirqLbO24WuSYIiptPc1qoIQVg9x.o5WITCS1KOv4P1s0Q2daQNAbQiU telH7XyYe7ZPy73ZA4fECn7FN4JJCLfVhGxYEF.fFjJX.tKeByYC0Eb7wgqYKb51YvSBW5yesVYZ k2TPzETLKl2xvhPELM8IDzWG1gGWwWb9zkZLsmtvzle8KYxXXWAJ_NoUrkHXHmWG.2jsSZVwt75. hLqsCypWjX9RgwMitA5oE8gBMls63HGwqXOWSK12a1eLJT7hHjt8nTz7FWqt9DWXEyBjnoslSz0o v71H_Ula3rDz4rKzUvV_AHbBiQiLvX3YIZDg7DhfOeXW1KpHR3k2hGNV.KGh9BwtjG2esPz46w2D Yl46GWB8vlcGiV.M7nDZNsP8CULWiPvuHJfeOzrZvo.YI1izNUNz1JBYsVtz_RrToE5o4WctCVBt xvG6._fiL2C.QmboHJRYBytpoL9bnx1c_ZIt9dxdcvOOUaWrR2tYbU7FtH55DvcQYISa75gEi7mW G8dS2mJz2UQ9za.Nx5a86mz2gh_tcUco1GEfpvquEVBNQ3tvjugEZt0DgeN0Jvv49xBcymtfRBkt 3S9xISiJ1SKanCsvS.7L9bcqblObzSTUdWdu2_.UrXzKss51ixI16LgNKdz62ip1YOIJG71G72Vd AiM00iao5QA4sW7sTn8PilrWNvmbktkCBtP22dq8B.uOfmCm0GuSv9NGh_05NGuGIFLXYOjRnxF9 JjbrN.CHoMTklgb0Wz.pXvynxC5ysYw0aM45mYjnProtbc01zKUQlxvt0VTIhF_0hrX4ivbz.VAs iGoCxgzVKybVkom5ISQnbhuOBvFIKFElN.MKpxGwh3LxA9TBw0CRFxB7KdtYYBahWFPFpqtP5VTf 1uLvJKKEFtNapqCW_iaI1ytrPbM8Pr2iUHuT4fMQjacXF8QGmQniP0cJGErf4JnGDj10lNgeOpU2 3AH.upCrSEci6ixjWnxUOe9B_66EjBA1pBiYlc3c3GL2Vq2PppNUvNomnMBgMTSnnyf85HMBOrqp Nc41iOIdP_e3ahfHe.tEc8D2cK.LxjEEetEKSjo5g5v.Odvl90dfkVfbfHRylLC34ehEaZ9mjxQp C8TPyaWyrBPO9LgzaRVR72ef0_w1786EwYPd0hIZWUYOiznMy0rUSqZWf6ulzQHRKMzA84AeG.UI .8xcYMXL9Q6r1MpNGWC87u_g_ttQ19UuSsbHdohal282EdCRT_yatxgaXe0TPMg4GHxbbgk4APnJ uiB302tLNCyBlQSTRDWMmIsKr X-Sonic-MF: X-Sonic-ID: 80344802-7f19-4d1f-a0f0-0e05521861f5 Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 18:04:38 +0000 Received: by hermes--production-gq1-54bf57fc64-tsjbm (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 93b1ad34b18095c90a70642c359f2ad2; Tue, 23 Dec 2025 18:04:33 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: RE: git: f7245a27e86c - main - cdce.4: Add RTL8153 to HARDWARE Message-Id: <8D443A3D-1578-4972-A3C9-A60E9E69CCE6@yahoo.com> Date: Tue, 23 Dec 2025 10:04:23 -0800 To: ziaee , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <8D443A3D-1578-4972-A3C9-A60E9E69CCE6.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.98 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; NEURAL_HAM_SHORT(-0.98)[-0.984]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; BLOCKLISTDE_FAIL(0.00)[98.137.69.30:server fail]; MID_RHS_MATCH_FROM(0.00)[]; APPLE_MAILER_COMMON(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.30:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.30:from] X-Rspamd-Queue-Id: 4dbNFT6n1nz3dMy Alexander Ziaee wrote on Date: Tue, 23 Dec 2025 13:59:00 UTC : > The branch main has been updated by ziaee: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Df7245a27e86c4c0012c8fb32c11bc4fd= fbe64b62 >=20 > commit f7245a27e86c4c0012c8fb32c11bc4fdfbe64b62 > Author: Alexander Ziaee > AuthorDate: 2025-12-23 13:55:57 +0000 > Commit: Alexander Ziaee > CommitDate: 2025-12-23 13:55:57 +0000 >=20 > cdce.4: Add RTL8153 to HARDWARE >=20 > Fixes: 1b1fb628a1af (Quirk Realtek RTL8153 to config#1) > --- > share/man/man4/cdce.4 | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >=20 > 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 >=20 As of now cdce.4 is only used for revision 0x31fd of the REALTEK RTL8153 because of a reported failure and potential speed issues for some other known to be in use revisions of the part were previously working fine: Poul-Henning Kamp Date: Tue, 23 Dec 2025 17:04:32 UTC=20 The branch main has been updated by phk: URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da7e0f6a3dc5f3c4d11066a4b6529bc8c= b868694a 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=3D0x31fd --- 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] =3D { /* 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 =46rom what has been reported, I gather there is a lot of variability in the behavior of the RTL8153 based on the revision code value. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 18:35:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbNxM38fRz6K8KL 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 4dbNxM2b02z3kDD 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 4dbNxM1zWsz1Mp7 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbPCF5X69z6K9FR for ; Tue, 23 Dec 2025 18:47:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (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 4dbPCF2D3Tz3l8N 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-x102c.google.com with SMTP id 98e67ed59e1d1-34b75fba315so5989240a91.3 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=eP0qgagbjeGZ0SW4Zk3vyZY2HVMMQKDtCHNcz2le1T91rJwwCTGLPaQ7RGgwJUxnLQ Qn+iZnvVTgOtSvxQAM8csIMl2HytyOVRJvg+bcfR3cAV/6eZUFPLjpNZalz1rbsEZ1hn aaeQWKQjy7NsSON9WCmfolH+c/0dDKSoBXjgqAH4UyoH08Oe49cBCOztb96bxWt3oGSp PwETF90CeNl0kCTDNVia5OcmxoB/SCO6X/5nRHj7pSBijPn2d7d0c5wkW07SmVvETErU at591cJM6quy6EcJrRaPWu7PYz2341d5X4hKGVOPikpaLDZuIk7yhrkdMHoI3uPe05o0 SG7Q== X-Forwarded-Encrypted: i=1; AJvYcCXoO7Db5HgVQyZlKzeVlbZCAQhSY40G/SqQkT05okDxm1wnNjMgvJ1VPTDJlFFDnQUnO7MVg/lV4JYGTaetGuOSPOvCxQ==@freebsd.org X-Gm-Message-State: AOJu0Yy8EYvGrfgcRZRlhtujLVO9N4r7FagEJ08AdEK8OCYGAvTMvgUV rLcDjCWCCqedfG3KfGDdtI1ILk9hYOUes2w1P4KbVLKZTCvpQb9oIVxjyE4iJse9QU3fbfLe1vA Gf9Nuo6H08Ky38D/Uw3jvm7j0kqvtQ9T6ouD2tE+IcA== X-Gm-Gg: AY/fxX419ci7O2TmUNYGdygxBxrhxxYpVEnF9coCa5J5NB/tPLPCAlmGmtv4snRpWRq BakyaeNvZhtAVnH2JZDSYrqluLs0Ly3lRLdDLOMy7TZM4JQBn9ePvWO6v2N09h6gNIst4q1Y2OF XBOkWRaM6PUzlYgMWwDzQ/yaMIN2SXdoQZhUxm0lIMAltbTwhURqUPj7xoKvUdMBZArYZ05WAC8 ufq5RxYEbtl9hmE8nx0kBLLXq8BG9fkTzQVxS6/Uz5rlFguaBOp2tThKqH78IQe3s9XARsK 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dbPCF2D3Tz3l8N --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbPmF1B6dz6KC0d 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 4dbPmF0XbMz3r2S 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 4dbPmD740mz1Nbc 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 19:18:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbPtW34zZz6KCPW for ; Tue, 23 Dec 2025 19:18:27 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-20.consmr.mail.gq1.yahoo.com (sonic305-20.consmr.mail.gq1.yahoo.com [98.137.64.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbPtS0w4Bz3rJD for ; Tue, 23 Dec 2025 19:18:23 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=e4JxOudN; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.64.83 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766517500; bh=uRB3L3RR0eg1as79cwK1kBu19eeRCxnfSfLlCChc0Kk=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=e4JxOudNHnSKMkCcFDW3YFR73LWitI9uORq/6+jbWVhAeIHKZmDQYvLv8lfIFrPUl45YWQp0saP3Z7gsLfQ7I8Hc4nxota1buVCejKUuv1xcjOwesesU9vA0Fy9XCz6CjYZ3Fw1Z7UsURRV8d2z5WdEZesfJb2rgHL+/sjxTkRGQb4fNjm74gKs6peKMgdeFR8izr14oqYz1lT2Xn4ip75sn7iRnsMv1xbNujtyKez0VAUx+DmlDgIiRJwc/yN2Nw9CeYm0JzjP6p9M/FohqDrqEfTK7as6QX6DTbH+FeVYnnLZN2963+d7CxJ0hi8dBIwGDMDjLymB1vooMpSy6hw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766517500; bh=VBAAwySPqINmzf5ExgBON36xZTeZ/2Sq/Tj9rHqRcwi=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=oFS3zicGEAQHb161mpdf+R7xWLiram1Bigfa+YHgTh7/UBiWxKuy2nXbESc76DqWBRzEiTLm9KJGDtnUn41p0HMh2F60jNj9TvnpUhTyKKj8Ut+QlibxB/7gwObpawCCsxFqoRHLZ5mQcL4U2ZXhUF6HClBbnBNGgQVsEOxvUD96Y+M4FNBo98XQWlv820d+aWMVmRSRaMr+XV0/54iWN4EkLWaxMDpTG7tz4DRyw49DD2N3QidmAnPHJqbudTAnDOi477T993K3MBnNgNkvDpk0Hklz0FTedULlc2WZN1PuD2PyR5+vMyy8dFWWtRxyB9v+9rZhQXyTPcn0Si+32Q== X-YMail-OSG: zhpHne8VM1khj_8apL4gnpW8CgjB1zNEwzxR0zU3qs6y3MQ9tCOsaoNGsT8zrCc ljBMOpPwLQVDR1fCFdoDCoQWKjqOflM4cPVK6fxdUyOj7qGz.V6mKL2US9es.XnWSW7EpYJGNTfO B8Bw0H9y8mgg4Wwsvlt6QeQMEtKyHV4yFCaCjLn4uAZ0MzHpkHrGu1EknVDYND1g6qF6ivKtRbku 5JeJNM1st6eS04oUWKqdile2k4U0XD5MFDBjCFzG4lW5Fg2Mmn418Z64gPReX.V.U3lp7.Bj9FT0 bsP0MiuINHxris9_LegeGY3d7y5iUPKN9irpxTBFiipIY8shhv8Rf9d.klIKM9iqu.euBAV1wVE1 dTTQqlKxetAA4tP_IO7FEG1XqMVjeCOjb_ETdvMPUjCS_5Kqonu9cTjuf9zuXiYChtvPxPzc61d2 NJN9jOTNiYLcowSFj4uwaklQKChs5r7pxknLjNp4Afor_wD2V9azA2xAlPvsXmRxs.vgUph9yJ8w 6dG0tLvzpyUxk0xmERuok.DTh1qENShH0vQxpNL66ubykVN9GQPStksUFLRXsG8kI5aGqjX003hA hVnq90Ex80XjSnnDHC1v3caI8UQ4OjRDTKPIQOp0pOduZ1erFTMwds5letlDcY7ke8fBNR5Vz8Jx 1JkqospEFZwRMRmDVyHq6m1WaTzBfKufyMxFXvlkRm49o6bDeYivV3dGOHS7OGCPu4qSgBBg0JqX cYFgPwvHKSa6x5N51Uwe8LLdo.KrzUUBufvIj_WPb3Kap1foFfYKszDtHZOYWlJTzLcTZyUUcLo7 vz8EwhrmwofpDtCgDu6vw3B_roJ5Mm2uKiIjP85vqbu0ljwQi7PloAELvmyJvMteCxi1dBxDuv0m vSOIuomVMqGpnIVKd8ZBHuyFB_vtpRM0HXsMpFgOvnN7bT5aTPLxR4YfUbXIZCZGNhIOpvbuOe5W 0cGvypXpE3hJ8t7Lv5BElRsahQ0TPQOxPpMSGRIiGGe.0i_u4TqNWAOprj2yQi4Y.tj_cBUL.YZB 1poQOhEdT_sZ6moxLZzMi0d4gywrlmOe3ZrtPycfgsjzztapZ8mqQPYuOD_rBaT3T1QFanWOSu9w 2mOWdASKB37rfClOfH_UoUgGIXf205_vXBlYubpYl3goGx6kThawSOORxAJSqFSRahFZeyLUUhD8 jSPArtXH54d2Z1nWWoQkRMKQq1f97gXNwdayuY9AUEJgfGqBTxqWfAiUjTtnBQVoLb6SSCrrAVFd Z12RVQF.jlMX0jHJxq32BcC_Ql4VBJJpJSo35SxU5kL69GCYQPa42sbzKw3p5Ujq2TK7SLk_DRx. KPb5879RYkaOnxC_HYfJ_i86BITe_FR9t3ICw37OFbN4BZTzYCZNIqfwdfLcvHcf_yLMF4s4lg51 BlqLsWP4_ezyaqh4IFvbZM0.m8AlbiSGb_kPnFjWIJ4WBDCMzTuOm5tevB8T2G2Pm6Da14DV4S1E Go5N.2CXLfb4CI.hyuZgD_vpjlxc0F5raAQTh0Ak_S_M2MTYkM6TD7FyMzBxGP8hMD0vqoT5XhYa KFAw4LNDrFG.bW_uyBQwvYdYBjpb17afR0Xln7PFrPnoH.8JZiO.NlN7Ct.HVRwWx_RuBfWLMxZM aNdfE33uWunF3QQtRIWiouBLItu_dGLLPS09yJXC2jWUOWuMKuF7Rrb4t4vL7bm.t8s0Ex9Ynlwy _a3rKTM2_VUUQuf9A82kz6isuaBfMQlCjiADn9Q7qR1Y2ELPvrS3b4CS.rr3V7.eI3FQ2bpwtjSL YHvsButn308pDmBjGXsaIpRgu_F_O02LVdgSzxittRmZLp2XMiBYxpr5An.MjTbcyxTHKe67vV_V Ox.VFtyjyU9XXI7OSgxx8cYmUD_ZSPY7SEEYyVgMagoj628Q1WLJh3IMMmAsFXuy.UiGPNaGgmKn RcCL19gwYa89JNz__SC9zI.O2mB3KRD7WPQ_uSsPixuc2kjLsAoqo5B.TrvItsz_jr_INUs28X2G D.gwNaRD1vJY3OnQzDTs59KiobJUlaXPk9G3Z6soYUWsgMRSKkg7FKC_qaAtIrFePNvuNbSAgYjL uT.9xtx3z.VLNr215nJIVIVfRSP.7d3H1DqtyJCzBgEZ.n5gW0GlprAktP1tyH7Uqc1VeA23RQBq AXapxfADvqeNeJ5Gq1EbhhgFsm2xEW3L9NiXUBG_imPn55kgGKm_zNv8f2vojxAMddwmygA3WRUC f7AtaUb9IphOtydukC.Y1cn8rFcsnPfe_06WsrGO_zjsFthTKnJo1wdhutySwDvq4XpcdGIVW6xb Do2Dgm4Y- X-Sonic-MF: X-Sonic-ID: 417e6cf8-b6a1-4d2c-b288-51fa9647e034 Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 19:18:20 +0000 Received: by hermes--production-gq1-54bf57fc64-g2xxf (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 2eb327919480e9f641334eeace9ef91a; Tue, 23 Dec 2025 19:18:14 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. From: Mark Millard In-Reply-To: Date: Tue, 23 Dec 2025 11:18:04 -0800 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> <202512231629.5BNGTbdU011559@critter.freebsd.dk> To: Poul-Henning Kamp X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.94 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.94)[-0.941]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.83:from]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.83:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim] X-Rspamd-Queue-Id: 4dbPtS0w4Bz3rJD On Dec 23, 2025, at 09:31, Mark Millard wrote: > On Dec 23, 2025, at 08:29, Poul-Henning Kamp = wrote: >=20 >> -------- >> Mark Millard writes: >>=20 >>=20 >>> This means that I'll have to set up and do before vs. >>> after-upgrading-FreeBSD-OS testing for >>> comparison/contrast. >>=20 >> You should be able to do it at runtime with=20 >>=20 >> usbconfig -d X.Y set_config [0|1] >=20 > Cool. I rarely do these sorts of activities and have to > refigure out the details each time. >=20 > . . . However, the result of: >=20 > # usbconfig -d ugen0.11 set_config >=20 > on the Windows Dev Kit 2023 was: >=20 > Fatal data abort > . . . > panic: vm_fault failed. >=20 > So all I have so far for testing is the prior cfg=3D0 > test . . . >=20 >=20 > The FreeBSD OS here is pkgbase main with the > GENERIC-NODEBUG kernel on each machine. >=20 > For the below the "iperf3 -s" was done on a > amd64 7950X3D system using its build-in: >=20 > # pciconf -l rge0 > rge0@pci0:8:0:0: class=3D0x020000 rev=3D0x05 hdr=3D0x00 vendor=3D0x10ec = device=3D0x8125 subvendor=3D0x1043 subdevice=3D0x87d7 >=20 >=20 > Windows Dev Kit 2023 (so: aarch64) . . . >=20 > # usbconfig -l -d ugen0.11 > ugen0.11: at usbus0, cfg=3D0 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON = (72mA) >=20 > # iperf3 -c 192.168.1.195 --get-server-output > Connecting to host 192.168.1.195, port 5201 > [ 5] local 192.168.1.143 port 50986 connected to 192.168.1.195 port = 5201 > [ ID] Interval Transfer Bitrate Retr Cwnd > [ 5] 0.00-1.00 sec 113 MBytes 945 Mbits/sec 0 488 = KBytes =20 > [ 5] 1.00-2.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 > [ 5] 2.00-3.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 > [ 5] 3.00-4.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 4.00-5.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 5.00-6.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 6.00-7.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 > [ 5] 7.00-8.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 8.00-9.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 9.00-10.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate Retr > [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender > [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver >=20 > Server output: > Accepted connection from 192.168.1.143, port 61091 > [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 50986 > [ ID] Interval Transfer Bitrate > [ 5] 0.00-1.06 sec 119 MBytes 936 Mbits/sec =20= > [ 5] 1.06-2.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 2.06-3.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 3.06-4.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 4.06-5.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 5.06-6.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 6.06-7.05 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 7.05-8.06 sec 113 MBytes 942 Mbits/sec =20= > [ 5] 8.06-9.03 sec 109 MBytes 941 Mbits/sec =20= > [ 5] 9.03-10.01 sec 110 MBytes 942 Mbits/sec =20= > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate > [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver >=20 >=20 > iperf Done. >=20 > # iperf3 -R -c 192.168.1.195 --get-server-output > you have mail > Connecting to host 192.168.1.195, port 5201 > Reverse mode, remote host 192.168.1.195 is sending > [ 5] local 192.168.1.143 port 17266 connected to 192.168.1.195 port = 5201 > [ ID] Interval Transfer Bitrate > [ 5] 0.00-1.06 sec 118 MBytes 941 Mbits/sec =20= > [ 5] 1.06-2.04 sec 110 MBytes 942 Mbits/sec =20= > [ 5] 2.04-3.06 sec 115 MBytes 941 Mbits/sec =20= > [ 5] 3.06-4.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 4.06-5.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 5.06-6.02 sec 108 MBytes 941 Mbits/sec =20= > [ 5] 6.02-7.00 sec 110 MBytes 942 Mbits/sec =20= > [ 5] 7.00-8.06 sec 119 MBytes 941 Mbits/sec =20= > [ 5] 8.06-9.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec =20= > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate Retr > [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender > [ 5] 0.00-10.00 sec 1.10 GBytes 941 Mbits/sec = receiver >=20 > Server output: > ----------------------------------------------------------- > Server listening on 5201 (test #2) > ----------------------------------------------------------- > Accepted connection from 192.168.1.143, port 64359 > [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 17266 > [ ID] Interval Transfer Bitrate Retr Cwnd > [ 5] 0.00-1.06 sec 120 MBytes 947 Mbits/sec 0 730 = KBytes =20 > [ 5] 1.06-2.06 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 > [ 5] 2.06-3.06 sec 112 MBytes 942 Mbits/sec 0 730 = KBytes =20 > [ 5] 3.06-4.05 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 > [ 5] 4.05-5.06 sec 113 MBytes 941 Mbits/sec 0 730 = KBytes =20 > [ 5] 5.06-6.06 sec 112 MBytes 942 Mbits/sec 0 730 = KBytes =20 > [ 5] 6.06-7.03 sec 108 MBytes 941 Mbits/sec 0 730 = KBytes =20 > [ 5] 7.03-8.06 sec 116 MBytes 942 Mbits/sec 0 730 = KBytes =20 > [ 5] 8.06-9.06 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 > [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec 0 730 = KBytes =20 > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate Retr > [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender >=20 >=20 >=20 >=20 > For reference for the panic: >=20 > . . . >=20 FYI . . . Based on updating to a official pkgbase GENERIC-NODEBUG kernel from when cfg=3D1 was in general use I find that the "iperf3 -R . . ." gets non-0 Retr figures that the above did not: # usbconfig -l -d ugen0.11 ugen0.11: = at usbus0, cfg=3D1 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (72mA) # iperf3 -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 [ 5] local 192.168.1.143 port 30247 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.00 sec 113 MBytes 944 Mbits/sec 0 488 KBytes = =20 [ 5] 1.00-2.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 2.00-3.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 3.00-4.00 sec 112 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 4.00-5.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 5.00-6.00 sec 112 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 6.00-7.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 7.00-8.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 [ 5] 8.00-9.00 sec 112 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 9.00-10.00 sec 112 MBytes 942 Mbits/sec 0 488 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver Server output: Accepted connection from 192.168.1.143, port 20991 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 30247 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.04 sec 117 MBytes 938 Mbits/sec =20 [ 5] 1.04-2.00 sec 108 MBytes 941 Mbits/sec =20 [ 5] 2.00-3.06 sec 118 MBytes 941 Mbits/sec =20 [ 5] 3.06-4.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 4.06-5.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 5.06-6.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 6.06-7.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 7.06-8.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 8.06-9.06 sec 112 MBytes 942 Mbits/sec =20 [ 5] 9.06-10.01 sec 106 MBytes 941 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver iperf Done. # iperf3 -R -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 Reverse mode, remote host 192.168.1.195 is sending [ 5] local 192.168.1.143 port 30166 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.01 sec 113 MBytes 940 Mbits/sec =20 [ 5] 1.01-2.01 sec 112 MBytes 940 Mbits/sec =20 [ 5] 2.01-3.01 sec 113 MBytes 940 Mbits/sec =20 [ 5] 3.01-4.00 sec 111 MBytes 940 Mbits/sec =20 [ 5] 4.00-5.00 sec 112 MBytes 940 Mbits/sec =20 [ 5] 5.00-6.03 sec 115 MBytes 940 Mbits/sec =20 [ 5] 6.03-7.00 sec 109 MBytes 940 Mbits/sec =20 [ 5] 7.00-8.00 sec 112 MBytes 941 Mbits/sec =20 [ 5] 8.00-9.00 sec 112 MBytes 942 Mbits/sec =20 [ 5] 9.00-10.06 sec 119 MBytes 940 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.07 sec 1.10 GBytes 941 Mbits/sec 83 = sender [ 5] 0.00-10.06 sec 1.10 GBytes 940 Mbits/sec = receiver Server output: ----------------------------------------------------------- Server listening on 5201 (test #2) ----------------------------------------------------------- Accepted connection from 192.168.1.143, port 12585 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 30166 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.06 sec 120 MBytes 946 Mbits/sec 8 574 KBytes = =20 [ 5] 1.06-2.06 sec 112 MBytes 940 Mbits/sec 11 395 KBytes = =20 [ 5] 2.06-3.06 sec 112 MBytes 940 Mbits/sec 3 333 KBytes = =20 [ 5] 3.06-4.06 sec 112 MBytes 941 Mbits/sec 6 591 KBytes = =20 [ 5] 4.06-5.06 sec 112 MBytes 938 Mbits/sec 24 152 KBytes = =20 [ 5] 5.06-6.05 sec 112 MBytes 939 Mbits/sec 16 180 KBytes = =20 [ 5] 6.05-7.06 sec 113 MBytes 942 Mbits/sec 0 600 KBytes = =20 [ 5] 7.06-8.06 sec 112 MBytes 941 Mbits/sec 3 635 KBytes = =20 [ 5] 8.06-9.05 sec 112 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 9.05-10.06 sec 113 MBytes 941 Mbits/sec 12 470 KBytes = =20 [ 5] 10.06-10.07 sec 512 KBytes 819 Mbits/sec 0 471 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.07 sec 1.10 GBytes 941 Mbits/sec 83 = sender =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 19:51:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbQdH3nzNz6KGdZ for ; Tue, 23 Dec 2025 19:52:03 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbQdF5GYDz3xpX for ; Tue, 23 Dec 2025 19:52:01 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=pNhu6cwz; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766519517; bh=EIhzRZPCCECF5sozZspHYy7/Vid2u6Xkkv7VSBRU99s=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=pNhu6cwzr5TsB0poSqqk086v0FTzTB5QG/MgBuNKqJnTP4qyWmv6v4QuI7/qe7PIr2QgfrOABthqTmbeGAV52xZgoBRyh/ZKv5BC/T1Q64KtloUsV03LfvLR9q8EiFCMiqxyTWh5bXK9T/hn5gkd0ns2BnTNqwmJBS8I5glEKE+93JQAtNMGT+feZ562RsHO6N+7iAu+70Bost2T8OQlVC+IyiW8pTSojZPPLCHmHEJOPtULHyVU/4Rw2wgDURuGT1YUChjV5YImWyjAXzO0V9B3quyaaOmuUIJD26+B2suH3tNJKT99uHk8uElmMTDlrPzyI2e55DQYtqFCfAC9pw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766519517; bh=bW2pj8M5no27nM2omS3KIL9GiIyzncdv4PqSoEQPVG9=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=IapKHD5lLdmIYUJvyjqGXZZcYkgSkLl5+AW5RaaHqnknjebNajiYdBsWDfSoS+LkrjgQxA2qGVYeyvhVl37pn9a+mTkjlYNx9+kca2y8YLBZ3eNxd1IWkLV0Pa6RN8nwloVt1HTdsoSPF+ucmEbwY6eGd7b8nmqkIqepvJW5ZxZqU6ucGNMsI2T0I5KMUwaiDnROC0xBftDp0lKBKR6juvFDIfVrN1IGd5+T0pz7+6RQ+wBVp55e5XB24HTSFT+E8qopLJDkPCR/tmhOO3QNCq3nq2nGTjrydg8NT9Sf8xb1WLBy8fnfzOWPGPBfBhfqIvpyYcP9cal+6OrrrSgL4A== X-YMail-OSG: ZXwUfjYVM1m5HcVCgoyupsvNm8mX_sosBGfXKogVT7zyDCme22DwwQwYgZiFzJn tj99c9qc.aUUyu6QpRWv7TxsFiwLx5eygTSsKt24XRL3AMYv1i0smffQQ1FVTKDHLcC4PCma9hUC 1XCpXgsINe_4I_p21JzHbw45xWDTC_hSpio9NPAKYRadg8SOQ5_BcFS0Fe7gBpEX4APLieMCQyUD qpZ6eXSUBYoaQ3OKOKeFxMhzAwv8haeZH0sbgHlFwK0I13ALKjbambs4iuZxLB93udhB2ZGaSaq. Rbqly1XQ_3XionItbuIgU6aOBPB_2tqFBY3CYMcAarmAkuC26OpfTaYx56UZOfn7Oj554IiOZUhb pk4RQVNdHgwkD9Uf5qGdPvZ.fM2NZGM40f_Ocg0dQ2doRLJkDTKQT5qnLTWOybXgcB5ZvoSS.23d LelFwPciY36GKU3WBQPnzsiW0EeZNQazBAbOz55hzjvmbvY7E5HJo3z2LIZJGjT.or0G7dTqF3Rb hIg88zFesP3iR3zdx6E00xvuHTZUIgUf0w18.VXMBup7w.pRZRAzG4VnLXXNN8Z2kwp2Zg2N27H0 Q3wCNkKj7CM6f8P1KMb.pVP.CgmEUon2x8iJnLva.5cje90qua8e1s_Wtwom16jean6KlShLKaDv _SqcByCfBIvAMsok36ZRU4Uotjx1AaynIuANCKLWqW4HhVFhe0b2jQyqYmrZhQjxZySLRNN_4xx6 8DtqJTMSOC.riO4hJMhtKjLjmuKHZibjxJ38eAUxDGN21zwYocKbntpw3v0ehQhHF6b6g4fcc_Ex sYHqfPjATc78XceNZxOJ4UXfAnOyO8N3C6Z7rPHcCDtBlUC0CBeQeTE10Wck_6yztsDkx.18sd.L _pshJhDtAJiy76SrrzvSR4wDRelmlCKzM36qqmqwjhD3BYpN8OkA9ZrO1g_.kHLsOAWk7WnSnWeO yHPz.fZKofRTS54HfDRiiXYV.Z6wMVlvBl8pkldboaImMR3TDAJwIicj8eXmlx0oZ7kJQwHJ3MCh OsGDFjTHrxOG9FzxBx9rf5ci3HjP2J.p.ygzBCDykfeIBrdW2gb.KSxMavA.07lD_lvgT9bdgMtj MWVViTiXH41x46eqYUe18O6YunjQ2e_HMsOKRsYse8JWFYkDhP3_S0xdCAlZLqWb4m2ivP2_rVpo Z7K177DkYoi0zQCZWbQxK9HWVn3MyQziFtjdALbQiLe2lqi8q77lKU9vHOYyqKak0b4YbrtNBJ.R 2L8IEDVXtF47iiTcoYbPd7RUR.02OFCabq2W5_DaRC8oxxiV4qB6bQxE7fL8m6mX_10c5nAvT.4p _CPiWWUS6B47RrUMXLfoP1XEabXehutDumD0VCMqQiQObcO2L4WgNapvjSxltQq0lI6vCbkybGzy ssHNC3ARY3iNdFdEjhEukOz7zp.MlEgUjmjE0a5aeKiIynlDIswNFdEHkYonyBSvpIlCh81mNqRc KSF6w7wY3c67OSgv.ELWsRYCGRDiGH_sfK2vmYCwsEPLHfaejJ07lE67_8K.2qsQOrAdxXX09HPS LXy5T2BpVWTgahTORzOlVIdGRXkknxHFjHQjmvHhYbu6ejYV2PgInerKofxzPvuf.qmKDr8rAGx. aDQCChcnsxdidXqZdu3bR9NRcjq5cXmiQXwTWda83oVuT1Z5WqPvkJs9iVPprZmiR4Uf9N_IxHcD db3N.xC9_p.lt88JaPk7QTvCG52cxLVmmrztxLzwAKJjVVBqt4L8Q8pXjfYpCFMlLzyVTeomKayp C4f5ObGuVrM5FLQFq.fhY6N6TdIa_3Z.KxeA_Bbh0dK0zu3CohEus7wrOqOIIUT2X_nJ1fA6.olW bV9N2p9nThx0ZVJ4DFXvStcoxU6I_ccQcCHa3w2uzpS_y62hvhqClcw1vvcup8Hj7P6nR8hjIICy h8micZvuVS3dD9DF_O4MaWc09_z5..kSeeZ6fm8SWVIu_6UT6nUfLVHR_gOx2M4ugRWw5cwGsuZ2 SpCnXE.dxwaYIkoctqkTmc87TFkJgra.wTAO_DzOBjTO7SgScvCqeAIJhfv7C3vN3lZ7LjL5eaNW etFjxNL6BApC9JWbnGGhzwTCglzLNXcX.ibl_gJ1jmGAxRNpIGxaeMPaOonEluMi_juQZE7ahCl_ GBg7guV3lq17jhcWBJCzEdeqX.qEH1_Hqsh1WmEMMBkH_.MUdDoR4c34fq8Zrt2BQNFa.nFGbp9g jsVynFz0iMnd5ZJKZS0L_FcfWuewV1TmZDZKI87BW5zBXCJZ3jaUYaseaqWL9aHa1aw0seXfevIc cBSoM2A-- X-Sonic-MF: X-Sonic-ID: 96aa45e3-9a7d-4a9e-a739-18fe27e8ddd8 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 19:51:57 +0000 Received: by hermes--production-gq1-54bf57fc64-8j6k2 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 632934a396fe9ce28c2fb44f5a7ba8e8; Tue, 23 Dec 2025 19:51:55 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. From: Mark Millard In-Reply-To: Date: Tue, 23 Dec 2025 11:51:44 -0800 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: <59DFE4B5-8B87-4925-87D4-B7EA938D77B2@yahoo.com> References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> <202512231629.5BNGTbdU011559@critter.freebsd.dk> To: Poul-Henning Kamp X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.97 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.97)[-0.971]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.205:from]; BLOCKLISTDE_FAIL(0.00)[98.137.69.205:server fail]; RCVD_VIA_SMTP_AUTH(0.00)[]; APPLE_MAILER_COMMON(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.205:from] X-Rspamd-Queue-Id: 4dbQdF5GYDz3xpX On Dec 23, 2025, at 11:18, Mark Millard wrote: > On Dec 23, 2025, at 09:31, Mark Millard wrote: >=20 >> On Dec 23, 2025, at 08:29, Poul-Henning Kamp = wrote: >>=20 >>> -------- >>> Mark Millard writes: >>>=20 >>>=20 >>>> This means that I'll have to set up and do before vs. >>>> after-upgrading-FreeBSD-OS testing for >>>> comparison/contrast. >>>=20 >>> You should be able to do it at runtime with=20 >>>=20 >>> usbconfig -d X.Y set_config [0|1] >>=20 >> Cool. I rarely do these sorts of activities and have to >> refigure out the details each time. >>=20 >> . . . However, the result of: >>=20 >> # usbconfig -d ugen0.11 set_config >>=20 >> on the Windows Dev Kit 2023 was: >>=20 >> Fatal data abort >> . . . >> panic: vm_fault failed. >>=20 >> So all I have so far for testing is the prior cfg=3D0 >> test . . . >>=20 >>=20 >> The FreeBSD OS here is pkgbase main with the >> GENERIC-NODEBUG kernel on each machine. >>=20 >> For the below the "iperf3 -s" was done on a >> amd64 7950X3D system using its build-in: >>=20 >> # pciconf -l rge0 >> rge0@pci0:8:0:0: class=3D0x020000 rev=3D0x05 hdr=3D0x00 vendor=3D0x10ec= device=3D0x8125 subvendor=3D0x1043 subdevice=3D0x87d7 >>=20 >>=20 >> Windows Dev Kit 2023 (so: aarch64) . . . >>=20 >> # usbconfig -l -d ugen0.11 >> ugen0.11: at usbus0, cfg=3D0 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON = (72mA) >>=20 >> # iperf3 -c 192.168.1.195 --get-server-output >> Connecting to host 192.168.1.195, port 5201 >> [ 5] local 192.168.1.143 port 50986 connected to 192.168.1.195 port = 5201 >> [ ID] Interval Transfer Bitrate Retr Cwnd >> [ 5] 0.00-1.00 sec 113 MBytes 945 Mbits/sec 0 488 = KBytes =20 >> [ 5] 1.00-2.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 >> [ 5] 2.00-3.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 >> [ 5] 3.00-4.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 >> [ 5] 4.00-5.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 >> [ 5] 5.00-6.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 >> [ 5] 6.00-7.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 >> [ 5] 7.00-8.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 >> [ 5] 8.00-9.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 >> [ 5] 9.00-10.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 >> - - - - - - - - - - - - - - - - - - - - - - - - - >> [ ID] Interval Transfer Bitrate Retr >> [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender >> [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver >>=20 >> Server output: >> Accepted connection from 192.168.1.143, port 61091 >> [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 50986 >> [ ID] Interval Transfer Bitrate >> [ 5] 0.00-1.06 sec 119 MBytes 936 Mbits/sec =20= >> [ 5] 1.06-2.06 sec 112 MBytes 942 Mbits/sec =20= >> [ 5] 2.06-3.06 sec 112 MBytes 941 Mbits/sec =20= >> [ 5] 3.06-4.06 sec 112 MBytes 942 Mbits/sec =20= >> [ 5] 4.06-5.06 sec 112 MBytes 942 Mbits/sec =20= >> [ 5] 5.06-6.06 sec 112 MBytes 941 Mbits/sec =20= >> [ 5] 6.06-7.05 sec 112 MBytes 941 Mbits/sec =20= >> [ 5] 7.05-8.06 sec 113 MBytes 942 Mbits/sec =20= >> [ 5] 8.06-9.03 sec 109 MBytes 941 Mbits/sec =20= >> [ 5] 9.03-10.01 sec 110 MBytes 942 Mbits/sec =20= >> - - - - - - - - - - - - - - - - - - - - - - - - - >> [ ID] Interval Transfer Bitrate >> [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver >>=20 >>=20 >> iperf Done. >>=20 >> # iperf3 -R -c 192.168.1.195 --get-server-output >> you have mail >> Connecting to host 192.168.1.195, port 5201 >> Reverse mode, remote host 192.168.1.195 is sending >> [ 5] local 192.168.1.143 port 17266 connected to 192.168.1.195 port = 5201 >> [ ID] Interval Transfer Bitrate >> [ 5] 0.00-1.06 sec 118 MBytes 941 Mbits/sec =20= >> [ 5] 1.06-2.04 sec 110 MBytes 942 Mbits/sec =20= >> [ 5] 2.04-3.06 sec 115 MBytes 941 Mbits/sec =20= >> [ 5] 3.06-4.06 sec 112 MBytes 941 Mbits/sec =20= >> [ 5] 4.06-5.06 sec 112 MBytes 942 Mbits/sec =20= >> [ 5] 5.06-6.02 sec 108 MBytes 941 Mbits/sec =20= >> [ 5] 6.02-7.00 sec 110 MBytes 942 Mbits/sec =20= >> [ 5] 7.00-8.06 sec 119 MBytes 941 Mbits/sec =20= >> [ 5] 8.06-9.06 sec 112 MBytes 942 Mbits/sec =20= >> [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec =20= >> - - - - - - - - - - - - - - - - - - - - - - - - - >> [ ID] Interval Transfer Bitrate Retr >> [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender >> [ 5] 0.00-10.00 sec 1.10 GBytes 941 Mbits/sec = receiver >>=20 >> Server output: >> ----------------------------------------------------------- >> Server listening on 5201 (test #2) >> ----------------------------------------------------------- >> Accepted connection from 192.168.1.143, port 64359 >> [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 17266 >> [ ID] Interval Transfer Bitrate Retr Cwnd >> [ 5] 0.00-1.06 sec 120 MBytes 947 Mbits/sec 0 730 = KBytes =20 >> [ 5] 1.06-2.06 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 >> [ 5] 2.06-3.06 sec 112 MBytes 942 Mbits/sec 0 730 = KBytes =20 >> [ 5] 3.06-4.05 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 >> [ 5] 4.05-5.06 sec 113 MBytes 941 Mbits/sec 0 730 = KBytes =20 >> [ 5] 5.06-6.06 sec 112 MBytes 942 Mbits/sec 0 730 = KBytes =20 >> [ 5] 6.06-7.03 sec 108 MBytes 941 Mbits/sec 0 730 = KBytes =20 >> [ 5] 7.03-8.06 sec 116 MBytes 942 Mbits/sec 0 730 = KBytes =20 >> [ 5] 8.06-9.06 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 >> [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec 0 730 = KBytes =20 >> - - - - - - - - - - - - - - - - - - - - - - - - - >> [ ID] Interval Transfer Bitrate Retr >> [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender >>=20 >>=20 >>=20 >>=20 >> For reference for the panic: >>=20 >> . . . >>=20 >=20 >=20 > FYI . . . >=20 > Based on updating to a official pkgbase GENERIC-NODEBUG kernel > from when cfg=3D1 was in general use I find that the > "iperf3 -R . . ." gets non-0 Retr figures that the above did > not: >=20 > # usbconfig -l -d ugen0.11 > ugen0.11: at usbus0, cfg=3D1 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON = (72mA) >=20 > # iperf3 -c 192.168.1.195 --get-server-output > Connecting to host 192.168.1.195, port 5201 > [ 5] local 192.168.1.143 port 30247 connected to 192.168.1.195 port = 5201 > [ ID] Interval Transfer Bitrate Retr Cwnd > [ 5] 0.00-1.00 sec 113 MBytes 944 Mbits/sec 0 488 = KBytes =20 > [ 5] 1.00-2.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 2.00-3.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 3.00-4.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 > [ 5] 4.00-5.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 5.00-6.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 > [ 5] 6.00-7.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 7.00-8.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > [ 5] 8.00-9.00 sec 112 MBytes 941 Mbits/sec 0 488 = KBytes =20 > [ 5] 9.00-10.00 sec 112 MBytes 942 Mbits/sec 0 488 = KBytes =20 > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate Retr > [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender > [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver >=20 > Server output: > Accepted connection from 192.168.1.143, port 20991 > [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 30247 > [ ID] Interval Transfer Bitrate > [ 5] 0.00-1.04 sec 117 MBytes 938 Mbits/sec =20= > [ 5] 1.04-2.00 sec 108 MBytes 941 Mbits/sec =20= > [ 5] 2.00-3.06 sec 118 MBytes 941 Mbits/sec =20= > [ 5] 3.06-4.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 4.06-5.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 5.06-6.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 6.06-7.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 7.06-8.06 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 8.06-9.06 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 9.06-10.01 sec 106 MBytes 941 Mbits/sec =20= > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate > [ 5] 0.00-10.01 sec 1.10 GBytes 941 Mbits/sec = receiver >=20 >=20 > iperf Done. >=20 > # iperf3 -R -c 192.168.1.195 --get-server-output > Connecting to host 192.168.1.195, port 5201 > Reverse mode, remote host 192.168.1.195 is sending > [ 5] local 192.168.1.143 port 30166 connected to 192.168.1.195 port = 5201 > [ ID] Interval Transfer Bitrate > [ 5] 0.00-1.01 sec 113 MBytes 940 Mbits/sec =20= > [ 5] 1.01-2.01 sec 112 MBytes 940 Mbits/sec =20= > [ 5] 2.01-3.01 sec 113 MBytes 940 Mbits/sec =20= > [ 5] 3.01-4.00 sec 111 MBytes 940 Mbits/sec =20= > [ 5] 4.00-5.00 sec 112 MBytes 940 Mbits/sec =20= > [ 5] 5.00-6.03 sec 115 MBytes 940 Mbits/sec =20= > [ 5] 6.03-7.00 sec 109 MBytes 940 Mbits/sec =20= > [ 5] 7.00-8.00 sec 112 MBytes 941 Mbits/sec =20= > [ 5] 8.00-9.00 sec 112 MBytes 942 Mbits/sec =20= > [ 5] 9.00-10.06 sec 119 MBytes 940 Mbits/sec =20= > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate Retr > [ 5] 0.00-10.07 sec 1.10 GBytes 941 Mbits/sec 83 = sender > [ 5] 0.00-10.06 sec 1.10 GBytes 940 Mbits/sec = receiver >=20 > Server output: > ----------------------------------------------------------- > Server listening on 5201 (test #2) > ----------------------------------------------------------- > Accepted connection from 192.168.1.143, port 12585 > [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.143 port = 30166 > [ ID] Interval Transfer Bitrate Retr Cwnd > [ 5] 0.00-1.06 sec 120 MBytes 946 Mbits/sec 8 574 = KBytes =20 > [ 5] 1.06-2.06 sec 112 MBytes 940 Mbits/sec 11 395 = KBytes =20 > [ 5] 2.06-3.06 sec 112 MBytes 940 Mbits/sec 3 333 = KBytes =20 > [ 5] 3.06-4.06 sec 112 MBytes 941 Mbits/sec 6 591 = KBytes =20 > [ 5] 4.06-5.06 sec 112 MBytes 938 Mbits/sec 24 152 = KBytes =20 > [ 5] 5.06-6.05 sec 112 MBytes 939 Mbits/sec 16 180 = KBytes =20 > [ 5] 6.05-7.06 sec 113 MBytes 942 Mbits/sec 0 600 = KBytes =20 > [ 5] 7.06-8.06 sec 112 MBytes 941 Mbits/sec 3 635 = KBytes =20 > [ 5] 8.06-9.05 sec 112 MBytes 941 Mbits/sec 0 730 = KBytes =20 > [ 5] 9.05-10.06 sec 113 MBytes 941 Mbits/sec 12 470 = KBytes =20 > [ 5] 10.06-10.07 sec 512 KBytes 819 Mbits/sec 0 471 = KBytes =20 > - - - - - - - - - - - - - - - - - - - - - - - - - > [ ID] Interval Transfer Bitrate Retr > [ 5] 0.00-10.07 sec 1.10 GBytes 941 Mbits/sec 83 = sender More experiments with both kernel versions suggests that this or similar scale of Retr values may well be without a normal range of its variability for both drivers. Both can get all 0 values for Retr as well. My limited context does not seem to be a differentiator for which way the setting should be. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 20:27:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbRQx5215z6KJwH for ; Tue, 23 Dec 2025 20:28:09 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic301-22.consmr.mail.gq1.yahoo.com (sonic301-22.consmr.mail.gq1.yahoo.com [98.137.64.148]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbRQv3HhCz441D for ; Tue, 23 Dec 2025 20:28:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=MoRTyqhP; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.64.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766521683; bh=kK+rdvRX7RS9vmB5phei3Jgx0tk9SuTKYSWuXy4p4AY=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=MoRTyqhPKPd8pF+2CqqMMA++jMX3dpp96tCuG1q0cgWSUgQEwgXqcLf83kjdvnHjIYbdtC/tHjNm1MhO3wPpF9td6VwWfe3NFvnrEh9cOdtXptzC17ON3BD86q59rNEgNatw7YIPQo9Wf/u0TplZpTlwo9zj6KqfSp9QV4ZDtvms13syoUzJYwnH+lIkywjA5LJU9tPHdLEk8n54fYGGy7omp3MqQrr/aPv9YbDKzzSOh+N+Rj1S237gAJ4YoB3BmWkIR18kXfNvEfWzRpE1F/YFdxK2KB8yt4yrQLImMcrhoRw4v3Uhy7G5ELZc7fLYj3WYKDlXClleBrvChlx3lw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766521683; bh=pMMCmjyKtUFLB3VQrKH7OpDcKTR5EW0EcuDWJaM/hab=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=f88OBc1KsEbVye9kyNrwBAeB04YdSqbau0lvsPYYGMZbnAYmxkQZ75DILbm7UHxE0wT9TsoXQAmlpAsQwoHNmiRHEIreFcYqPCTPRcw0oyh1kOeXQjgBOqEauqekJlgMrrHN4sHav0IfMqDY73dCtX9AQxWklXsBI+iE6RCYFUvuU8B2wA677T2pqD6HVbo7XZU/Dt8BKcr1gHJmjoasvNCUln7X+FFMxahuTYFk41zNHixLm1mPz5Jpdn9q4jWpLNMCC4B0sP6Nqv8i+xb4NIIFgEYwRRXBbpWRdhSj3QT9f4jbGLjE1y2yXfrGUCso52WH2NAG78rH07xcaCnEDw== X-YMail-OSG: 2t4AYawVM1l2XIfreyZB7YLluLi4HJc3Vbx_ydZfbUpAldERs08YwY48nxChEzI rCGI6X4SIF8kNocdR3ajf6kHT7UG2RDAXepxbWv4tIQMoiM1TtcpzvULAiSbspwFCUClwuQNI1rW sfAC41deHXZ2Ojhd294CJ1CQAU.0xak_uG5SNk6cFVf9OVz68a4kqcXe9zgcqqspntU6KJkYIizR a6WrvYnycj6a1YGAKTLSlTO1m3sn6CyjzI_af_lUZToppNQQj7SwuNzBjdNO.9x6u7QddSBBritI GbMjmWifnX5cPYllZfzn83eLSYawcVxziGJrPyFd6XEA6236zDAbFSjy79eAzFm7fGWZU2gSGxdM RgGH.FmBzO0Je7iHjAslhM7lAmVrSaGeGc44NLMldEWJ20HGJsI_dSimD_D4s8k13rmgbZGt7XfT 9DNZ5BVFebA1vHjLJew4e8p.GQ_AB4SJ9OUJs9UV4BqsJSfJyx1E76MDruEmAx3xwOaOYZqVc_aM dVFVUsclwRaJO7PDMxS2UPvXoQuLJN9WIoS_rwA_dvDkB_3okTZ.L1N_wOiC61_yyi_vt7W99uzw vnniDOUAEFwWLmebzCKRuT9Z1iEtes_3TrgaQZZsrtxJyvzZHn34oqq_U_8LG8f4WbcZt6QTmhoe H4kNF_9d3shL5aicJIgA0pjllxuQpFUwKU.kn6VKDBNB3Jqm0QWxrA_t4zi.pwfmsK54yFShSze8 SPmL.VYfQP8ssbGJG.bvEpFCpYXDJGLj27DasphadSamq3c5NAeGO9bG2qmDnLX0WW54kmm_8aBo 09Qrfia490ddFug08.M3Luy0fYwL5CvT5y81wVaOB0V8OFx_1sfwoNCPli6Lm0gjQOjdQavX53eU zS7AXvoGWPgTWoRsFaFxs8dirxQhpfAMaC1qOxyjFYbsIUY.WZpVnZjU1l6U_BtW_18GHwxkPFEn PCePPO0_w8P8H50fDGBpoZq_PfjH1Fx_u3qrjKmfm7tI2ikDVUyxYe16gMXthPZp.j.Zw2IGoxqn fA8Cj7ThAktdKcYdVR9s3mEMW5sTZ0.YptEZvLszAgeA6uK.SMTId35tdTPRoLV6n7gsYfWPl0fH Kz0naqQ5JdqOpW8zICsyh3rT_Mvi_1rHJrbFVqNm2X7AfDMobwfu8E7ql6LcSwGzrxHV0uH0o4Mf hawv6paMyPMERhXRl3LOPDrqt4juESXhkML5BWsmwPZHhfmzwLLYU2QR4JrmOjU9IokO93YSV4QL MdcXpdlI57FpXaXkw9ii2U6v4y3kZiSCf57QLM6gU4Oek27CcSDNBkPo_o1OCxjHlGpVgw.P1sti RVpqsfb3okxR9LrxAf.XFk4A72BxtiR0mqZtSSmpqf.L6TqPRzfGxgv.LBCzDKAGNRzDCXf0qtmR SeU8PNSapekzQUVqM7JUInRg4TTLA5k_yEl5yXHV2_3ymbxVrld3CzEaf0jG56h6p0Gnb.UE_JmZ PNClng9Jfy0m1jBKJV166Wt18hLES_uwLNXGV.aCe1QnoGOAxGBmRhM69kdG7dmRsDoK7IdwWHdu YZmfzebz_xI3N2U6r.4iCf46nAue9hiW8ROrf0qYIpVrPrvZoqGK4Nx18skNQ2GkjKnBSofaQnba 8.oB5VRugX.KOeEE3ccZsmn7pHWESVW5uRRb6YRdnQKCoYF3vfv3jQM8UJB4bAPELsTM9ZrjmeBg 6RTBPPW_3xRmrFWIFue.RMBezAmZc45XNqlTN3p4cFCKQDgnGoft_7cVG7D_yU_RghsF09AY5oFE ikjfsKhUsCZqORPG.4TBrJZ0i1OaAISEYwFtVqsHHG1_x_DWors8qBrQmYI6vsFTzXePc0TYJvAQ yY3HmYW6.9Xgf.z3EaaummJIEzJmbSqNMfvS6Z9o6YZLZghnHVX0Hz.G_1YfCmvy4AUwdJcrSpY2 bbw4uC3IzRpt4UQXwwpc95eLMMgL43V8XSQGjVj2FXejmz_frr6722OwcP_QIC_HJANm6GSF5Bfx dZzGKsRj0B9AoBHIAzX0rPnv24i.J9wX4r.kzUjdyA2gm50igxwYOl0QYrfoCjDyPENSTUyGlmVz u5J4Fhu_a2q2X3OKxeQj_RWGUET2v1ZKxL28RZLFeLEtPm.bxw8.z9dcvdmKw8KJWZy6_yl7hQnD mepEH9QkZkr9DW9sojjlykeN_bLqQr2IcTeQSFkVLyFFahexINkBi2acEfVUk2vy8xaNF8bDBVRD n5UGgmbI15uYye6umjpSYz5BGa.E6f_oJ9AX1QfjHHeem6z5HvOmv9J.7VjwqOj0pyWRtx96d5xa 805bbb7Se X-Sonic-MF: X-Sonic-ID: 5749b845-d94b-4c73-b1e3-720ef490f8ea Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 20:28:03 +0000 Received: by hermes--production-gq1-54bf57fc64-8j6k2 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 430f8016a8a3e9153a5716f4b0bbca3f; Tue, 23 Dec 2025 20:27:59 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 1b1fb628a1af - main - Quirk Realtek RTL8153 to config#1 so if_cdce claims it. Works much better. [dongle used on RPi5 does see a sizable performance difference] From: Mark Millard In-Reply-To: <59DFE4B5-8B87-4925-87D4-B7EA938D77B2@yahoo.com> Date: Tue, 23 Dec 2025 12:27:48 -0800 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: <59B02B50-E04F-45F1-B0DE-911782CD8A2E@yahoo.com> References: <6C34DEF7-4266-49BC-8711-7D5CAF2301F0.ref@yahoo.com> <6C34DEF7-4266-49BC-8711-7D5CAF2301F0@yahoo.com> <202512222336.5BMNa9mH004409@critter.freebsd.dk> <202512230807.5BN87N5I005750@critter.freebsd.dk> <8407DEE0-CD16-419F-B373-EC704F04FBFC@yahoo.com> <202512231629.5BNGTbdU011559@critter.freebsd.dk> <59DFE4B5-8B87-4925-87D4-B7EA938D77B2@yahoo.com> To: Poul-Henning Kamp X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.95 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; NEURAL_HAM_MEDIUM(-0.95)[-0.952]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.148:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.148:from] X-Rspamd-Queue-Id: 4dbRQv3HhCz441D Instead of the built=3Din Ethernet for the Windows Dev Kit 2023, use of the dongle on a RPi5: cfg=3D1 . . . # usbconfig -l -d ugen0.2 ugen0.2: = at usbus0, cfg=3D1 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (72mA) # iperf3 -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 [ 5] local 192.168.1.161 port 17559 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.00 sec 22.0 MBytes 184 Mbits/sec 0 487 KBytes = =20 [ 5] 1.00-2.00 sec 21.6 MBytes 181 Mbits/sec 0 487 KBytes = =20 [ 5] 2.00-3.00 sec 21.5 MBytes 180 Mbits/sec 0 487 KBytes = =20 [ 5] 3.00-4.06 sec 22.8 MBytes 181 Mbits/sec 0 487 KBytes = =20 [ 5] 4.06-5.00 sec 20.2 MBytes 180 Mbits/sec 0 487 KBytes = =20 [ 5] 5.00-6.00 sec 21.5 MBytes 180 Mbits/sec 0 487 KBytes = =20 [ 5] 6.00-7.00 sec 21.5 MBytes 180 Mbits/sec 0 487 KBytes = =20 [ 5] 7.00-8.00 sec 21.5 MBytes 180 Mbits/sec 0 487 KBytes = =20 [ 5] 8.00-9.00 sec 21.5 MBytes 180 Mbits/sec 0 487 KBytes = =20 [ 5] 9.00-10.06 sec 22.8 MBytes 181 Mbits/sec 0 487 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.06 sec 217 MBytes 181 Mbits/sec 0 = sender [ 5] 0.00-10.06 sec 217 MBytes 181 Mbits/sec = receiver Server output: ----------------------------------------------------------- Server listening on 5201 (test #5) ----------------------------------------------------------- Accepted connection from 192.168.1.161, port 11778 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.161 port = 17559 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.06 sec 23.2 MBytes 183 Mbits/sec =20 [ 5] 1.06-2.04 sec 21.1 MBytes 181 Mbits/sec =20 [ 5] 2.04-3.04 sec 21.5 MBytes 180 Mbits/sec =20 [ 5] 3.04-4.05 sec 21.8 MBytes 180 Mbits/sec =20 [ 5] 4.05-5.05 sec 21.4 MBytes 180 Mbits/sec =20 [ 5] 5.05-6.05 sec 21.5 MBytes 181 Mbits/sec =20 [ 5] 6.05-7.06 sec 21.8 MBytes 180 Mbits/sec =20 [ 5] 7.06-8.06 sec 21.5 MBytes 181 Mbits/sec =20 [ 5] 8.06-9.05 sec 21.4 MBytes 180 Mbits/sec =20 [ 5] 9.05-10.05 sec 21.4 MBytes 180 Mbits/sec =20 [ 5] 10.05-10.06 sec 256 KBytes 270 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate [ 5] 0.00-10.06 sec 217 MBytes 181 Mbits/sec = receiver iperf Done. # iperf3 -R -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 Reverse mode, remote host 192.168.1.195 is sending [ 5] local 192.168.1.161 port 16101 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 10.8 MBytes 90.2 Mbits/sec =20 [ 5] 1.00-2.00 sec 10.8 MBytes 90.1 Mbits/sec =20 [ 5] 2.00-3.01 sec 10.8 MBytes 89.8 Mbits/sec =20 [ 5] 3.01-4.00 sec 10.8 MBytes 90.5 Mbits/sec =20 [ 5] 4.00-5.01 sec 10.8 MBytes 89.8 Mbits/sec =20 [ 5] 5.01-6.06 sec 11.4 MBytes 90.3 Mbits/sec =20 [ 5] 6.06-7.05 sec 10.6 MBytes 90.5 Mbits/sec =20 [ 5] 7.05-8.04 sec 10.6 MBytes 89.6 Mbits/sec =20 [ 5] 8.04-9.06 sec 11.0 MBytes 90.5 Mbits/sec =20 [ 5] 9.06-10.01 sec 10.1 MBytes 89.6 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.01 sec 108 MBytes 90.4 Mbits/sec 0 = sender [ 5] 0.00-10.01 sec 108 MBytes 90.1 Mbits/sec = receiver Server output: ----------------------------------------------------------- Server listening on 5201 (test #6) ----------------------------------------------------------- Accepted connection from 192.168.1.161, port 28224 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.161 port = 16101 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.06 sec 11.5 MBytes 90.7 Mbits/sec 0 146 KBytes = =20 [ 5] 1.06-2.06 sec 10.8 MBytes 90.5 Mbits/sec 0 146 KBytes = =20 [ 5] 2.06-3.06 sec 10.8 MBytes 90.1 Mbits/sec 0 146 KBytes = =20 [ 5] 3.06-4.06 sec 10.8 MBytes 90.5 Mbits/sec 0 146 KBytes = =20 [ 5] 4.06-5.05 sec 10.8 MBytes 90.5 Mbits/sec 0 146 KBytes = =20 [ 5] 5.05-6.05 sec 10.6 MBytes 89.5 Mbits/sec 0 146 KBytes = =20 [ 5] 6.05-7.06 sec 10.9 MBytes 90.1 Mbits/sec 0 146 KBytes = =20 [ 5] 7.06-8.06 sec 10.8 MBytes 90.3 Mbits/sec 0 146 KBytes = =20 [ 5] 8.06-9.06 sec 10.8 MBytes 90.5 Mbits/sec 0 146 KBytes = =20 [ 5] 9.06-10.01 sec 10.2 MBytes 90.1 Mbits/sec 0 146 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.01 sec 108 MBytes 90.3 Mbits/sec 0 = sender iperf Done. cfg=3D0 . . . # usbconfig -l -d ugen0.2 ugen0.2: = at usbus0, cfg=3D0 md=3DHOST spd=3DSUPER (5.0Gbps) pwr=3DON (72mA) # iperf3 -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 [ 5] local 192.168.1.161 port 25933 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.00 sec 112 MBytes 942 Mbits/sec 8 470 KBytes = =20 [ 5] 1.00-2.00 sec 112 MBytes 941 Mbits/sec 0 487 KBytes = =20 [ 5] 2.00-3.06 sec 119 MBytes 939 Mbits/sec 9 488 KBytes = =20 [ 5] 3.06-4.06 sec 112 MBytes 940 Mbits/sec 9 486 KBytes = =20 [ 5] 4.06-5.00 sec 106 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 5.00-6.00 sec 112 MBytes 940 Mbits/sec 10 486 KBytes = =20 [ 5] 6.00-7.04 sec 116 MBytes 938 Mbits/sec 7 486 KBytes = =20 [ 5] 7.04-8.00 sec 108 MBytes 941 Mbits/sec 0 488 KBytes = =20 [ 5] 8.00-9.00 sec 112 MBytes 940 Mbits/sec 7 486 KBytes = =20 [ 5] 9.00-10.03 sec 115 MBytes 941 Mbits/sec 0 486 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.03 sec 1.10 GBytes 940 Mbits/sec 50 = sender [ 5] 0.00-10.03 sec 1.10 GBytes 940 Mbits/sec = receiver Server output: ----------------------------------------------------------- Server listening on 5201 (test #3) ----------------------------------------------------------- Accepted connection from 192.168.1.161, port 49403 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.161 port = 25933 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.06 sec 119 MBytes 937 Mbits/sec =20 [ 5] 1.06-2.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 2.06-3.06 sec 112 MBytes 939 Mbits/sec =20 [ 5] 3.06-4.06 sec 112 MBytes 939 Mbits/sec =20 [ 5] 4.06-5.00 sec 106 MBytes 941 Mbits/sec =20 [ 5] 5.00-6.06 sec 119 MBytes 938 Mbits/sec =20 [ 5] 6.06-7.06 sec 112 MBytes 940 Mbits/sec =20 [ 5] 7.06-8.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 8.06-9.05 sec 112 MBytes 939 Mbits/sec =20 [ 5] 9.05-10.03 sec 110 MBytes 941 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate [ 5] 0.00-10.03 sec 1.10 GBytes 940 Mbits/sec = receiver iperf Done. # iperf3 -R -c 192.168.1.195 --get-server-output Connecting to host 192.168.1.195, port 5201 Reverse mode, remote host 192.168.1.195 is sending [ 5] local 192.168.1.161 port 37464 connected to 192.168.1.195 port = 5201 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.06 sec 119 MBytes 941 Mbits/sec =20 [ 5] 1.06-2.06 sec 112 MBytes 941 Mbits/sec =20 [ 5] 2.06-3.03 sec 109 MBytes 942 Mbits/sec =20 [ 5] 3.03-4.01 sec 109 MBytes 941 Mbits/sec =20 [ 5] 4.01-5.02 sec 114 MBytes 941 Mbits/sec =20 [ 5] 5.02-6.00 sec 110 MBytes 941 Mbits/sec =20 [ 5] 6.00-7.00 sec 112 MBytes 942 Mbits/sec =20 [ 5] 7.00-8.00 sec 112 MBytes 942 Mbits/sec =20 [ 5] 8.00-9.00 sec 112 MBytes 942 Mbits/sec =20 [ 5] 9.00-10.00 sec 112 MBytes 942 Mbits/sec =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender [ 5] 0.00-10.00 sec 1.10 GBytes 941 Mbits/sec = receiver Server output: ----------------------------------------------------------- Server listening on 5201 (test #4) ----------------------------------------------------------- Accepted connection from 192.168.1.161, port 16691 [ 5] local 192.168.1.195 port 5201 connected to 192.168.1.161 port = 37464 [ ID] Interval Transfer Bitrate Retr Cwnd [ 5] 0.00-1.06 sec 120 MBytes 948 Mbits/sec 0 730 KBytes = =20 [ 5] 1.06-2.06 sec 112 MBytes 941 Mbits/sec 0 730 KBytes = =20 [ 5] 2.06-3.06 sec 112 MBytes 941 Mbits/sec 0 732 KBytes = =20 [ 5] 3.06-4.06 sec 112 MBytes 942 Mbits/sec 0 732 KBytes = =20 [ 5] 4.06-5.06 sec 112 MBytes 941 Mbits/sec 0 732 KBytes = =20 [ 5] 5.06-6.03 sec 109 MBytes 941 Mbits/sec 0 732 KBytes = =20 [ 5] 6.03-7.04 sec 113 MBytes 941 Mbits/sec 0 732 KBytes = =20 [ 5] 7.04-8.04 sec 112 MBytes 941 Mbits/sec 0 732 KBytes = =20 [ 5] 8.04-9.06 sec 115 MBytes 942 Mbits/sec 0 732 KBytes = =20 [ 5] 9.06-10.00 sec 106 MBytes 941 Mbits/sec 0 732 KBytes = =20 - - - - - - - - - - - - - - - - - - - - - - - - - [ ID] Interval Transfer Bitrate Retr [ 5] 0.00-10.00 sec 1.10 GBytes 942 Mbits/sec 0 = sender iperf Done. I'll note that the RPi5 is booted via a draft EDK2 version via UEFI/ACPI . The draft does not publish the built-in Ethernet. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Dec 23 21:04:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbSFC4LlXz6KrmH 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 4dbSFC3Zjqz3CPb 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 4dbSFC2mbyz1RNT 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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 Tue Dec 23 22:28:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbV5h2YB8z6L07G for ; Tue, 23 Dec 2025 22:28:24 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-55.consmr.mail.gq1.yahoo.com (sonic315-55.consmr.mail.gq1.yahoo.com [98.137.65.31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbV5g5d7Qz3LpZ for ; Tue, 23 Dec 2025 22:28:23 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=Ir36S2Dv; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.31 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766528896; bh=UV45l47WNfVTV8KB1SO0XWFZcoANnMtbqUU2AtehGYg=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=Ir36S2Dv/AnM+ha7b0Blj+kz4Fr0wTCI8DwagVCP2/mH4w6jEP1RouB8VGQISEOZBpUcN7s6VeWkFYp9ttk79z9HzGvLd/0ugxNqMLJ5T7NiRkyY5FULHQOsiqBrX4F1uwFyr7HdWhiChJni0ZBa8t4liQjpKktwd6LrsAjXMbCOA7ALQ1pv6cONXCuFUSAoy50GIwe6jUyPpGWvLlmf5Lutit+cjuFAZzxyAtS0SmNjocoO0depdr4pTgwagxrmUb/haNhfN7rJsZEcSIX27Sk2WNBofTcz8DtpPSBZkU7tQkIKW2ou30K34iT/bzgnuwQ7CnKK28Bjq8BxweCWpQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766528896; bh=FCALlJeMjUiWzeCOTLwU6Xq7DF++owXYySZEiDGaqNK=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=sgPMp1Q7HoDiFwmWl3pPSPNQipULsqISNx8vAvOF0whFgBwPH0IScx6GI+g844wCoVa560N9U/Tu7weTcMWlQDwHS/4k8bf8eWALioR3/Ejp9o+bsEm9R+tE1dg69MgkPNbseAnOlvqGixqhf5AuI3Syj57eHQmi0SfXkMLKKQhYpfe3yy//7quw580sy9NbI91zAbhGG7Qdvul1/9oB+KQtwr7OSqg13CE59UXlqAUrswfHDqnxcH//87mNZHHrwqO7uCMVpWYdDOHkTw/DXa7icP2WrpzLBrUuF2VxZO9ctcEWCSmZkJS2rSCv7r+Od0RH8MjAPd7sXLOcCYNVDw== X-YMail-OSG: icSc.W8VM1n7WMg97.FgFnSIRcJmkxskJLEyXpkfjAH0vroL3n2YEmxf9X525.h j.qmO8.IOmtrikVtIRthlahyiwjl1eNgUggQzAcE7iYCk1MMSa8bskc5yNze_wFo.4hegPh5y1y3 tkYLNrotM7KfUoRqjfpMkRHV4_F_r7Z5JPorRBZv9VJ0iLKUZ6UuEVKhU.PjIa_DRcAghIJzwgmk X6zFPfK8ADNVOw.R5vS5pmheQYeY34S4H_z4f1uYG5W5p8CcQH8X7xUmM5U76doXNaERCbMYrCA9 M1IB8l6uBAB4PlyOL0g7s8q3bgTwt0o7jsnu2KXHDmHW0yNrVvuBXey3svJkUnLFfhdN8Vgb_HmY JqmhwVtyniV0.CcvY69E7_KnIjDU.fynbswOc5UheEgYBisCsis2pccHc4poZl2oQ.dmECMCPFoh eIs3vgONkh9os92osCJGFYLyax9ispnxGwu9_iAMXoXVgTa_aVvCo9H9jgfOVtpwdWZudLgpgpkn I10ur.p2zC_xYz1E6yLJQLrRdEh5AzBxm1hvv.QgBFQ7r1OqMm0P7IpnuaJQvYqmE536GG0IVXWG .3IT97C4pWdbFuGLiumTsXe5WsDs1U05r1NHqPwlhUsVHLbmbWEqRm2lzkujLpobUK6zF38dicsS J1oZZde6XGXwTUOt4MTJ_qyJYOh8iMKwQN7_W_KMLtY0Hrnaa8AptL19RwDCTOV8z5cND6PS7gTv vz2OrONd4Fa8egta5uOr8qj_3pAIoA6xqfzJoDcz8gyDnj9Qycs1knT_VLk_IO5bNL1eq4EVZmFH FH43VD7p1ZlRwl21ERJb5pyI_PeQA058G138BRZpDa5AwO9rb19PYAI0bU6_cqL27Y8JgkAGTtp8 bc759ZcZw9EkuzuMET49kqdBHjuXtVdGqBr5zHwN1zRD6SSeUvh14ypubINbjShXCuM2hsQr7JpU pxaMpyRFk4LCY.x81qcOlmQfFCiZRKma5RyHLdtGps.71qzOguitlYo9JsL0A2T2FgKeMO5exFTP gSSXx.ARm2YvHbSBwFdkO_fnBobBhND0Gcy_GDk2cN_SFQ9ZlP3QC9OsA.31xrnXBfJP.O_OMqC. kX6tZQLdwjiDEI_6GhJ9KbwjvCvkpLIX__59sEanqniYqHGCuiwbnUuRVLix.9H_G6yz5RJ7nuE9 xmD21AJHsnauh_5l1E0GSr4aa45DOL4K8e8BokKm1Ue3ZclEkFY.PZCNu6mGfVxdBPYlkUyNKUd0 YKtWe_1o.D3pheaVOcjSCAYGTo_Hjti6x5Rv7PjsQWLfT6P3d.WnaJiOeSSdmQi1fs3ZaShz6XBu 3ae73VqCOzW6nRN.gAMb87Ne002KH2Qt0ELq3Y9kqkARBMHLE41fD.IlOzXuvg_PMNvdamTSFrbw JOLsCuP6AiM6IdQ_JBJeda57cetrl63xkyGzbgKN3HDEbJoleC9IHmVWOVzfyfbEuJaZOt5ZHlwA QdIxrl3fSxhlnPSXHjZVKl5J68jwnJCy4I3.IGXOLdz92AT_ZaSS6EcBf4uobWrnm95d.OlT0Zt0 HP0STX3O2kYRilEtuCuqW7ab8SM9npABc.u0wv7GEMDscho8QnPpQeLyKXD6m8AFJ7hKZGFaKU22 O_T8gzB6zwNXrNFjeuIoRBs.Q6sY5HIzC24JwxlE2Xkg639ICyu.08U0d1vnuedMnddaL1_.Zn5k 01jIkm0K0BE1n9t1hl8F6D6uxoPotRwUJuWb3IZ.YPdl0LfJp3w4nKci3MgVXEM1lZIRNxLCzZTU cu1pmcKQpYEaXEUNfU9bk92wHa4_t2QZJz_i7Y02uAuf2AnNyl_1wmqqWGWIXczXg9ytWI8CHSRE ih_5l0k49_.MDLJRKM.K1SX8ty4uCMmZvw2aabVzUWJ0rzLazVbaYSBIzxD2OipAHcYbxKaTy8Az dxmnDuVKnhL62b1O.pvurstMAt1sgMyqozgAooBnJk6A62x5L7IHrx5w5S2Gh3.z.3Q1gaj7phdq ldRAOPkbUyF6JerkP1EjIQihi_SOJxPKGxFhaGF6d6h3dALm8Xl8JJbhxS8W6LmiUmbjbzzo93a0 7sHL7sPy67jUeeKVKCBkGm49FHAuSCVB9W4ilk86CEFRp1DlhzrNNeib21k78CLGLz39iB2uUAMK 2iDz2OmdBE2EgV._EH0mFI8z9iOlvkFaVTaSEoy7DU9s_TOciR46xsRT8OLLey2cA4uberR8uq60 aLqT2yHLI3WMrcKAl_Mh0.Waqmubem0Og5pQa.B8jvVZNW5Qytbe_nFQ7F7ujsq0KJ2e1lG4YW6e 5G9da6l.vAiPbdkrdWsTB1taF0DQ- X-Sonic-MF: X-Sonic-ID: 07f86be0-6f9c-4540-a9c5-f516b21db5ef Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Tue, 23 Dec 2025 22:28:16 +0000 Received: by hermes--production-gq1-54bf57fc64-fqp47 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 71d5bdbcaff9a4b5badd8a6dacc69f6f; Tue, 23 Dec 2025 22:28:13 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Message-Id: <5AA66E35-EA0C-48D4-A0C1-F84FAA18D5FC@yahoo.com> Date: Tue, 23 Dec 2025 14:28:02 -0800 To: Dimitry Andric , dev-commits-src-main , portmgr@freebsd.org X-Mailer: Apple Mail (2.3826.700.81) References: <5AA66E35-EA0C-48D4-A0C1-F84FAA18D5FC.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; RCPT_COUNT_THREE(0.00)[3]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.31:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.31:from] X-Rspamd-Queue-Id: 4dbV5g5d7Qz3LpZ Dimitry Andric wrote on Date: Tue, 23 Dec 2025 21:08:31 UTC : > 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 >=20 > NOTE: toggling this option requires a full clean build, at least until > https://reviews.freebsd.org/D52011 lands. A significant question question here (after the MFC activity: for more than main) that is especially significant for the ampere* port-package builder machines (slower and few of them vs. the number of types of builds) but also for other of the more time-taking builder machines: Will the poudriere port-package build jails be built based on using WITH_LLVM_LINK_STATIC_LIBRARIES ? (The boot kernel and boot world are not the issue.) The performance difference between 14.3-RELEASE and 14.3-STABLE jails is large on aarch64 in my testing. (No such comparison is available for ampere* builds: no 14.3-STABLE build history logs exist to compare against.) 14.3-RELEASE predates the shared library change. 14.3-STABLE currently is using the shared libraries (before being shrunk some). 00:09:18 14.3-RELEASE -> 00:12:19 14.3-STABLE, ratio about 1.32, for = cmake-core-3.31.9 on the Windows Dev Kit 2023 (using all 8 cores) (Those, of course, ares not matching contexts to how official builds are done. But the above avoided any jemalloc 5.3.0 involvement in causing the time ratio observed. Comparison and contrasts with 15.0-RELEASE do not avoid such. I could build other examples.) The best match that I have for ampere* numbers that is using 150arm64 builds and 143arm64 builds: 38:25:51 14.3-RELEASE -> 53:33:46 15.0-RELEASE, ratio about 1.39, for = qt6-webengine-6.9.3 on the ampere*'s 15:24:24 14.3-RELEASE -> 21:26:14 15.0-RELEASE, ratio about 1.39, for = llvm21-21.1.2 on the ampere*'s 15.0-RELEASE has the toolchain programs using the shared libraries. These sorts of figures can be explored from the official logs that exist --but 15.0 has more differences than just use of the shared libraries by the toolchain programs. I'd consider time ratios of 1.3+ significant. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Wed Dec 24 00:27:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbXl01q1rz6L997 for ; Wed, 24 Dec 2025 00:27:24 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-25.consmr.mail.gq1.yahoo.com (sonic312-25.consmr.mail.gq1.yahoo.com [98.137.69.206]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbXkx6GTBz3YKV for ; Wed, 24 Dec 2025 00:27:21 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=KRSUnSq0; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.206 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766536037; bh=ncdDoBWU9oPPjXKKAoeXQzO3LQpgMKRsjpqUsvNufp0=; h=From:Subject:Date:References:To:In-Reply-To:From:Subject:Reply-To; b=KRSUnSq0UnmtXdwDFRuXZnG/pmkCBHKjdJB0wmOzCZsZfjDyNu3Q09Fr7NjwxNbSwrGCkzWYTMfGTLOPkjJ7z72Sd0aSFVdD0uEs7YCNicxhiOyFOE/eTWD5jZwUgxOuVroaqaeoNJtVVjfbPttTU9kKomtx34SA63HwVlAKseqcwW9HjgZVzk26BPAKkjy7v55apuwtUzZ1fhlT3bspmqgQLb9pSGD//hLbmcxO6kTHBP9guZAAcIEEew/Qp23jTwsw1Q4R5FM3jf2+PHwVLiFhBChwGhwhjLUZq2m1PdUNm7l0cHOYBFctu4MmSutxVCabcoyRUZOFha7tohEhUA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766536037; bh=pBS+ty5CwlNboSbDBjst3x8C6lgtv07Y5TyR4q+uB+e=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=JgNPFV2FniqOOr/ORBO389uyxpPR1YGUDIsZn4GGTeYW8LD99URZCySgfZ8fM+6kopu/O9nsNCOdUmEWq9FqD8vK8h3BBqcFSxs9JpkJ7IhZrbrzynoIw+mrIzby56SmOdAMfjJ4wcI1CsydYEfA5Fe3+0kP9SV6+mwe+HhbHRZNashE4E4gsE6C5RW8xmM38mutj07iYhDSGLIxkaETT60TsVjEW+tbPETI2ROcTHOkh8kx9VkXRSXZYNvjb6hXgIW9mzXNPsowPk1+MMUZLz3KGlsCsfsFRyBD7GYQjpitYJVFIRdKmSjVir6mndR3mu1GsNhwYeGZPXqOnYtJTA== X-YMail-OSG: .BmselEVM1m6Oguhzs2ieyI_VFwNBjdZNy9S89W3j_TfeHO47jdrY9VP2MfrleK ZjICX92Qrq.oImlFAiIJnSfT2qnMQeQFKZ_UF6474ViIy3jcfzI_snztg6CpJT0rq7x_ySmYEkAw 1Z.hhnExAQE3oTYCkCDHrmbpnZq1r_I8SwO5OjM1pELTiTwAKHoLbjIhrTg0xud_kg4flwgKkzaV uEKnqqXy6XuYgtTU31uVWvcZmOEQWqq.W32.pOKK9ZZGjFRiAEwljFNqRPqqzJisdnL2jUBV9lBA 4mk63W5VXKykmjc3c00Q4q.l.nwszryS8uQWxoOtOexjSruPxOVwb.QzjdLfbW5tCMR4SCz4WHgr rNkVpcQ8JV46KFdb4Q1zaj28yPoceAKrzWDCOYCV00_OnMBLUiPDFgG3.GQrENDr6huKJjyEPhKS Z4KpvDFrW4rupocUwZY6HE0WFwcVr6hX4MfaFKt7q0700V6oT0wsAxc_Lh.2a_5jcj3.7y05PmWt M4tAKFE6a1lJmw2QvmbeBqEMTOP1uozq4uF.v8gg1GM3f1Ls1qXYf98yVJLDh6fmlLSGxAgb6pmH y7sv64nqpx8VGkXhSesa4Hw0XiCAXUfU8bG6B6MRJ_2ku4xCjV2tpSDB7YP17Ma6z9cd.npyBJ3T yacZ7lhOLiWMXGIVKh4O5vFhouQYKs_qCtEFrMYMysa7iGtBJH.zcIRKA6aUi352uV.NckGkMSLo YZx9QV_VNtCCggMZwznCsCmOXfXHl3jAX3JKOqRWnARcNrWDVSxjUsjWdc0UnrTcqHTY9KUIJmAM g9Sn37oHnQ1KGcQLYbsEGC4UZyKgRzVfYB4vyYVjk7klEeX8_fQNsLl37SA5ze_zmv6cGwd6uXvF r_v8HzoWLffYGu2_ItT8STpIHghrjfuRjigWbMBstP2c7zLenxOc1GaiYmcaRJDppl_yWhLT_XUV NufyBiNjeZMZ9Ipw5TEFXBUAktEc.n0xwkP6ts.enAba8YAzyI2i0yEUHRtAmmAIyqq5_S3mH6xD pgphTu5W1BDU77s2zJEwzXDtr.xZSFsCsSjVyNNH5L3jSdYHlxXkXov2vJKbd1lHjJPWwpY_S0lr HQaJd1b2yOxN7zhApg5bD5piNT4n3p9T12GXcnIVqh3OnsPVx6jPUj02rf.zstlc15L1UUFn2ypg Qv.DiU3p1NR9u2q0rA0ZVb.xgtQbMlCaKCEtsd6lI9JGvGlSovpgWd3Eo5R2oKg0y3xwArevhRcW f0wyb6YvERu.OhBjucSkCeeBmHA7yE6t9e2EEC9JBq7h_TBHP3g_inaZb3I__gC904orEM0xc5PU wrivXxlfhaMHCqIT.emOjYRhuWlfTNJzIJrL4_MypwVSdOhGhh4XYRGDeW34xDq9xpD6HWr67KX7 iTQhXp_JU91eMg_frR9AvSKBkEws1wtxSXalv2sDN9mhVNPEsm3p5UIbkQ1lhimHK_NtSs.R5BxB sV6d.o5aO8kre7TQLWiQMVTVZMT58HcRvVSyhvqqim2G5pR8aJTvgrEPECXwJwOEqKyKmirE4oVR wHf0N_YWe2OSkzBvq.OsGUmv9z2yTTBi_pGjsLad4TQHrFQ0YSon.hkb.Cn2xE66nNKxWwto3xOq af09uYSI9f7_12nBBKZNJJv9lanBlh7kJrS5ZPHcwXASyjdV9gESwQXwpcSqVjVrMhTHjjLhHzRr l04pX7OjhwBAHcZAo0iA90pYNG70r1ZAWC1FMARWYcfMcUjeEBdQjU5A7Bar2ZLYY27XhxuT6Q4G qvrKrKZtxzNuKu2ZdBSb3013SWpq_bP7waWmUoOlMnRnOvI2xn.7mJn3SWkvdFkaGt8tY4jRmtMQ LNaLfSiIWpZuNttwA_e42c4BjncpQcNv.h8OooBbC4OXciX_cePC7Vtg_rUKVHSw7cI5gj7FSLa6 hyWpwzfXU6.29Tq48MvRaA1l0Bgor7N_E_PleHS3kxWaBuRTus38Wo88MGKzufJra9CN915K1uZL 4Eh8DrG2uQcafDH3b8nchbtB6rZ1L_3zpcIkJrFgsqNe.M0ykIW_vS_9bveHRYA5JWZoZCqJ2kKp gYCOkJjWutDv2hdjUUth43FZOACzvGqcyqkXV8vnkB7BrmeGIvElz15gDJuJYfA5EHRewNqqVli8 z9XdRzGFAEGW.0mbEGOOCYc.4aRnrbx8HMyUDzGkYWfRyOBYGJlgCHcRd3dZE6hLoP2vpulqL.Vn otLYYl2BR8Kc9FBG1.2HuVuCzPYHR0qnAdB8ttqJb8Axe9SBZFQCWwcpFNMq4PWOTwFcFj_TZKeX cU88IyCApeqNF7sQ0qYKAkO5pgw-- X-Sonic-MF: X-Sonic-ID: 31f92eea-9454-4ece-9815-6f55adbc8dd7 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Wed, 24 Dec 2025 00:27:17 +0000 Received: by hermes--production-gq1-54bf57fc64-r4hb5 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 81abda61600f6be549776b9076ede795; Wed, 24 Dec 2025 00:27:14 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Date: Tue, 23 Dec 2025 16:27:03 -0800 References: <5AA66E35-EA0C-48D4-A0C1-F84FAA18D5FC@yahoo.com> To: Dimitry Andric , dev-commits-src-main In-Reply-To: <5AA66E35-EA0C-48D4-A0C1-F84FAA18D5FC@yahoo.com> Message-Id: X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.206:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.206:from] X-Rspamd-Queue-Id: 4dbXkx6GTBz3YKV [I've dropped portmgr, having already sent the one message.] On Dec 23, 2025, at 14:28, Mark Millard wrote: > Dimitry Andric wrote on > Date: Tue, 23 Dec 2025 21:08:31 UTC : >=20 >> 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 >>=20 >> NOTE: toggling this option requires a full clean build, at least = until >> https://reviews.freebsd.org/D52011 lands. >=20 > A significant question question here (after the MFC activity: > for more than main) that is especially significant for the > ampere* port-package builder machines (slower and few of them > vs. the number of types of builds) but also for other of the > more time-taking builder machines: >=20 > Will the poudriere port-package build jails be built based > on using WITH_LLVM_LINK_STATIC_LIBRARIES ? >=20 > (The boot kernel and boot world are not the issue.) >=20 > The performance difference between 14.3-RELEASE and 14.3-STABLE > jails is large on aarch64 in my testing. (No such comparison > is available for ampere* builds: no 14.3-STABLE build history > logs exist to compare against.) >=20 > 14.3-RELEASE predates the shared library change. 14.3-STABLE > currently is using the shared libraries (before being shrunk > some). >=20 > 00:09:18 14.3-RELEASE -> 00:12:19 14.3-STABLE, ratio about 1.32, for = cmake-core-3.31.9 on the Windows Dev Kit 2023 (using all 8 cores) I realized that the modern poudriere-devel in use actually has the real time showing at the end of the build log. Thus checking both the elapsed-time ratio and the user-cpu-time ratio is available for comparison/contrast: # tail -3 = /usr/local/poudriere/data/logs/bulk/*14-aarch64-default/latest-per-pkg/cma= ke-core*.log =3D=3D> = /usr/local/poudriere/data/logs/bulk/official14-aarch64-default/latest-per-= pkg/cmake-core-3.31.9.log <=3D=3D build time: 00:12:50 times end [shell] (user/sys/real): 0m0.000s 0m0.040s 12m50.000s times end [child] (user/sys/real): 76m41.023s 3m49.860s 12m50.000s =3D=3D> = /usr/local/poudriere/data/logs/bulk/release14-aarch64-default/latest-per-p= kg/cmake-core-3.31.9.log <=3D=3D build time: 00:09:19 times end [shell] (user/sys/real): 0m0.029s 0m0.018s 9m19.000s times end [child] (user/sys/real): 57m9.237s 3m2.719s 9m19.000s For 76m41.023s/57m9.237s approx.=3D 1.34 So: not much different than the elapsed time ratio. > (Those, of course, ares not matching contexts to how official > builds are done. But the above avoided any jemalloc 5.3.0 > involvement in causing the time ratio observed. Comparison > and contrasts with 15.0-RELEASE do not avoid such. I could > build other examples.) >=20 > The best match that I have for ampere* numbers that is using > 150arm64 builds and 143arm64 builds: >=20 > 38:25:51 14.3-RELEASE -> 53:33:46 15.0-RELEASE, ratio about 1.39, = for qt6-webengine-6.9.3 on the ampere*'s > 15:24:24 14.3-RELEASE -> 21:26:14 15.0-RELEASE, ratio about 1.39, = for llvm21-21.1.2 on the ampere*'s >=20 > 15.0-RELEASE has the toolchain programs using the shared > libraries. >=20 > These sorts of figures can be explored from the official logs > that exist --but 15.0 has more differences than just use of > the shared libraries by the toolchain programs. >=20 > I'd consider time ratios of 1.3+ significant. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Wed Dec 24 15:57:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbxMr3F2Lz6LBdH for ; Wed, 24 Dec 2025 15:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbxMq75k0z3tCN 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=1766591832; h=from:from:reply-to:subject:subject: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=j9x74OtzdQ6E53zvJb8cib7rC+3a6wSKpfXFtpJHcrtC7JZW0YOJz5oFQfsdyK53j2NR/x FatUUVBR9Z3i/tDqhHEV/F5Up28DpARN6tJ/IrsNgIvGANQM5wXRD8x+QHviKlhagmeN31 7OCVImI5v733lXUfKR9gB1dqN1EKacBtuLDlLqHLpVmeoxIHbDURrwtIAjkyZFT/30/0Vx g7+cnibF6VJc/9pba5TrcdfxbXddodSY0ljSH6ww94mi8fWkW5TvP7kXMWCoGjMiRuUv2W C++35XIyb0j/mfrrQgM4awJyR1OdxnOYCfTQLuzAbU4E/oXIJKWjqPuIMSanOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766591832; h=from:from:reply-to:subject:subject: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=sTAfvSUfhJYetKlAaVI42qa3coKFAfzqK6sLE0QdTqZ0yyijcqsdxr1rZxJ7KaBLfWAOTC n7WlKQ5wvTG5BAkXIg1DxYAivyNdLne38xOcHw/ZHkWQWEWZoy97p7GdRBpjKdds2eaJVi 8wnsWkhmKmp7d9ENWC1iGbppmHJSZf7d+kJQBbHrgfzMN6IMQcAoL1/nWQS0EPaDmdSYUg zU53ud/R0OgQE/9I0QEG1L1OJQhx/c+hwxA/7QbYepzwoSlQWgh0Dlhm5KbkTgf3ZICbwi hmMM128s1hwH9b+kCSteztVl8azs9t1LoLQ7ywJmvu35CRt1b6FElOVf1Wu1ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766591832; a=rsa-sha256; cv=none; b=ctPl4KuuAgfuW2tas3NHUx1cCT8IZI6+eB7RvWKJnb5FEGuvRc/44ft1ipjsgKDc37dgwX Gkboiu/5hsPl02mh0TtjpGmfCmLsr8Zf9c2BVfbTsZJJE8Tl4rHgMAch9QBv7v28xqIhz3 CuyLs2Fr8bqPuv6t3+hyJcn/7keRzoKFDbIi6Qc3iqrSTiZYvWBFlgM+pm6F8QTg6xPduc AlF7dmsAlXRooZtaGmY4434I6sFmNiF/xNIZ+3PgVWyyUgnvjW0YQVqKYWIoJVUFgUkx/y t5UgTEj1O57a02/MHTyFW0q75Hgtiem6kdlBV53WWTBRexdO5S4BcyaX3MNIGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbxMq5qKwzpj7 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dby6p2DHGz6LF0j 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 4dby6n6x4Gz3wDS 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 4dby6n6TKqzqfV 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:45:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dc15r44Hrz6LPrj for ; Wed, 24 Dec 2025 18:45:20 +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 4dc15r3Y71z487R 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-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dc15r2rg3z27p for ; Wed, 24 Dec 2025 18:45:20 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-4ee12fda47bso10749141cf.3 for ; Wed, 24 Dec 2025 10:45:20 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXNlako/8seV6ocVBxVTwbftJJy/X4US73lSN5RxEVS0I/BvO8ZXkwKKxP0+FZHf168xYIXpprH9glShJjwI7JMHYvMqA==@freebsd.org X-Gm-Message-State: AOJu0Yz/28Fgc3o9OUma1dPa2bCJgW0TuUEsnynnbAhmcfe3pi132aCx xvpUnjb8/2n/6ym2xkFC4I7F1lO54s1rLA89uqa11oPjpKGeDLo4XycwbwCi4sy8hwFLNKfnoiC nLXjLCbSSTGK9yDVmobR3dlCi3OgL0V4= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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 Thu Dec 25 06:42:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcK2F2p0vz6LMMw for ; Thu, 25 Dec 2025 06:43:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-8.consmr.mail.gq1.yahoo.com (sonic315-8.consmr.mail.gq1.yahoo.com [98.137.65.32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcK2B45Rdz41wD for ; Thu, 25 Dec 2025 06:43:13 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=IHJUECAn; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.32 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766644990; bh=SD+lR3Ldo/3A/daNW/7At0L7wn5uItaSvH3unI/L9wQ=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=IHJUECAnLyRFdZhb4UclFyUwCDjp+s/j0NHEHDqdB8qeDB/Fd93V0cwYWZeIIlQe4S9UTA6F73dVtLef3Qco5/KUp2owDyqUDrquseWB1n56JBxnyonOzz1PkOQ8j43FKjREkqoYfS0gdkvk/dGxq3cwDw3itOaiE5qCMkODOVVzdeHzRetyDGovr4F6rgnQ0w3AXZ6hspUpRMQh3+HniPF788qmSXm36VLkfsKYWE55qHIhn0exa/R3L/LlvwOPb62D5oCsrc4BMchi4Z6kNCwtFZbutzf837/kdpggNpTilDevsGOY5jllP6LEv9Ce9Umd8UAdlupnVViW3w62mQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766644990; bh=ghrprpUkxXQYIXFZKh/WMJeIlRJvl7A7RPNU+SmCo6q=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=JNzBDyNv17BzfASVmHwYrnEXYmMgx9GDKCnthCWsP5VrwFqWum6qzlhH+lu4n3hwkAxvhsQEK/aWvnLla2ujd3cPYmq4ag2UyQlztPWkOGiqFMfnLzsFZXmwjwHAr8lZkM4v8lkWf4fiJham8rvxU8MPJ9bL/emt3zFfvuXgOEE9O0a35XZXQI6rrOgDAVkB7tzzK3GkhIGqLdjFZ2Yv59jRuFInllou1QmmWosW67Wq9tQbUPbHNffXDm1i1HGSXgLB0JfR8aoq764f0ZWqAbae5cU3HnSFCbYUERe1yIi9zKsCjWOB45HMktlymbZDFbxlVAEfnVbPK3/eDrXGHw== X-YMail-OSG: uD2xWj0VM1lBiZ.q4581DckXAkTx8E5elJ4P4DmaoH6BW5ZrTL9Zp9pBN49bzH0 V0vnGuMlMXIIaj5uN9oeEleM9jUT5LAWf98ylcy4LSpS.CV32gA_ZZbra5m27ibera2L.w_njNIw 6payr.JmxfVEOwf.036ejor7BJFsmWrI3QhD18DNv2qhtr8Lwbhy94kCwsSt6zMqZuQIP95ckHQr 0nNUAXCFpYueGXeC7KizRlVLmg.1MaLptp4iys2tyqxkHyZfO5Zsx70J3nxDysKi_mEj_7ZGCSw8 gRQ5QaaJ34ynbcZIfy6XooC0cw8nBafnbIDbqVlHksg03ACzc9NGQw7quFXC8tiVYBzRmhzEDxEE kMPB_45iqDXJTmGLU64T0D5s0GQVDHwZ4L_fxTJX8.Q8FCrATxGyjf_xUehzth_93Pfxd2CWE1Fe X9a56Wj8csQAG3DArzkiKcvkl9ZSnjI4B.3o691hMNLbDfCbJL0XzV5k8enDXxnpWddQOJwRm.I9 dhG_QH7DF0tsBKSTzAen7mWtAfW_4FURp6F.s5glGpz1oFASYUag1_M.rB0mjXEOUV__3YXOW0De 2gme0gXd.O.Ws4KfHeB9pqvYystf398KZupQ3pkPbuMzk_aUoVZmzwv1czLiWYDwMqnsf6EcY1YU AQRy4HcUsVz7dVKCCvBJuIHUiAHcZTr.etF2CtvInzahOgTd_cM0EUhbxj3oWWAOp2Ga5JjtI9nt 7VkSuWPf39E0j8gsVhQvJPKvk9QIBhMyJg3wZDlhCwYgODfV2APXaYChpFNr2NSNBB5MFl_yN4b2 Cq.88QD1Psbq7e3ot_GIOjozHwORDcAty6alRtCA_Y3QTl2OBhRqZ38atnfUQrRZCNGuBOCTbiem O5Vjtk22smY2uj_1yttJVaLrAgwl22eqc5IhaS_tgJQuSuCT19MVvYTFyEbhV2Wo_yKU9vpMvvHl UEGZd7bLb6Q74TvGfpWA_eMspDjN4wLkyoVPOUqv6k_6OaMGUFifTU7SNdJHJNbQKhIVgcp6rGXH h6In.YNSjGtEHuvjgBxOaaJ1jeVqRS.Aek4JLqoWT8dJfoNBBq9MRDYed5MCFNPk7dYOVgoiJ3pk j0XF1lqJrkdFIEpwmi6VayFCjbqXy4rziJD3LYCTNjN2KTYB6N6ZamWqUy_lNTJAER4O1H9mNDl7 TB1bWIAjqhtBrdzhoxbtHqwRNg4IU3JpxdcyEp7Y65T2CZNDuL5n5lS.mqVTCNWnz4iH8A_AbQmu aH7wjCRTHYHlCx1Tt6U5KVKV3LLZeP_yk1gWJy.r65bh4Au9g7ebFSv9jgmL.2YWkgIA_eicXzWn nLP3TDpRpMSdr_3vXTcuyA1FiBAX.UCOJhmRa3qsASwDb1EkR3UJ3Qw19lX6TA.IOKWIlx4N6X0Q MDHJWLoHKn0oc7OYAZK39vXwPX1S4DA0GTXnFe1nVvrI2vHIghRWIW44.lIvHlRXYjZfPacFn5wU l6i.nNkNIEnpF0uyHpXTPGGdLegd0ertJj19hRz0PVfp5XkLHOn6bhToT4tAOsFprlKytPDfvGjx y5_OsPv.ShmPAngLtjMPe0Km351qU0nyAvoUMgSe_GMcYe4ST6vYWEacI2fqJG3EgNdMmHcPA6p. sTqOWn_oT8IoFry3JohkQk5phv4Pt0CMw_qgIFiXIwx9xA98TXHhOelgJSTq8ymBUF2_4Dg2hK9o yjIk_Km49r91VPC596a0KPCkaF1VC1FoSlLP67_q2eMc.R7MTGSm2yTPHFuQ.xDERuN_Ky2v.z5j v1moKVP0FS4GAGgaZSSgkVVEpxztDla5ybr06xybZOJSr2.CxrDFIkfEARcKQDXZRCSuFMi2SSiY 7LKbP5zU2Rg1kPO07RrIWXK.DTL__u2nP45SznwLKfs_s4PavJQ51YMOpV2piBcfwBqV4fyJ770y .SiG8y8VEcAxDyt..wyUSPo4UjMjIM2JtEG2bJu7M4hZFcOnH65rMOWA183od6kP4pa61a7Ma17r MiGe4ZpM6fWXtl_5kLiOOo6ts_YHHy5Ex9IiC6oOqWXcMTyNmyhTWreb5c16ubnpK7Madtrs6X_N xuIHOaJ3w4bZcsFnytGeWgx674_MDQrrmQgu2tMnGWU91MG.xhFREMFT7yV4DC_tl7amMGxr3xC4 Rm_ORLr7HwiHnhdXXKXSM2gSuUnaX0WgoWOAcu8KV6r9IzObV5AJ9JWfRwjACW8ApJwZrKVyYWgF N.TbUnZ.ZmRyn86v4WCX4rzJJBhRu2yMonnnYopxyxAQy.Vvi.cHad1Z9Oan7OpzUzmpTkRecAZR o X-Sonic-MF: X-Sonic-ID: 6188970e-5cc5-493d-8698-1a50c6f06366 Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Thu, 25 Dec 2025 06:43:10 +0000 Received: by hermes--production-gq1-54bf57fc64-7shwr (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 37bd6c25eb9cf7891dce9939e6d189ef; Thu, 25 Dec 2025 06:43:05 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Message-Id: <2CABF94A-EC66-4639-A67B-EE6C5254C5FA@yahoo.com> Date: Wed, 24 Dec 2025 22:42:54 -0800 To: Nuno Teixeira , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <2CABF94A-EC66-4639-A67B-EE6C5254C5FA.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.96 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.957]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.32:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.32:from] X-Rspamd-Queue-Id: 4dcK2B45Rdz41wD Nuno Teixeira wrote on Date: Wed, 24 Dec 2025 18:45:08 UTC : > 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=yes > WITHOUT_LLVM_ASSERTIONS=yes > WITHOUT_PTHREADS_ASSERTIONS=yes > WITHOUT_ASSERT_DEBUG=yes What my experiments and investigation of official port-package build times previously suggested was: ) Any poudriere jail worlds should have been built with WITH_LLVM_LINK_STATIC_LIBRARIES for that type of goal, as well as having those other settings. ) The toolchain used for most of an buildworld buildkernel activity should have been built with WITH_LLVM_LINK_STATIC_LIBRARIES for that type of goal, as well as having those other settings. As far as I know, the ports tree devel/llvm* do not have an analog of WITH_LLVM_LINK_STATIC_LIBRARIES (or the WITHOUT variant). === Mark Millard marklmi at yahoo.com From nobody Thu Dec 25 18:03:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcc6h0Z5Dz6LjQP 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 4dcc6g6Y52z3xFj 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 4dcc6g68zZzfR9 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcgSx4K3mz6Ltf2 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 4dcgSx28FFz3CgM 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 4dcgSx1Yvgzk96 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcgjF53xdz6Lv97 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 4dcgjF4Rzbz3DnX 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 4dcgjF3zRDzk9S 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dclx03QWBz6M76y 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 4dclwz69Qrz3VMy for ; Thu, 25 Dec 2025 23:55:15 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766706915; h=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=IojXHYlMkSOQJAw6/nCS+zq+S7UR/50rG3s8WChZfppK4f0MGJS4eBTnE2quvxVQkKj8fh Qnj7OFF8+b+9hFT3io9I820Su2lMv4T3TJVE7WaKDv3qXpWs1IbHA2BkPcRkNKkOuYJNe8 6qAi+6oqPlV0o5Iupo//3HgmyV8J6zJ0BaOnxkKeZJT0eMi4CyLsjBM6/Tnl5CbP4CaO9F NlxjuhCuVslCvzFbbTbwspvzznwjyq2yF3SVURx3qqe8s5DvHmj6Dhec4PRu9nTQzhRZwp 6GmJhQ6kxddlWva6Ke2F0rbWml4OxxDfyRsLNgc6CZ6sDoggCkYEYbdok+tggQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766706915; h=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=uIY44zULwr55i7FICo2Pnf7Q935eGRq4jndIbQwmq8L7FiGLFzHiPegQHxFSdRPXA+vMYY S+cUMyBiQCXJgeoLUoRVqP/jLKYJXvudCXzjVaVzkbbo4w9fllbVSOxejAgBJOag6GCcw6 qoie5do7EiT5G0uchEpkLveiVztQSt7fpZWG98TEjGEkXqLpkRW/hWJooXlFCOG5jmQGCZ 4fNPooPCWMwRvuQS6CtAPYYuxB9VimX0HvDbKN9CJcWlnOJLY0m4b5/ecLynuAnV2dHucu S9xg+VS9Jpdv1hDIsAznJEfqd6RlXOShpjqSmpX1Ra7qsH5GHi2o13MKEnbb/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766706915; a=rsa-sha256; cv=none; b=Wdcj1BqGKvV2Rb80uaP1aCnsOmkB7Y192F05MWn16GVzU5Sugoa97qZ7F8iaYozcCE4Lxe fUIkb/isbzLcWB8CzCJHCjGQ6tCHY/3PBJmPdFdwjJEAdl6gxEOnroNsxEEqPl+nwxMd1V ojg/Qr+/BkXWWZi/aFfi9NwlivT34UXhKGDOVioG0MzR1N7FMNwo5hq6FJY98mUUmqx3Fa yMR2UMDcbOYvgl+mBdWfxPSMo89mt/dPUcqemtqTuOdTKzj+0Ru62SZh8Mr9etDtwfqNeI xrlyTNyy/pbd/nQSvQoVltI4+3iM25yuyuCcAvlyHHFeM3tFIHXmjdBgygs39A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dclwz3wqlzwdH for ; Thu, 25 Dec 2025 23:55:15 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-8b2da4fb076so116301585a.2 for ; Thu, 25 Dec 2025 15:55:15 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXqpktjx6OG0u4Zp4UqCBjU7Y6H/JoJt1Cgrm9hA4OxaQSjc3E9ZEhTxBVuElDcmgxGXusyIYTCCsiDoA1AC+VEOjqJlg==@freebsd.org X-Gm-Message-State: AOJu0YyJmcCK0fNdp1foeFgyV2XrFX1KkDwiYPHheCZUd2B8ELnZQVwf DzOdDbKEqxMuFgZrwYTaj6Bpxd5NIkEJ3gnkKa7HJP7mkVyF+6A5RWKwZHozwKyAjJ/pBNxYOQp X1KErjCEkFdUhfBwm1RCeYMQBRTN5NYY= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcmXW46fLz6M8VH 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 4dcmXW0Ztsz3YlG 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 4dcmXW0Bhzzqv4 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcmjx311Vz6M8vr 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 4dcmjx26szz3ZLB 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 4dcmjx1SYlzrGy 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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 01:24:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcnwG0lbNz6MD0V for ; Fri, 26 Dec 2025 01:24:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-20.consmr.mail.gq1.yahoo.com (sonic314-20.consmr.mail.gq1.yahoo.com [98.137.69.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcnwD0jNmz3g7v for ; Fri, 26 Dec 2025 01:24:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=lVl4CIRO; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.83 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766712279; bh=cgcIsYFR+Q0X87uNQMbk3MurLcdDsLBtyEkpSWBsAgc=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=lVl4CIRO3EDv/M8GO9vRpz5yh48dVu6z+qus4pvHDTgftWUAkyO6JoPNqT/gQFYdkNYrzmnRHM4NvcqvR9lWq3CBjUpG+cfRkHCYjy+HjiRxNNoSlRTLbD3IEjyNerJKJKsXEqf0tXTprVhZJnVyEP3/inzq5XSBHQMDG/leV+3fWoUAPDPfU+j7gRprJAfz5Lky/MkqgMkgbfW5RsGIOxUO6c9BDwY2GYJL6Uu7Drez9swbb0QksxkdjD7OCh3+QQnbnahv7mv5zqrBC0Fnb3/e/dAFyCLKHb3nUTgcDNcKrgO6WwzzvVZe1pItt2AW0hryGQ8C+XThzZj5WCZRgQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766712279; bh=3Ytc/jlzDlxgJyflviROHUJDuGr+60bdM4uKnYZoqI9=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=U0HmMB1aOTE2AmEo6DFWPi3ndwK7x5ECD0RmIx4YtYMLjrBFMe9CIhWRPo+hs0+rSPh7qxtywuAhpS0a6/OLo2izwYWA6YSJ8BLa0NcKEzn4kFbUbipGu2jZkSbadw8bvTPRmXDlUD7ZMj+MRU9/3s/UYjwQtE+3EoJbJe+XntZ9ZUdXWd4pwqAUQux5flcfmzl8o8wqGE++w3pdmLNumBhzaVcRXyflluiBO4xW3dUmnnxS2umjeUi2Y0cfy935h1x5D+FHlT683Oxpyj5ch/yTi68SIzmGywota0rdvwvCIzuoiIe08spfzl8JPy8XEgg181M0gMAyQM5Z8duTfg== X-YMail-OSG: 3Aya5gcVM1mK9_b9k0V4Rz4kL_lGQuljQfYVdU9UMFnVzJEUxJ.Ib4Q1wVEhox. DjzA6hFV72cP.U6USbHyJf83ua3pOsUcHVRY5FfIPrzI1wX.rYElRRFGgkZxVpejWubKzU.DrM2U z9PVd7kn3HS6AgPrdUTBRrGOjv1pLmNN6YLZsnSHgXQOrGRsLTY0MmIwnC9LYC_x1VN540TXp4JM GGnnKgHeKKiesgk4eaRhkh8L4l3WgC83WfSPt0dwm4W.WjZQdn2BTNoFBmcLcS81eDqEwAtsAt4_ E_MkYZHr04Nb_pSSen9QjNqKQ5EeOPOAlIt4hA4vaabivw2xu4JcLoRPL._aLhzWEY1YGBI7PfqY 55fS3wA4DQ5tJfh_gS8q68LyW0ieNV.q5mlKsiMtR99SZ3lzCZ891VOhsh4D1p_qDaEZ.8yR0dwY RhTtJ75tQvwhdENOqiaowf8ljksel.2GVdyKeFHfaQtNyl_WnpwMU8sLeGK4BDXnJlU1bvaIhjrZ fLcdZxysrxwZz6r5n2V7WZQkq.V.mGm0Q3rOJJ1PRfMk1DKUUbbXiiCrVwkgGe97ifjrTK0e1DxM vjyVWmYfFn1GMlOOm4fphWGiA6hHYnSmtG3Xceo4zuQv_Bl00GExjGk4mtwiFiTBDtlMWJb7.bwt StxLAk3._5kn30HAOBrfiZ8E7m7CHHTeJB_VebO3wpSikHpCQov_iy8fBrUmVg4iSUiVB4S46CPt VmD5km535TQYHZTB4X5foA3BSbqBNNa__NCuLtdcC.2DJ5UBGdgpWhC4Bgnw4bvs.tXm90nCByEh u7dLqIvcKrMMhts8lVYa5QK0qJzdVGQUNlpfPpJryS5sIsUgUn1ipDt_JHdaTogHiB2TyddpEb8Z Iw8CGOqSadzcHPEdd_tYk_6cmkhnDsJJhn7R1P0T273GY9L__8nrA40yDFKRA8rZYtmikhD5BKPd XgK2pzJfDocbi3E2Cu8zw7gsnKfckICXbWk8OWUk5knudxhc8gK.9V2hOTbQKrTfGsfTHvYniwVy WRcxHNwQ9TcMTj4Q45.50qfjkHqEOG2qKAT8bjlNAK7qNqIDiYjJN0jc49s6apZrTwYvq92XwHvc SHTA6eNckJVaFOTNVXAsLsUl4I8wIIoVc24vXJSf2L_HtQ5RtXwWxW93nAdJDnlZIMdeskwQIftG ZagBZPg69XEg6xiB5fGNq6p8bimYE6310jizcPjjKNK61Vvp5VGpTjJzgW8VYZ9GbAOI5zVyP_wV BZqkCV6WFx8a13Z5kYd62g_eGvJ5AlqlmXMWzbP.Zt32M45GRuqq1JCmLvZdgPHz3kz0pMpIs85W JRuWJ4gsQjtq3nHeC_LSc56Vb4CYcLsQMQOBS0gVqA1EPDjz2xK0BB72VlMYwm11BHlxO7VltxOD gApUYFaKGmd9OD.eUWft3zJDLun7vVxsfNTBl5IKVjaFX1uNGPWfHBaFREMgDEVupTxZ_lRK.pBn huVgScybaFYXU1Hp0nJfXSp7a5wI8bM67QOt14_5xzpGbQ7x2YfCap73ly.NX0Zz6cJz0df8_Nog t81OnJbV3IP0y7YwKiJpOHU1z90qrHxpMyMcLX_dzMRt1VDQdx2aPomPOF6lOncYo0unFqHYcAmi PjChHvlftpWJKeZd6lVk7JBsMOe8_14x3YFXHlzkRhqXUnvBKF_GQ5SVg3DC0kzPrtcLEGKGMehq hsRw.cQj2H_XImFZxGYicFe1aGGOtV9wiW_M4dF4qm8_35YswLnsJ4YOe2F8p7i6hLUeO602G3gJ oPRN2jiA5NcoxwHmOmZ9QnkAqOAnGCuG5sFxNBUR.KTucU.BFgH8kpUGhffITqWl4qqU6QqOi1fK ECGlJEWuXb7_FQtuNgbON5LTcY52Cjhv0N6BK5jWGQjB9wQZh2.zuz0ceTXi4cMXBJcic7.Lrwlf YcHYY8eilhr72L92nz8vGghAMq2342Jy_izwehSF3bLIO5iKR8Hcno_pOw9u2j9osAajNLD39roL Mfkr0P1Kdutm6XZ_J9Xu_FE6wuYMYOJjTrsmCz8W4oIpfsMjxf6afj4moq9cTOqa5rKunkc9oUk6 9nbngddj7u8ZvUbJfyIPj6_Azl9lBd2SWY.c5a22Qh1IiJninLW5hDlR9gbS.aBlpZ3.sbvnIGGo 7couUYQUvGY3ybm0Y_FbPGXoV8mWTSQjWN7LEx5kyvj_q6EHsj4a1tE112cYc4X8b1sfm1SytCbd aRKvTYe4FxVkVMIq9PpKJTMw_smYpMjVWcbM7WF.86nGT_5C_nY2vRnX6MylgOU.43efHDKxXCyd Bn_cg X-Sonic-MF: X-Sonic-ID: 17b980d4-4093-4107-ae30-9358ddd9320b Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Fri, 26 Dec 2025 01:24:39 +0000 Received: by hermes--production-gq1-54bf57fc64-tvxhk (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 86992a776328d65bd99cc26112c1ba04; Fri, 26 Dec 2025 01:24:37 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Message-Id: Date: Thu, 25 Dec 2025 17:24:26 -0800 To: Nuno Teixeira , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.94 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.94)[-0.943]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; TO_DN_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.83:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.83:from] X-Rspamd-Queue-Id: 4dcnwD0jNmz3g7v Nuno Teixeira wrote on Date: Thu, 25 Dec 2025 23:55:03 UTC : > [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 . . . I build my own jail directory trees for such and then use METHOD null for them: # poudriere jail -l JAILNAME VERSION OSVERSION ARCH METHOD = TIMESTAMP PATH . . . main-ZNV4 16.0-CURRENT 1600007 amd64 null = 2025-02-12 16:03:46 /usr/obj/DESTDIRs/main-ZNV4-poud main-ZNV4-bulk_a 16.0-CURRENT 1600007 amd64 null = 2025-02-12 16:03:46 /usr/obj/DESTDIRs/main-ZNV4-poud-bulk_a main-ZNV4-dbg 16.0-CURRENT 1600007 amd64 null = 2025-04-02 09:20:08 /usr/obj/DESTDIRs/main-ZNV4-poud-dbg . . . # man poudriere-jail . . . -m method Specify which method to use to create the jail. = The default is http. Pre-built distribution options: . . . null This option can be used to import an existing directory that already = contains an installed system. The path must be specified with -M path. It is = expected that this directory be installed to = with the following: # cd /usr/src # make installworld DESTDIR=3DPATH = DB_FROM_SRC=3D1 # make distrib-dirs DESTDIR=3DPATH = DB_FROM_SRC=3D1 # make distribution DESTDIR=3DPATH = DB_FROM_SRC=3D1 It will not be copied at the time of running =E2=80=9Cpoudriere jail=E2=80=9D= . Deleting the jail will attempt to revert any files changed by poudriere. . . . # cat ~/poud-jail-create-main-ZNV4-pouds.sh=20 #! /bin/sh poudriere jail -d -jmain-ZNV4 poudriere jail -c -jmain-ZNV4 -m null -M = /usr/obj/DESTDIRs/main-ZNV4-poud -S /usr/main-src -v 16.0-CURRENT poudriere jail -d -jmain-ZNV4-bulk_a poudriere jail -c -jmain-ZNV4-bulk_a -m null -M = /usr/obj/DESTDIRs/main-ZNV4-poud-bulk_a -S /usr/main-src -v 16.0-CURRENT poudriere jail -d -jmain-ZNV4-dbg poudriere jail -c -jmain-ZNV4-dbg -m null -M = /usr/obj/DESTDIRs/main-ZNV4-poud-dbg -S /usr/main-src -v 16.0-CURRENT I've not had problems with WITH_LLVM_LINK_STATIC_LIBRARIES for such so far. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Dec 26 01:29:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dcp1z6F5mz6MDNh for ; Fri, 26 Dec 2025 01:29:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic310-22.consmr.mail.gq1.yahoo.com (sonic310-22.consmr.mail.gq1.yahoo.com [98.137.69.148]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dcp1z2JdTz3gdw for ; Fri, 26 Dec 2025 01:29:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=bJ8lsTaJ; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766712575; bh=NoaerMi67xkJMwmPjzOldktx3Bhsqd/54vr96oZ7QeY=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=bJ8lsTaJ557cvWbLryAjv7b4zAgKEajl4dEQbF64/Lfs4OyHvmvPPBnn7eZ3v/eY0FaLqjs2vPIng56xfg+J8k4dGEjsOCWryZGNavfpC8hQXr9/scFEpx/ESbowFZHuSYHPQSZ9faKt+CGEj5J7JXf29Ropd0VkqS/LV5z+tsGD3U0vJ56zh97BBxN1VfgWYDwtJGukw5/YXE+oVubUeEaQ5SINikas+lx8v1Hyq8auPg7MVRXK/anY2nNfNybf+lLysaEbL2wKunieQhuwJTL3qxaQuOZczWQwmDM2UtfadfIYB2UHE055alTUmxqCWLcmm2tpuM3etFu6wCUubA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766712575; bh=jS9QNPkneAh/uS2Y/6RP0BUkgh78RaVv5mrPoRayXCN=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=WImsluuvd2qZmX9OnFD9HlO8dEtbduBA8R6/18C5Xjs12oCww/FxZIc/qchn3SDuY62siKqS12W4cbtsWaS+WMYU9Bi5Iy5To0KuUccRpVzEPEHHxGWyLq3744RZR5iA+di7U6DyJfuitzYYjoYoUfmyv7WQY2QwpejCi7leIMOy0F4lFZ5BqgCFm7rSddnvd5lDd5KKQ+MfcrpOu9wvbARPXTGGOOZFiDTktt9fo3dwXDrguS8QZQgZRWTlTgkJjwqBl1FiU6M20ORKZ6VmrhPKO6mCuXs67uyCwIGVx3uA6bzp3wWh0sigOeZFOGDATj+LO9ExfqWQlXc41N/j0w== X-YMail-OSG: Fstc.cUVM1lSIAR9NygVY8WZDYlEqv.1dyp.ELfe69gQoCmXnwkR2fP2PBbPNpd pDD11FBRPRlNTkKKTzP_2LLjJnUHehMwqHRmO9HXNCohgYC.5Z_iaST8v9H8XpVjSq1ssDAYGmUg 8c.rwns3sDrrHCYM3BvQW94QuS8N0x.dFsRwzqa7DyDqQbeGCuQzHCdYpraTPq_9xwQTMg3mtuq1 9TpBj4SJpvHj_mPn8bzsSlKh_uiowFNLSm37SreRTrhMUQfS.UgGqyKUnLBDARscKmeqNfYPpdin 0YRbE7wJ5NxdUuWrXdMJbvNS0p6h3WoVm1UKjrnnooXfFkY2x7TKIqLnQEBOl3u2BFM0EPTuQPlb TDOWGR3GfLBn05g5YEuc7IhQ8Hulvj6SvSsbKEAuX9F.e3TnrI7bbYCuiOqZ7.nssA5DjUhdD_ST YwyTea6iLMSP1Ktz.c6_VRE4pvSUp05js362YCojqWytt4BEmSpE7yzaUT1yubfJ98QmoVEQFA3. NiqliqrDWLR1gPCCOYte4IJg5yC8MEQgAlj7lJqJidh.vmFIeVmnIrc5WATAySWF2Rpi3tIOlfn0 C_L2PgMGgxoVMDp0aK1iT1yktMejdxqVxCdHbpaYBP.IFsj3LKz8rvYZ.1RqzcDZ4VWBnF2TD844 tqx2T6GEQu3DFxWhycVCDN40tNeBke1IRpNoC1otL9N0bHjjWEYg0fRMzY.tquVlfO9N4oISUL2M q5p0qZiZGfnQvldBgOla0cQn4bzhuWWocCh_UHmU6XJ4Xkao7h4ipxcUnGqFpFM2qk7w48ScvawC 8m.PdVAdDNELunayou9CRkpSVctWp6McoY1MsC188YsE1rUyMzr9t0Jwu.lRwyF_LOSCNrF3di8E HX56tQ23RG2CCl8rwpk6Ckf0SoceEdr6W_4129Ey.xLBEQ6_4.Qa0OlRdZQHnpCcQF.cRJl6rzo6 tog7ap2HrOk.H6Ugx_V.Kaxjky77.aZiEoQsviedCGBCuIIK19pbZ5gb.gG_NWVnrqEFiobi8q20 kB5AcnV0Zncp8TXLtLnSil2BoQYoukc9xSdCxmQ.ncPv9kIqPJ4H.nGE1huEthsakIvdfnnGbdJL xlk.80Ssg4avum9zfchoA_LHVPtm5.lKhDcwXVxU4u12TKAJOVrgs7_xIlihCGBW5P_YVmatvzm. .npEEPYaLSXH42WM1_HI3l5hU5Fv_SgooyJnwgXhiYyAQv6ursl6XRBYQGH.uNfS_uFkd.v1TyWC rRq782wdZTYpXiSURubGyPtuJsRU1CpSW70SoeXIu3NFyh0JRlS_L8Gf8zJn_B1noex8lajTuT5E Mqy05OXtEK.A8tdmtCY438XpKAPtOB7ZjZG6bZtP_yFpO29Cwh3g0DE2o424.F9yn8IUZh_HG3Ie 1DzkTGRqtVOBGTWcfM.mCnMacXWaNjLkvnysUjH0SfhOsCM.oz4A9sUUpk5qPhIcIBFcgKvhikQR z5DcC1rz0zZkvZe.V7DZEpPmNlrnp.tgFJqh.ONaYRdL6H970.eBXfR71r9mupr3ZYsr8CtpwaiG GrNVAsUDoaFdTYm0kG4TCf0MTE2Ge17OOjMweBad6bMwPLEvqsUEiubzwM2x1S.CsuI0uLrJJpVg x_cBZE26PjjujGXvp4KpRMWethbdrNGTsWHqqFTxKT5adl.WU1QKK730iu1SRBGCByo5R2D6nBgV 6h69Km8Qnj4uykT963CaenomEeGjNb3nBpWpw9XIBE81_dLPTv_LifeXxokjPTDs.gzv2614YwHo TQq4npHO0TdUdGrf.6vduNRw5JW4OEryKBU8GDyK_l9lDOktVGxSKe3feczMvcjLWwR9pNJd2bPP NV7qg.PzVzxzN5ydee6IpfGHpU2p.GJE6fArENiIjFyBJChTVrn7YCezmxuNnEqKdvPFGYPZCO9V xtHKyut_fOj6waO47KJO6iFHBDwV1Frf67VAi0ecdVMJDEi5BbcEPvwFjh6eFx2nZsGqU6tobj1G pAFsNjchuuoZuHuRWBj6QTahm3ot9IobqYIscGsy6UNsprYgsdo71qj44fAVUM1wT7uKwyT42tq0 _XA07hVjDzFV91SPKDuloRlZ3azqfy_MwyoIUWws3KEIhqREJADCZ7NkQUJP8x42DXkgMgLYONJO cLsf5MHy1vCSGCQgnrkdmqZPqjkw.9pUWlJ4sJ5HYlmK2.yzZkrQTBhNVEv9byA14cipRVX6N_Ja C.mun6tYk1qe0nRNj.6jv43PDYGOREMbwIx.Cc.53AWuzcpiCtZRTYEGCBew457IjBhPCg4KVpJa DOQ-- X-Sonic-MF: X-Sonic-ID: 682d315f-07ce-472d-afef-6a4adb821c57 Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.gq1.yahoo.com with HTTP; Fri, 26 Dec 2025 01:29:35 +0000 Received: by hermes--production-gq1-54bf57fc64-4glv7 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1bd1cfad7486a1c73eb4795ee94cad21; Fri, 26 Dec 2025 01:29:31 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Message-Id: <6D768C4A-B8CA-4EF7-A754-831AF23FA115@yahoo.com> Date: Thu, 25 Dec 2025 17:29:21 -0800 To: Dimitry Andric , eduardo@freebsd.org, dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <6D768C4A-B8CA-4EF7-A754-831AF23FA115.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.94 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.94)[-0.935]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.148:from] X-Rspamd-Queue-Id: 4dcp1z2JdTz3gdw Dimitry Andric wrote on Date: Fri, 26 Dec 2025 00:57:18 UTC : > 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 >=20 > 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? # man poudriere . . . Create optional src.conf You can also specify a global src.conf which will be used for = building jails with the jail -c subcommand. Any of the following are = allowed and will all be used in the order shown: /usr/local/etc/poudriere.d/src.conf /usr/local/etc/poudriere.d/-src.conf /usr/local/etc/poudriere.d/-src.conf . . . (Note: My environment uses poudriere-devel.) =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Dec 26 09:47:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd14V2chMz6LK3B for ; Fri, 26 Dec 2025 09:47:38 +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 4dd14V1XvMz3QwC for ; Fri, 26 Dec 2025 09:47:38 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766742458; h=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=MN8RrGlBMaQWGRq5zcCCTYnc1HHOurtdorXLOEU7Eu8=; b=vuzazTFHl72Yq86IZ9b+qSmYTCEAvnHbrnJxv+TPoFgPjig2FQ4eyltZoFeBtxQgF+C89a hzKvRGpAHogXrZwtEfte1kz/4sCVWljzm6HBF+41XGfHdIg6VAnycHwNqgBPwtzGMmiWX0 UGZtlRVebpsFD7iKjl63KvPnxpK97d5+QMvF6698W6UYQGUv86m6gg47Gk5rRpq9HCpGMj xiezwte+3ZkSQf3PgC1p5FxnWbZnjQYBYRNKxJO0/zied76S3qFfxnsg38JgARsLBq/zD4 E9DUdBXxs5zzhFNPRYnDDEJM1s71MHsaoi5ZuABB8366GbBC3h7D4K+rKceDTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766742458; h=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=MN8RrGlBMaQWGRq5zcCCTYnc1HHOurtdorXLOEU7Eu8=; b=R8B5TAqwWBfyIr13F7GSVSZzI36CFnMpUsmri0XkeioCWmm3zsuEFBmJgg+ZgX0rHqa0un qwM0ZUA1W0Klyq6SnH4r1bqCip5cVsnyCzl+gKsSP6AoCSbPFWQMD0Aod436n3g4figsN/ d4FAnfb5fj43x7r7FmzazYZbhHw0bCGqKr6e2cHYlgyptTkoUXBnNQlpdX7yiWfaxcloVy ZD2rwwictbEY5BquxmTwWECJwlMj9ro/nP0U1alH5gdch5UZr22OrYh58V/RPSABO6L12q gEnySfrSmC0SiIi3FSPhZOBYRe8l9Z4WvID9TYnb/UMEWQZUti7ahHfcXn/AsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766742458; a=rsa-sha256; cv=none; b=qkAJVmG/HyefWYGMIIqyJEVAiPGZdjeGSkJQ1VZekl2G+xTCkSdFTlgypLlC+lbjQqPwQI EQjgSwd5cyIjuvSesz1MQrpU3N/LyM8Zyz/aJjgUwZP67jnpiX7LKH7yo3eGobcrB8a9Bz k3l7rrMfWKI+ez3s/vbDwxLhiv3AzYTlO6oVQPBOZqON7myVUuXtTpttJG/dYTE3XVCGks HUDdFbtwxwZwF1ifnbmYi6UZtanCv5xKtQTt2rH3/9K+qTLSEAXTHSte5qd7TsP+CCB55s /kkyuuIhAGucUQDgWs795Sb9DNabYdseuBL6+frpFAxbuvqHh8RmP7/E3yJltQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dd14V0gwrz18dN for ; Fri, 26 Dec 2025 09:47:38 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-8b29aebdf3cso118396385a.1 for ; Fri, 26 Dec 2025 01:47:38 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCULiuTElHSIzwVTM4TTJDHgJupUCh2nTr0Dl8akOhZY5lEOXwdxL3KRQfW2Wnn+U9qIkYNgvyN/ZxIBVp1VKtDUApcNCQ==@freebsd.org X-Gm-Message-State: AOJu0YzcEpxH4+qdkj4hyPh7ZBSp4MbhrA7u2tNUSAm1e0kKamcLL6IL QRNer/VujS1s+28TKRIHUIxzuZM4uCIAWWJtwCY7BpSM4sOJ14+HfSYWEKGLoHTZLg+QlPf3RIS xlK/doVUMWJYzyz558cSBnCxzmceSt3Q= X-Google-Smtp-Source: AGHT+IEUsTOwVmUh5p1WWJT2qfiMGnVA+t9R5ZYiEZTS5VtafBz9t+oKfKOgEW+vJYM5WIVuZJieXIfa1snqi6Y8a54= X-Received: by 2002:ac8:5a46:0:b0:4f1:d267:dd2b with SMTP id d75a77b69052e-4f4abce1a3cmr265739661cf.1.1766742457667; Fri, 26 Dec 2025 01:47:37 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <6D768C4A-B8CA-4EF7-A754-831AF23FA115.ref@yahoo.com> <6D768C4A-B8CA-4EF7-A754-831AF23FA115@yahoo.com> In-Reply-To: <6D768C4A-B8CA-4EF7-A754-831AF23FA115@yahoo.com> From: Nuno Teixeira Date: Fri, 26 Dec 2025 09:47:26 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2ry6Emq1hFKEPMA4B6r_z789flrGgEo_hhWiPDh0J3MVdvr6P6RM-N6tFQ Message-ID: Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob To: Mark Millard Cc: Dimitry Andric , dev-commits-src-main Content-Type: multipart/alternative; boundary="00000000000099578e0646d7c8c9" --00000000000099578e0646d7c8c9 Content-Type: text/plain; charset="UTF-8" Hello, > 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? > > # man poudriere > . . . > Create optional src.conf > You can also specify a global src.conf which will be used for building > jails with the jail -c subcommand. Any of the following are allowed > and > will all be used in the order shown: > > /usr/local/etc/poudriere.d/src.conf > /usr/local/etc/poudriere.d/-src.conf > /usr/local/etc/poudriere.d/-src.conf Yep, that's make all sense using same options for installworld as for buildworld. I've never worried about it and never used a poudriere src.conf in the past with some luck, because maybe my base src.conf only affected buildworld. I will rebuild a fresh world with WITH_LLVM_LINK_STATIC_LIBRARIES again and use a poudriere src.conf equal to the one I use in base system. I will let you know how it went. Thanks Mark and Dimitry, -- Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000099578e0646d7c8c9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

> 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 ge= ts the options from. I would expect it respect src.conf?

# man poudriere
. . .
=C2=A0 =C2=A0Create optional src.conf
=C2=A0 =C2=A0 =C2=A0You can also specify a global src.conf which will be us= ed for building
=C2=A0 =C2=A0 =C2=A0jails with the jail -c subcommand.=C2=A0 Any of the fol= lowing are allowed and
=C2=A0 =C2=A0 =C2=A0will all be used in the order shown:

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/usr/local/etc/poudriere.d/src.con= f
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/usr/local/etc/poudriere.d/<set= name>-src.conf
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/usr/local/etc/poudriere.d/<jai= lname>-src.conf

Yep, that's make all= sense using=C2=A0same options for installworld as for buildworld. I've= never worried about it and never used a poudriere src.conf in the past wit= h some luck, because maybe my base src.conf only affected buildworld.
I will rebuild a fresh world with=C2=A0WITH_LLVM_LINK_STATIC_L= IBRARIES again and use a poudriere src.conf equal to the one I use in base = system.

I will let you know how it went.

Thanks Mark and Dimitry,
=C2=A0
--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--00000000000099578e0646d7c8c9-- From nobody Fri Dec 26 10:49:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd2RJ5twmz6LNns 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 4dd2RJ3R8wz3W88 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 4dd2RJ2Rqsz18HG 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 12:45:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd51B4Vrpz6LXYD for ; Fri, 26 Dec 2025 12:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd51B3kQMz3jhl 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 4dd51B3DcQz1CVs 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd5yR5QFnz6LbBj for ; Fri, 26 Dec 2025 13:27: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 4dd5yR4p9bz3mMl 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 4dd5yR3xS1zmf 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd6Bk6PlTz6LbtQ 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 4dd6Bk4NKwz3nk5 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 4dd6Bk3j66ztX 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7PB2CvSz6Lgjm 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 4dd7PB08cmz3sDw 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 4dd7P961jpz2VV 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7nB0mkfz6Lhd4 for ; Fri, 26 Dec 2025 14:49:50 +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 4dd7n966N5z3tVm 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-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (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 4dd7n95KNcz2MF for ; Fri, 26 Dec 2025 14:49:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-4ee14533deaso12675651cf.2 for ; Fri, 26 Dec 2025 06:49:49 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUiyNSWVSW68TtSDSHMDjVIkzzCdXpo/UlvMFULBGgO7Sij+UcgCOx1pOMHGt42/uUwWECBONoE+ycLja22DnmhsU5rMA==@freebsd.org X-Gm-Message-State: AOJu0Yzt25Alu7HkrW6Yry4RYe5NeXZjViLmA4S6O0fImRRmaa/RNpVo FtfGuhcrp3+HcH4PYF0xb+SsCXOlDcx5gyji/yjvCaoettHQCr+Qf+6bYrfb5gYr/5PjorN/Bpz xAG2phtJoE0DhcKkYsnVXWmCVomo+Au0= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd7s067JKz6Lj0v 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 4dd7s02PnBz3vNC 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 4dd7s0214nz2rZ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd80r07tzz6Lj2Y for ; Fri, 26 Dec 2025 14:59:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd80q0QzMz3vvF for ; Fri, 26 Dec 2025 14:59:55 +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.167.173 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-450b3f60c31so3625620b6e.3 for ; Fri, 26 Dec 2025 06:59:55 -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=XpXRFzAwVpHQXVjW/sJfll6hbFTN/fW4Xb3V986ji3S2OFJnMGDz+QEAoHwhuELNqu +7dpk3o8sSwYEllh5/03rHftwyktzvCV1ny59GxJ0gVNhGgQXwUR4JcOUJFNT8OTOEXU o+1aU6GQfVbmf7URcfWybblZHl5dKXYfIR0jhcD3VRYvQMIbgWp1aGdWC8yiVXFWLRon BTpZNoAhp2iN8Y9OH/+uqzewbXhHDlmUteL+q4va1vNQs2tCLEpF2ddmh5Lq/aXf330t 3USNEt1vBj4Ckvb9oKjDAJ3hxz/ZaSXHiYrhzbLpD/621ncIK+boSCMGwW+Y32i5uQ6q W8+g== X-Forwarded-Encrypted: i=1; AJvYcCXLM1PNmLgQ1baaLN+uKcsew+8P0HYTNB9I2snDkualpyWP2Vqk0hWZsR9wB5qXbTy7z+BYmLAJ4TdZF2dXJdsazFaoWg==@freebsd.org X-Gm-Message-State: AOJu0Yx3UVZqUvEnXICLaovE4vpJvfOy/9WYC2NKmFsXzvqvXTh4s8B3 7VgOVMgkZYOXKputkhA7iN/xihcPjeNNsxgN/qiJblUkCY4VhXRO3DZI3nMiu/bJbhflEJEkrQP +WjQ6/ultcgR5cBVCXfJzk6za2tZjn8HEtg== X-Gm-Gg: AY/fxX5c/ueDso0OBfStFX/JbVrXfZj11N/ViE5i74W0TaBFTkGItrAZ/1cJIFc5U0B hha+72GZFdGoWxs6hnRMv8SVMPzprpHoycK0AmaBhGvpcVhmxWeIFt1G5HHq8cr4UwKit/pj5Lo 4FDrdN6DyriwzFKOKPf+mo/mRmxj/YGRpYjYEaQRxVGa8lz6LbY4zk3H/MLEAcKp6Qvg9MtTaFe RJ0OwvXjlS+LenEC9+k2v8dqDdTwP0/JDC216bLzQo1FeKo/A0EnrjwyZ5HqBaMeCh3CDtXUMVw XEKdDYauqKd/n+JR/WRkKE+PkVZW/NmqRNkUIEV6w3tfczM36nSQVgKk9LsgRw== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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.65 / 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:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.173:from]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.173:from]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MISSING_XM_UA(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4dd80q0QzMz3vvF 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8fh4s84z6LlGJ 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 4dd8fh23fzz4127 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 4dd8fh1Mgsz3Y9 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8w23sZtz6Llph for ; Fri, 26 Dec 2025 15:40:50 +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 4dd8w22xm1z42YP for ; Fri, 26 Dec 2025 15:40:50 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763650; h=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=uIvd5JIQUbhrM3cXJeI99XTpPEOpose9XdF73NIALtk3NsfVNfAhH0bhCuJRZxl5JpVa3k YOMcKLt245cXa9I9v5ZduZO0HJF4nXGv33HPtHxWS475a6z/LUuJUPlU7W4rmZngZAzB38 fyZZ5XUln+g4d44L0PPF+N47JY3PgvVHKoLpgxANuslfOFiItSsIYPRGUSNWtMYSWtArRP omuiKRfjcwY2SnEVrW0iA2d703V+er/kNotdFgrpVYD9twXPutjAycaeGW51n+zB08U7Rj VNE8pN/ClIkUGqvOneW/ZmM0xscAZGb2aAOl+c3ySYxNyTXGuQfh5qzIyxvXZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766763650; h=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=qAy2sDBla2Jl4E5ReMsmNhcSMbx990YutHRo+9zEXJpYDJNPO1WQbC8Um3zM/mGUqG0Dvj Z57VNE0UmU1MpmToVhobVkuaobt5y5BSQ1bEoCjvhV5rmuTfiDSh0/2f1XLdgNuJ2kys8a Z8ZsnBiTnpoKg2uEreQ5P5PwLJb8O/trEv2XxZ+lV++TfA78Xys22ic0NItYWkk/oQILZz 4I7Pww93fZOHkrfGzu/oDsu2odrPNO1z2YGYUcb7lw+04G26q/1/9+EU9/sbGHOW+0akY6 ibULLoq0mWOtCzB2MCI+MeO+IEWMvhHOEeUxrJR1BQ9txwuvfmSAOSsgZlLWCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766763650; a=rsa-sha256; cv=none; b=mZCJGGjOd0d939UukzOF8/lar5aBq6VeocbBm40aOKXI4/EslsdqaGFfEJTXuwaUs0TYeG hYYDL68xEUVryZnKmovSbHaiIPB/FDXIJkMWw+IKRsJSyd4/H8VEUvRlLcGevpR4e5ONzP 1POBKQFSMzfPqPQz2py9nvhojZhuLI6ELqtUpBKV2L5rT+gn7lVtHdVgmu2/39wKkXJO/j U3U3ObSEuGMbjyCjlgyqzwHk/S+ehVL/E1Q/kLLIC8C+j9zxpZnmoSG6pLycHBZBAyy/nL pflbvslnw1Ka5H2Fy98Xl8c8z63uwWBbb5LB6dKPSKtRwreQH6tIcio84CK2Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dd8w22LMBz3Ny for ; Fri, 26 Dec 2025 15:40:50 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-4ee05985e97so5750861cf.0 for ; Fri, 26 Dec 2025 07:40:50 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVatF9rE4G+A0AmU/lFsf69auw71Jt66n0NrZ1vHVpAhoxh9teF/H4Rp9aYaNg0D65igodvVad18lnYFjR916U8KbuiVw==@freebsd.org X-Gm-Message-State: AOJu0YyPIldKvxZ9FM5oN0s4ccSD9bB1VfacuoK7aDvzkre0CT9KD9Pt 2DeNEEw/L6DhjEQtrtId8yjMqdc0Y/ntOWykyzCGdKkMUoUoYjtwj9x9+lxi89DK7TNesef5eA0 ahkk+QRtpq9pEi0k5IqpZON63+CShDbs= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zS30Jtz6LlnC 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 4dd8zS0qZMz431T 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 4dd8zS0Mpfz4Km 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zT3jzgz6Lm2H 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 4dd8zT27Pgz43J8 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 4dd8zT17bmz3qw 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zV5D2vz6LmFg 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 4dd8zV2J9bz43Jw 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 4dd8zV1vNkz4TJ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zW6wCMz6Llr2 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 4dd8zW3Hvpz43Q3 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 4dd8zW2llJz4Kn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zY0YxYz6LmCJ 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 4dd8zX4sBzz43Ml 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 4dd8zX3MtJz4HM 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zY6yKvz6LmFs 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 4dd8zY4bRPz43KV 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 4dd8zY49X1z4W6 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zb0yW3z6LmP0 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 4dd8zZ5lHBz43Yk 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 4dd8zZ4zpSz40G 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dd8zc2VsYz6LmP3 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 4dd8zb6MVgz43Z2 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 4dd8zb5mrGz4HN 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddB4z0lD8z6LqbL 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 4ddB4x6sLPz49dl 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=1766766818; h=from:from:reply-to:subject:subject: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=Rcaa2InJTxk5ejneoCrTCbnD0Hcu/fgWuQ6Y8W32sU23+D8T28zJH1EsfQxcVKM4bEBYOE Bc98VbZMYeS9aq2PDdJqZQNFQiP7W3DnHjJEKOKdtZf+AEQGjvHGw/iPbOqzoYCZOkOZZK jnFJ8eBUf9aqRSug8ylyVuZLBLWpD/hHu1OHaplmP09/PDAFkhP0k4KqWfj06OqRw3rnVc ok0v5UptP7FiFik83z2UchERgpkQSgJ5qkNTD5s4X05a7FU7EW6uV0I9Zof6Ua64KEnNQq wFXDmd/S0ayXXpuVC0RST/9IPnstiqtDPdSXlHJz0p27KUZXgcWL8tbng0KrMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766766818; a=rsa-sha256; cv=none; b=Cr32tKDinp1LmBpiBbCgZx6ar9QytEhq4B/4Fs3vNS2GvmQiyTVlTgwB+nVr2EgtJOw5X9 2Jn9NkL3hgTnNosXSl9nmUp+E3lSxTreaAbQADW6MoC2Tsyd9MpjEbj5QHHJuvFJW+m/F3 csiuSHX6gE1PDHOLFammTLS20n/tiZ6jVy7874FYwTPHRpq/wa8aFxllx484cLjBIazKOx mco6Ko650dvx5wvqIz6j2h2fdxeXt8Mncwx2H97+46brYCYFFd6EZ02S4/62K69ZYQXYmb n8rZafj+VRf8ie5+F1aX2f229Wci5m65tFZrZVr1BvPOyEgcVWU6m4+3R7NasA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ddB4x6N0Sz5TG 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddB7S2tvHz6LqHD 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 4ddB7S2Fchz4B83 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 4ddB7S1LkBz5x7 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddDfx1V4Sz6LxvJ for ; Fri, 26 Dec 2025 18:29: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 4ddDfx0zK1z3DgB for ; Fri, 26 Dec 2025 18:29:45 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766773785; h=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=a8EerOpbcPZ3GnaILSQP5dn8rMdvzRDhwjnKVsf8t3uX8L6vg45/XWX0H6B69r6Oj4ovhg umbJ4Hpzt7fVg4anlQA9yz3v070/SZ2VxymAyTLtIk/ToNw5yjFVG+toiyIwI4vPtoiSpl 2D6OKM5qJIvrvG1SnLO7HFt2ZixG6SBqvGg7IAHPRY7fHi8RRukmYyc49Vm8EcJoarWjln /1FnQ+8pHR1fVxP6v8/XmtF0v3afBdbaiL0n7izcV+U+U94wWymE1hu5u0TrDzRZ+5E0Sr r7VYhzGqiEBAjsG1zduY0cCF1dH/XCll+n8iPNH2t+5uUq/ME7FR4Wdz6eAneQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766773785; h=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=Af6yyC/c3rS8mD5InxBkW9oZ9LfQN0wjiEBi3sWpQyERQQ1fR01qoA4tLXy3IE94yrxx5u U/w5I10DUL6ohi1ZParkfxADgaGueuyDO8KRWpDH3XABPqE6thqrBviLPPWhDOnLJK+i8d O9z4YfjODEMfUkuvQ4Tyt54UwPyhvJ8grP7RyWdgSn6ntEaM28ti415Z6tgyZ/QWI3o/Ay 5uZOeksFqGzZ3JSkij6wJtFMaXd3xCvfUb29Ims00VqaprcMGbk9FvvTgSyxgC0BdksIkP d+58KZf6/J9iaeA4ppmhBT2oDkX2sE4+OCJyylESH9tXzhaysUYA+qWm/FurdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766773785; a=rsa-sha256; cv=none; b=oL4Ym8/cu4xO4AePgXUC58KE+MUvQpTKAJQoytebzn79dl/KBubhtZMknOxOc97/VPTG14 YKCYywTJy7dcHAengW8woIreA5vQ/ha7/BcwAC6fOILQPE8sAeAv8P5R2SfJwI7HHhleXd PsBjIF7XkYybntyY2escT0wHQ8irHUqFArTvHRZbNNzyRjTqaFgnGDyjyK/G0gHnfs6GMO f4pZF5pD0WVTRUUtX/poFmMK/yT33htFrzCJI3SPQBQCC/XJIIMkHi0/AlFdFGr1fFCvT7 yd3eTX5Hghh8SA8vuyltt656UDQJoFZetziWbZfrYFky61ib70/s6ZHmSsixZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 4ddDfq702Fz3j9 for ; Fri, 26 Dec 2025 18:29:39 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-8b29aebdf3cso125673785a.1 for ; Fri, 26 Dec 2025 10:29:39 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWzxauMCirIeMv865EIHJbUaXmn0KaVRlOODjKUnPsb33i9uudpXSrMXArR6QQ9OBVdBlh54HvwZLdkjc7Rr+64OweRYQ==@freebsd.org X-Gm-Message-State: AOJu0YziYpFF6nLGm4UsMRRn+0JqIgGh+XBHGYhl/4YhmIPVGmW5n7ks LjA8wKx5+oM7V+uM2pCEvbnEvt8/DNb/czeUenUrvtgdLfJ/uyuWVAw8ZZ7Isd5N/unFIycu5yd ZUHy08NFNl7cJne9GDmA6eheLBDoZFA4= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddFC520Mlz6M0Vg 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 4ddFC50zPKz3GZr 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 4ddFC50Rqtz8y3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 19:20:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddFnb3mD9z6M1pc for ; Fri, 26 Dec 2025 19:20:35 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic304-25.consmr.mail.gq1.yahoo.com (sonic304-25.consmr.mail.gq1.yahoo.com [98.137.68.206]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddFnY0KKhz3JhW for ; Fri, 26 Dec 2025 19:20:32 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=fn6rGyZd; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.206 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766776825; bh=siEzY9111uyggWQk9q8PrBap8Hd8D+K87q6Gs/NFGK4=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=fn6rGyZdDH/A5L/XPHmQeTTZ5i7vMDrVFpmAW9jm26TI/58IC/PEwFcEXv32S7D9qzZII2D09xiTDtwyhHa7ccaP1yYkIYKDIKbkPz0hAtc3GHbxgMxf+UUVW/n4aH5D6qHessc/T2YWsnTv8UQ12Ul50xlnIse1jG0ZI154qb+T3MCuZIbvLJmuSDzKKB62DqY2ZmDen2iHeKL25a0jrgBDF8E+k0nJj693mPdkhcbBc4cju6GXiCfFy0Lb3mk7OGxrR/TNRk27bIHrI4c+tiRnK5zyy1Ud//rwe9pA/BQT1qbxTVMqv9/LWYRFows5wD3OoTMP5qBSBG06Momqkw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1766776825; bh=IK/3TX4jBVjwvjW3XTygGwEdLfLMYxWUwwypIn2icT5=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=qPkiO4BNOyKR+Y1ICkFMB/rUk+b0KRgjNzwpTPqBPHPqALU7QHX4Rf/lTHFPAcJmVIWEITfGffXoOVm/qE35gVWxP+gTY0z9g7FvNp/WL/Yy2dJidw0KC3IubW+m1/QGN3HnNzYfsnEn57QMxz7O8//6P0zGkbBYu4voBLNnJlpyWpX74BWp73FIckXQtSjmqwGH43lbXYx7bgLsoUW6JNldlaNprVAGPB0lCdNqh1E17A49yYGKchru914QkLdSrVwE88eROE5WSEg9sGVmHZUpAQtt5cUsfyKyOJOIDiUvcNsmTzTobZWl5z4mbJGzS2F8rVOB+82tQ1Dsdg2t7w== X-YMail-OSG: X6mnJ2wVM1lA_LSZCXMCNgpzWjA4C8fKJ0enme3xw8Mkgfl5xn7UUPHY8zglBiy v9O18SUzLQRnskiky8HjpLRcujTtQm17wRy8R5dTO2UWQQS0tkhaKAyFZfOo8IT9BWWcTBwKv7to ws9lq4J3tvumMKcAk0T4H.fWqdd.CwavYSsIhNbDp7v225lQ_MCEEWkyz4GhnywE0R9aVHR3YULA rT8Tv5XjDBQcYlEUHQBB7.L8MV4iw6UdKdKATZytDhQKLEhNEJGdpqh0d1WSDNN2P7ZNfXHh_pME Cxj_cAZjflHhF6orOKfpPE2HZlo_fooAhbMHRQoxq4tlSrptlvSPkkYJrewjMlQVRYGUOCSYTUTB EsIvE9mOxNsLfTb_Yh0xQxrHDXSCRV5NeipcxhflFajkfu.lxNfC0chkDkINLldx6d5.7p9VM2JF UPUeyKZcT8Vs7G3wreztpgC5DFcl2hRnhTHog_k.kHmiF67LsKxmRQOpantxvAmL6YkFE3Nn_bAk 1Qg7YjE94J9HHSBriWSdGHzpN_pM7E0giX9Fub86daRlhwK0LZsmvT4Ziisc1JfmEEQeMYd6ibqy MAzJrq37M5K__BV6820JafEl5nfxKzwjo9dI.nRnHM3qAG9C0OSqAVcG4j2ieMhOIc5vFFKVYQF8 TiIn_AiBhi0S2Wi0MeZLJMhD7k_0PEKoOxrKAfq33SNaz90EXZmWBeWje9oG9iMm_9516DqG.sIx hL2y1hpWwI2h16k5SrQQWBsefn_x4P20m.kS.4BZ547JUewC4jYkKgEl8r.3Z.ZKdbxJVEGb6r7s _j1lrHbSln5nPbsI_qtCTTWR5QdobMfvoga12EjoqwtaZrEtY8ROKvjKZ9WhATTM5bIUSzy.Eruu piQRcCXd9AAxOvhxjlGocgsQ03Bt0mYQ5pFnfCRL2HlwLnUPKyRUKJHd4Whq_OJS1KZCqM14Kt2c lb8DcL_J.OcfhN1iad06itHY5jMuEQ1SMa6wPNVOTBnH8AlSrmPU0YLUZv4o2x36EdzPl6Zb.IrM RKMnxbTB1GYfkYEFp899UQNw7Kd3PVCOzPq0R9OCWQvppP_3v2xigm14vTce04d4WxDQOgz.96Kt oXyVkoEFTcuL_.WCEPkF3Ed.Qz0jCdQljJtSXrDej8Qvu2U2JGT.RMy7EsoQ6pIqvyrmm8tHDzCb YDbtt_J5cJWGjM9QR4Wi.8ePNnWQmGn.fiKXQx5Zc1CAYtK.guRC7TJz9CuSwdEbor78iW2kV57X d7D1ZalOOZ8PfV1D38YDegb1mbPYiJap5sTiU7iVEvvXSC4cYKsUaToTFsSWmzPCKAE6I69ppuGQ l2FpbxnBzOF1zq52nUcUtO8PnNKatNSoHcPc7UQdastG4.JfdylLZiufB10EE1b_MpVKxTgwFO22 RrFtbSsrdSCOGeH39WFurn0sq1ZehSllKGTxMKVqMxDWjuOYNxpXpHGHwmM47HeK3C5lwA2KwVkB om5B6d_yUWdzq4zSgPi3r624qYhLxckRwLbHU4Kbvps.mWX9frZeGpO3Z.930SrHke0TV0nGT_PC 6k.FItpNJH1oAczDWJySuRIZQM4hCm5UvYGMvTl9UU96aKcJ5xFLfRKYMEcUZpCN7INrSRfZG0Il AavizY3TFh9jLVmxIAtpaMMRTfzVqgF_oJn20xfwN8RnHutNiOG6iHwjgsST32UatQDnGTqMVq0L Rmfc2sptmWuOXh_5gNl4ZdxHYKDRliJXuYWqleUDq2lKIEDH7.aFnOuitBONcYqvmD9DboQkXqA4 kHpsRtuNe_jQVA3MSHi3V.HJjy7xeePY5W_heww3I_Z99xmI7mlo9XIq_3oEOa7ti_zucQasiiNi ZOEVyKAY6AdgPqQidVRCMRhUr0qMZEfAG1Ra_mrmOIm_babA5T2bYedJBnajI6j1KaSj4lXKXMaP JSU3yCBep_h_mgxFkwBTWzrU5CqY.cRjKYxL2BfVLXd3N3qELGHI6WKLsuSd2Efbd4yF1JBQgsmA tp8wPDYjvDIVt.X64W_OzV92Eq2sRLwy9lrJDdpKr6ZPBhtd5uBIQoy_i6h3YxY3JWBkPUbqFeD7 EIVQGjqeJ4fkep.Y4h3xzCKcZKHoeaGmOz8B7ot6pw0bevVKRCX3a9hjnSpQZ5PX_m7vZiAuulJF vPWJGAADrTpDOpUpLC_P0XlbD8JiA1mRFSbLBVS301sRoh3CqrtfLlb33DvMV5aYfCQ64yWXEFFT ZgEvbyHQIF9W4tthpc8iLZYNZqVd.nVWJGaMLVwppyWSVyWisMNCwFovo0IM095oHiJ22PDBbucj cHg-- X-Sonic-MF: X-Sonic-ID: e768b54c-b961-492a-854d-420df17c0f91 Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.gq1.yahoo.com with HTTP; Fri, 26 Dec 2025 19:20:25 +0000 Received: by hermes--production-gq1-54bf57fc64-8j6k2 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 6869f683cbde59277448aacf2db815e2; Fri, 26 Dec 2025 19:20:23 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob Message-Id: Date: Fri, 26 Dec 2025 11:20:12 -0800 To: Nuno Teixeira , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.66 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.66)[-0.664]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.206:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.206:from]; BLOCKLISTDE_FAIL(0.00)[98.137.68.206:server fail]; RCVD_VIA_SMTP_AUTH(0.00)[]; APPLE_MAILER_COMMON(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim] X-Rspamd-Queue-Id: 4ddFnY0KKhz3JhW Nuno Teixeira wrote kon Date: Fri, 26 Dec 2025 18:29:22 UTC : > > > *** [_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. Cool. FYI: One of the reasons that I use METHOD null with my own build is that I install from the same personal buildworld buildkernel that I use with the system into multipe poudriere-devel jails as well: build once, install many. Thus, fewer builds overall. And the jail activity is somewhat of a check on my personal build. The rest of the poudriere jails match official builds deliberately and I do not build them from source. === Mark Millard marklmi at yahoo.com From nobody Fri Dec 26 20:07:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddGr55mFLz6M4p0 for ; Fri, 26 Dec 2025 20:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ddGr554k8z3ML5 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 4ddGr54ZLyzC71 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 20:52:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddHqv4LSJz6M7HF for ; Fri, 26 Dec 2025 20:52:43 +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 4ddHqv3SjXz3TVh for ; Fri, 26 Dec 2025 20:52:43 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766782363; h=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=/9CUGxAY3TW81E/G6CAekNGpeH+EcCAF9yjxzsl4Xkw=; b=tnXxdupMz8HakbuDMA9MJwlIlMLpwI6yffesjg/B3PrvaoKKRFt1XuVKt/Odv5Ut5fRUl8 N01sexdPky5W/jZNIEn5onn/CDcD1UPKSltzEMxsadJpG2B3Fi6snAsIQ/zZ0yqJuDmomn nlI2c/j3yU1bxkYjFz85H6g5ZUU/TyQF96z8+E4OlibwnMfDmKtlK6adXdGltl/jQlHMnX ZJFdYgv33YkiBwAUNAmOIHTPIwTWGp7y/UiD3KT0LnbdqsKDmUYpJK61KuHdHNXiUNo9nL 0r1+8xs58opxfVR+CEftS3E2jxrhzs+VOXPpj7wi9of4pibAE8X0aEYiqD/ILw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766782363; h=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=/9CUGxAY3TW81E/G6CAekNGpeH+EcCAF9yjxzsl4Xkw=; b=r3tN/9rcnmuYaqNlBxeM7Ne+64EywYAgd7OgY8qp004WmwBYtsPrmcOqDIBYeafuHOQ0wW WfdGnv0ILihxZCsN+BWJwMRAMrGx7lCCfMdr9+s3K4aguSmpoXTfGeDQ+Bao4pKUJkkWRv I1OSYxwkQ2uoTFNNaiplknsSTmGgNWFWWJmcfpq83ww42jta3O89tSX+4113eMp7o0hM5Q J5bhIIpgyCR7jGVNR+t1FR3TEZoAj3rR+SPwd2M0KixpqsfxiAv9PAaXTWycn1GTkk9hdm Vob+Y1WZoPNDmXnCAVs5OKhWzohINuOsgI0bL1z9mPPgXovGIZRWk44J5s+CbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766782363; a=rsa-sha256; cv=none; b=TiZxitqs+en+IAcoDNXTT8bfwbFixfLfLZmFFS1BbqQc+qZ9I7gvIfB2603uLnTRJZ0OM2 DLw7IQdvxaYO0dMqJJ+5EkhjM50z0hEySaf9wQfNN+l1DpG05WVCbxC+ZedvO5f2Yt1kD1 sZZHI1fEuHm684bB/luLBrzPa3lCrKmDe9J4iojbK6UfsPvtUdPrNN08eEFItsT2y48T9y 13ZaBRxx3dAHTcT5cstN6+RqHXFhN4m5hlfUN73fsVWZ9zGDjKINwX4Lwx03o3MX6pwxMc NIc+kk1BTufGmlUyfLRBeKC5Z7agI7jL5IZKCbPzB7CNkM1/kUyBpdN2jRMeFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.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 4ddHqv32pKz8k8 for ; Fri, 26 Dec 2025 20:52:43 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-4ed96ee11c2so5331501cf.2 for ; Fri, 26 Dec 2025 12:52:43 -0800 (PST) X-Gm-Message-State: AOJu0Yxbvi1k3e2pTYVACxsckAassgKwLi69uXicxB/WRqA8UtXB2MIC efbVC6FGK70xr92uMcr/P/xt/rTfJbGc4qUYYq9No6hNP0Fe/ub1B4jDG58Ehze9qGqjH4f88C4 6dg7hfumTLrOGUwDkd18ha0EZOwEoG8M= X-Google-Smtp-Source: AGHT+IGM1OZQ9hNU7G5Yj6GcAd5oWi5/rRfBk7mzFhuR5HoAz4fpOrizASwKhWYAN921+a+PiRtCALjafnPJzGA9jeU= X-Received: by 2002:ac8:5744:0:b0:4ed:b7f0:c76e with SMTP id d75a77b69052e-4f4abdcbf88mr268821811cf.8.1766782362934; Fri, 26 Dec 2025 12:52:42 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Fri, 26 Dec 2025 20:52:18 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2qVvl0fzjlVQhz-QUrf5a13A3sTrmm6A32m_ZSkFj7ZyRQH_63_6V4-Rp0 Message-ID: Subject: Re: git: 8d5a11cd0137 - main - src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob To: Mark Millard Cc: dev-commits-src-main Content-Type: multipart/alternative; boundary="00000000000023648d0646e11359" --00000000000023648d0646e11359 Content-Type: text/plain; charset="UTF-8" > > I can confirm that using a correct src.conf in poudriere solved the > error. > > Cool. > > > FYI: One of the reasons that I use METHOD null with my own build > is that I install from the same personal buildworld buildkernel > that I use with the system into multipe poudriere-devel jails > as well: build once, install many. Thus, fewer builds overall. > And the jail activity is somewhat of a check on my personal > build. > > The rest of the poudriere jails match official builds > deliberately and I do not build them from source. > > > === > Mark Millard > marklmi at yahoo.com I did take a look at your method and it is interesting. Soon I will do some tries and see how I adapt to it and check if your method adapts to my needs. BTW, my simple modus operandi on testing current is something like: Every 1 or 2 weeks: - update src tree - buildworld & installworld - reboot into new BE - upgrade poudriere jail to match system (poudriere jail -u -j jail; with origins in -m src=/usr/src) - poudriere pkgclean -A - poudriere bulk my ports list - pkg delete -af - cd /usr/src && make delete-old delete-old-libs - pkg install my list This way I always hve fresh ports installed matching system and thus do some testing on current. As a ports committer, my tests are always on main and when about to commit, I'll testport official releases -- Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000023648d0646e11359 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

> I can confirm that using a correct src.conf in poudriere solved the er= ror.

Cool.


FYI: One of the reasons that I use METHOD null with my own build
is that I install from the same personal buildworld buildkernel
that I use with the system into multipe poudriere-devel jails
as well: build once, install many. Thus, fewer builds overall.
And the jail activity is somewhat of a check on my personal
build.

The rest of the poudriere jails match official builds
deliberately and I do not build them from source.


=3D=3D=3D
Mark Millard
marklmi at yahoo.com

I did take a look at your m= ethod and it is interesting. Soon I will do some tries and see how I adapt = to it and check if your method adapts to my needs.

BTW, m= y simple modus operandi on testing current is something like:

=
Every 1 or 2 weeks:

- update src tree
- buildworld & installworld
- reboot into new BE
=
- upgrade poudriere jail to match system (poudriere jail -u -j jail; w= ith origins in -m src=3D/usr/src)
- poudriere pkgclean -A
=
- poudriere bulk my ports list
- pkg delete -af
- cd /usr/src && make delete-old delete-old-libs
- pkg install my list

This way I always hve fresh= ports installed matching system and thus do some testing on current.
As a ports committer, my tests are always on main and when abo= ut to commit, I'll testport official releases


--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--00000000000023648d0646e11359-- From nobody Fri Dec 26 22:08:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddKWn261tz6MCqZ 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 4ddKWn1bPQz3bhD 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 4ddKWn18WFzWsm 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddLw14gmTz6MGs4 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 4ddLw13Qpwz3gxP 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 4ddLw12qNWzZrS 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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 21:59:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ddxFz44sxz6Lx7Y 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 4ddxFz3K18z3hRD 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 4ddxFz2QDpz2S9 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Sun Dec 28 01:17:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4df1gB1n2tz6MBbx 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 4df1gB0Ztgz426b 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 4df1g975cLz7xq 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4df7h6162tz6MTkJ 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 4df7h55PHZz3Dy6 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 4df7h543HXzXPY 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4df7h671Jfz6MTPF 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 4df7h64dS3z3F2j 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 4df7h63tRgzYhH 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfBzm34P8z6LQjR for ; Sun, 28 Dec 2025 08:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfBzl6wBhz3TFD 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=1766909860; h=from:from:reply-to:subject:subject: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=DFzEABdYFL6RPdsxzB7SXkCjotmk6Y9h0ffMyaNLqgmsAZjgIddSc/W0C6VvotiZlopQIs 2hISfTfSM+UG6Y1VsixjROhleTAiyijVRe8gWKQFNm5WbZnKy0ISQdNLLzmwqeRbqnKRrq fc5yxFBQJ6Xjf4t6G7uJ49ozFXnzXXFvVuZMiq6JEeKR3Q0cm+zMbRfvKdvtm0AWrRq1LK FA0KOvawUv3ND0KSg1RnRbuD1kjYi7fCdFIkqPrkQBKEhiUIqSlKhe9o/gBdBnIGJ2SrFV TZPVIexkQEV85p6Rqfp0Bu7K3+3222kz+3n5v7XIumQbN8b//n41xo9WQmtvJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766909860; h=from:from:reply-to:subject:subject: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=BDyVlML55IwgbuL9Un9gerO5ZAsb06YrO+WXLkWPUPBnvxLEQ1FxV4O4vb1zRVUMVb9poR 7xn3FQcX+xIwr6zCrmgBldHEiIb/ABImaT9AZxNhGmMnU3v/buY+ZFYqE3NqhnPKoZr14P mIOBVT+oDFT9kpMCQ5FDeP0uDuy0tOyf7zCt26IPo5EcfaNlLyt4XKJuwhLv1+BpH3m/hx b4klXaHn65h08ITWacRuFOJaxb5T8UjPEIpoEJXevcLJNFKeYusjW5TA2Pcq4n6UeUR4eq 9eFMxRBIfP1OvDd9a+v0HNCBNE9DMVd2yfkUDP30MwSA0CfUqo+Pdzl4hnCa9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766909860; a=rsa-sha256; cv=none; b=HQfbpVFAskajbZAZdo41MMiWbi1ka+jAZ6X+MajWR0FFEeNIN3bEXH17GD5Hr5QnwqeOt6 +p4wp78PgCEI83c03OuLhOiCEBTLpXTtMdoOcK+pXFZl9FLUNeeiBz5QFjBYGLWa+vbq5c X4eJTyJRHNPN2tap2PbAGZuV2y0WS2WUqeSrfNAHuJKPXpfpJ9e9p95N4iUbwP5xra5ZaT HdrGpqv38MCdMX1mMjxVXnK5iYIKY7qYM9Imja3aSBSlYtk3DnRUjvRvEJ6bBirCNrRKmL t6T5s1UhOWlaZc0Y+h36BqzjP8YKOW/e0PZ+zBawA3Im69ICRxfVUbwxEMYLTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfBzl5kW8zcS2 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfP6J3shjz6LyPl 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 4dfP6J34Rmz3K51 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 4dfP6J2gSdzrLc 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfPCw2BYXz6Lyys 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 4dfPCv74x4z3KR1 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 4dfPCv61CFzrLg 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfQqz3tvWz6M4Kc 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 4dfQqz3CRpz3Vwy 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 4dfQqz2gZ1ztl7 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfR2W0nRwz6M53X 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 4dfR2V72Twz3XBn 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 4dfR2V6Y9YztTX 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfRK31XlBz6M5cj 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 4dfRK30sP7z3YfV 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 4dfRK30GWbzvWb 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfRdX6ZsSz6M700 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 4dfRdX37BMz3dl6 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 4dfRdX2kX8zvXf 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfVQV6QtSz6MGpX 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 4dfVQV5c1sz3t8H 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 4dfVQV50FDzy6R 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfVQX1fWpz6MGYw 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 4dfVQW6GGTz3sw2 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 4dfVQW5kgmzyds 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfXH81Yjdz6MNds 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 4dfXH80hxrz48QC 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 4dfXH80HV4z11sH 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfXH94cgdz6MNhF 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 4dfXH926Vpz48Hm 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 4dfXH9164Wz11cf 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfYK73lwtz6MQsY 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 4dfYK72NFFz3GV0 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 4dfYK71hFFz13QX 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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)); }