--- sys/fs/nfsclient/nfs_clvfsops.c.xattr 2025-04-02 13:22:59.000000000 -0700 +++ sys/fs/nfsclient/nfs_clvfsops.c 2025-04-03 12:53:36.876246000 -0700 @@ -1801,12 +1801,17 @@ mountnfs(struct nfs_args *argp, struct mount *mp, stru if (argp->flags & NFSMNT_NFSV3) ncl_fsinfo(nmp, *vpp, cred, td); - /* Mark if the mount point supports NFSv4 ACLs. */ - if ((argp->flags & NFSMNT_NFSV4) != 0 && nfsrv_useacl != 0 && - ret == 0 && - NFSISSET_ATTRBIT(&nfsva.na_suppattr, NFSATTRBIT_ACL)) { + /* + * Mark if the mount point supports NFSv4 ACLs and + * named attributes. + */ + if ((argp->flags & NFSMNT_NFSV4) != 0) { MNT_ILOCK(mp); - mp->mnt_flag |= MNT_NFS4ACLS; + if (ret == 0 && nfsrv_useacl != 0 && + NFSISSET_ATTRBIT(&nfsva.na_suppattr, + NFSATTRBIT_ACL)) + mp->mnt_flag |= MNT_NFS4ACLS; + mp->mnt_flag |= MNT_NAMEDATTR; MNT_IUNLOCK(mp); } --- sys/fs/nfsclient/nfs_clvnops.c.xattr 2025-02-28 13:15:32.000000000 -0800 +++ sys/fs/nfsclient/nfs_clvnops.c 2025-04-03 14:42:51.511592000 -0700 @@ -623,6 +623,7 @@ nfs_open(struct vop_open_args *ap) struct ucred *cred; vm_object_t obj; +printf("nfs_open mode=0x%x vtyp=%d irflg=0x%x\n", fmode, vp->v_type, vn_irflag_read(vp)); if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK) return (EOPNOTSUPP); @@ -1211,12 +1212,14 @@ nfs_lookup(struct vop_lookup_args *ap) struct nfsnode *np, *newnp; int error = 0, attrflag, dattrflag, ltype, ncticks; struct thread *td = curthread; - struct nfsfh *nfhp; + struct nfsfh *nfhp, *nfhp2; struct nfsvattr dnfsva, nfsva; struct vattr vattr; struct timespec nctime, ts; uint32_t openmode; + bool is_nameddir, needs_nameddir, opennamed; + dattrflag = 0; *vpp = NULLVP; if ((flags & ISLASTCN) && (mp->mnt_flag & MNT_RDONLY) && (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) @@ -1237,77 +1240,93 @@ nfs_lookup(struct vop_lookup_args *ap) error = vn_dir_check_exec(dvp, cnp); if (error != 0) return (error); - error = cache_lookup(dvp, vpp, cnp, &nctime, &ncticks); - if (error > 0 && error != ENOENT) - return (error); - if (error == -1) { - /* - * Lookups of "." are special and always return the - * current directory. cache_lookup() already handles - * associated locking bookkeeping, etc. - */ - if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') { - return (0); - } - /* - * We only accept a positive hit in the cache if the - * change time of the file matches our cached copy. - * Otherwise, we discard the cache entry and fallback - * to doing a lookup RPC. We also only trust cache - * entries for less than nm_nametimeo seconds. - * - * To better handle stale file handles and attributes, - * clear the attribute cache of this node if it is a - * leaf component, part of an open() call, and not - * locally modified before fetching the attributes. - * This should allow stale file handles to be detected - * here where we can fall back to a LOOKUP RPC to - * recover rather than having nfs_open() detect the - * stale file handle and failing open(2) with ESTALE. - */ - newvp = *vpp; - newnp = VTONFS(newvp); - if (!(nmp->nm_flag & NFSMNT_NOCTO) && - (flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN) && - !(newnp->n_flag & NMODIFIED)) { - NFSLOCKNODE(newnp); - newnp->n_attrstamp = 0; - KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(newvp); - NFSUNLOCKNODE(newnp); + needs_nameddir = false; + opennamed = (cnp->cn_flags & (OPENNAMED | ISLASTCN)) == + (OPENNAMED | ISLASTCN); + is_nameddir = (vn_irflag_read(dvp) & VIRF_NAMEDDIR) != 0; + if (opennamed) { + cnp->cn_flags &= ~MAKEENTRY; +printf("nfs_lookup: opennamed=0x%x\n", vn_irflag_read(dvp)); + if (!is_nameddir) + needs_nameddir = true; +printf("needs_nameddir=%d\n", needs_nameddir); + } else { + error = cache_lookup(dvp, vpp, cnp, &nctime, &ncticks); + if (error > 0 && error != ENOENT) + return (error); + if (error == -1) { + /* + * Lookups of "." are special and always return the + * current directory. cache_lookup() already handles + * associated locking bookkeeping, etc. + */ + if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') { + return (0); + } + + /* + * We only accept a positive hit in the cache if the + * change time of the file matches our cached copy. + * Otherwise, we discard the cache entry and fallback + * to doing a lookup RPC. We also only trust cache + * entries for less than nm_nametimeo seconds. + * + * To better handle stale file handles and attributes, + * clear the attribute cache of this node if it is a + * leaf component, part of an open() call, and not + * locally modified before fetching the attributes. + * This should allow stale file handles to be detected + * here where we can fall back to a LOOKUP RPC to + * recover rather than having nfs_open() detect the + * stale file handle and failing open(2) with ESTALE. + */ + newvp = *vpp; + newnp = VTONFS(newvp); + if (!(nmp->nm_flag & NFSMNT_NOCTO) && + (flags & (ISLASTCN | ISOPEN)) == + (ISLASTCN | ISOPEN) && + !(newnp->n_flag & NMODIFIED)) { + NFSLOCKNODE(newnp); + newnp->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(newvp); + NFSUNLOCKNODE(newnp); + } + if (nfscl_nodeleg(newvp, 0) == 0 || + ((u_int)(ticks - ncticks) < + (nmp->nm_nametimeo * hz) && + VOP_GETATTR(newvp, &vattr, cnp->cn_cred) == 0 && + timespeccmp(&vattr.va_ctime, &nctime, ==))) { + NFSINCRGLOBAL(nfsstatsv1.lookupcache_hits); + return (0); + } + cache_purge(newvp); + if (dvp != newvp) + vput(newvp); + else + vrele(newvp); + *vpp = NULLVP; + } else if (error == ENOENT) { + if (VN_IS_DOOMED(dvp)) + return (ENOENT); + /* + * We only accept a negative hit in the cache if the + * modification time of the parent directory matches + * the cached copy in the name cache entry. + * Otherwise, we discard all of the negative cache + * entries for this directory. We also only trust + * negative cache entries for up to nm_negnametimeo + * seconds. + */ + if ((u_int)(ticks - ncticks) < + (nmp->nm_negnametimeo * hz) && + VOP_GETATTR(dvp, &vattr, cnp->cn_cred) == 0 && + timespeccmp(&vattr.va_mtime, &nctime, ==)) { + NFSINCRGLOBAL(nfsstatsv1.lookupcache_hits); + return (ENOENT); + } + cache_purge_negative(dvp); } - if (nfscl_nodeleg(newvp, 0) == 0 || - ((u_int)(ticks - ncticks) < (nmp->nm_nametimeo * hz) && - VOP_GETATTR(newvp, &vattr, cnp->cn_cred) == 0 && - timespeccmp(&vattr.va_ctime, &nctime, ==))) { - NFSINCRGLOBAL(nfsstatsv1.lookupcache_hits); - return (0); - } - cache_purge(newvp); - if (dvp != newvp) - vput(newvp); - else - vrele(newvp); - *vpp = NULLVP; - } else if (error == ENOENT) { - if (VN_IS_DOOMED(dvp)) - return (ENOENT); - /* - * We only accept a negative hit in the cache if the - * modification time of the parent directory matches - * the cached copy in the name cache entry. - * Otherwise, we discard all of the negative cache - * entries for this directory. We also only trust - * negative cache entries for up to nm_negnametimeo - * seconds. - */ - if ((u_int)(ticks - ncticks) < (nmp->nm_negnametimeo * hz) && - VOP_GETATTR(dvp, &vattr, cnp->cn_cred) == 0 && - timespeccmp(&vattr.va_mtime, &nctime, ==)) { - NFSINCRGLOBAL(nfsstatsv1.lookupcache_hits); - return (ENOENT); - } - cache_purge_negative(dvp); } openmode = 0; @@ -1328,7 +1347,7 @@ nfs_lookup(struct vop_lookup_args *ap) if (NFSHASNFSV4N(nmp) && NFSHASONEOPENOWN(nmp) && !NFSHASPNFS(nmp) && (nmp->nm_privflag & NFSMNTP_DELEGISSUED) == 0 && (!NFSMNT_RDONLY(mp) || (flags & OPENWRITE) == 0) && - (flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN)) { + (flags & (ISLASTCN | ISOPEN | OPENNAMED))) == (ISLASTCN | ISOPEN)) { if ((flags & OPENREAD) != 0) openmode |= NFSV4OPEN_ACCESSREAD; if ((flags & OPENWRITE) != 0) @@ -1340,171 +1359,219 @@ nfs_lookup(struct vop_lookup_args *ap) newvp = NULLVP; NFSINCRGLOBAL(nfsstatsv1.lookupcache_misses); nanouptime(&ts); - error = nfsrpc_lookup(dvp, cnp->cn_nameptr, cnp->cn_namelen, - cnp->cn_cred, td, &dnfsva, &nfsva, &nfhp, &attrflag, &dattrflag, - openmode); - if (dattrflag) - (void) nfscl_loadattrcache(&dvp, &dnfsva, NULL, 0, 1); - if (error) { - if (newvp != NULLVP) { - vput(newvp); - *vpp = NULLVP; + if (!needs_nameddir || cnp->cn_namelen != 1 || + *cnp->cn_nameptr != '.') { + error = nfsrpc_lookup(dvp, cnp->cn_nameptr, cnp->cn_namelen, + cnp->cn_cred, td, &dnfsva, &nfsva, &nfhp, &attrflag, + &dattrflag, openmode); +if (opennamed) printf("nfsrpc_lookup nm=%s %d\n", cnp->cn_nameptr, error); + if (dattrflag) + (void) nfscl_loadattrcache(&dvp, &dnfsva, NULL, 0, 1); +handle_error: + if (error) { + if (newvp != NULLVP) { + vput(newvp); + *vpp = NULLVP; + } + + if (error != ENOENT) { + if (NFS_ISV4(dvp)) + error = nfscl_maperr(td, error, + (uid_t)0, (gid_t)0); + return (error); + } + + /* The requested file was not found. */ + if ((cnp->cn_nameiop == CREATE || + cnp->cn_nameiop == RENAME) && + (flags & ISLASTCN)) { + /* + * XXX: UFS does a full VOP_ACCESS(dvp, + * VWRITE) here instead of just checking + * MNT_RDONLY. + */ + if (mp->mnt_flag & MNT_RDONLY) + return (EROFS); + return (EJUSTRETURN); + } + + if ((cnp->cn_flags & MAKEENTRY) != 0 && dattrflag) { + /* + * Cache the modification time of the parent + * directory from the post-op attributes in + * the name cache entry. The negative cache + * entry will be ignored once the directory + * has changed. Don't bother adding the entry + * if the directory has already changed. + */ + NFSLOCKNODE(np); + if (timespeccmp(&np->n_vattr.na_mtime, + &dnfsva.na_mtime, ==)) { + NFSUNLOCKNODE(np); + cache_enter_time(dvp, NULL, cnp, + &dnfsva.na_mtime, NULL); + } else + NFSUNLOCKNODE(np); + } + return (ENOENT); } + } else { + /* Lookup of "." to get a named attribute directory. */ + nfhp = malloc(sizeof(struct nfsfh) + np->n_fhp->nfh_len, + M_NFSFH, M_WAITOK); + nfhp->nfh_len = np->n_fhp->nfh_len; + NFSBCOPY(np->n_fhp->nfh_fh, nfhp->nfh_fh, nfhp->nfh_len); + } - if (error != ENOENT) { - if (NFS_ISV4(dvp)) - error = nfscl_maperr(td, error, (uid_t)0, - (gid_t)0); - return (error); - } - - /* The requested file was not found. */ - if ((cnp->cn_nameiop == CREATE || cnp->cn_nameiop == RENAME) && - (flags & ISLASTCN)) { + /* + * If the named attribute directory is needed, acquire it now. + */ + error = 0; + if (opennamed && needs_nameddir) { +printf("bfr nfsrpc_openattr dty=%d irfl=0x%x\n", dvp->v_type, vn_irflag_read(dvp)); + attrflag = 0; + error = nfsrpc_openattr(nmp, dvp, nfhp->nfh_fh, + nfhp->nfh_len, (cnp->cn_flags & CREATENAMED), + cnp->cn_cred, td, &nfsva, &nfhp2, &attrflag); +printf("nfsrpc_openattr=%d attrflag=%d type=%d\n", error, attrflag, nfsva.na_vattr.va_type); + if (error == NFSERR_NOTSUPP) + error = ENOATTR; + free(nfhp, M_NFSFH); + if (error == 0) + nfhp = nfhp2; + else + goto handle_error; + } + if (error == 0) { + if (cnp->cn_nameiop == RENAME && (flags & ISLASTCN)) { /* - * XXX: UFS does a full VOP_ACCESS(dvp, - * VWRITE) here instead of just checking - * MNT_RDONLY. + * Handle RENAME case... */ - if (mp->mnt_flag & MNT_RDONLY) - return (EROFS); - return (EJUSTRETURN); - } - - if ((cnp->cn_flags & MAKEENTRY) != 0 && dattrflag) { + if (NFS_CMPFH(np, nfhp->nfh_fh, nfhp->nfh_len)) { + free(nfhp, M_NFSFH); + return (EISDIR); + } + error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, + LK_EXCLUSIVE); + if (error) + return (error); + newvp = NFSTOV(np); /* - * Cache the modification time of the parent - * directory from the post-op attributes in - * the name cache entry. The negative cache - * entry will be ignored once the directory - * has changed. Don't bother adding the entry - * if the directory has already changed. + * If n_localmodtime >= time before RPC, then + * a file modification operation, such as + * VOP_SETATTR() of size, has occurred while + * the Lookup RPC and acquisition of the vnode + * happened. As such, the attributes might + * be stale, with possibly an incorrect size. */ NFSLOCKNODE(np); - if (timespeccmp(&np->n_vattr.na_mtime, - &dnfsva.na_mtime, ==)) { - NFSUNLOCKNODE(np); - cache_enter_time(dvp, NULL, cnp, - &dnfsva.na_mtime, NULL); - } else - NFSUNLOCKNODE(np); + if (timespecisset(&np->n_localmodtime) && + timespeccmp(&np->n_localmodtime, &ts, >=)) { + NFSCL_DEBUG(4, "nfs_lookup: rename localmod " + "stale attributes\n"); + attrflag = 0; + } + NFSUNLOCKNODE(np); + if (attrflag) + (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, + 0, 1); + *vpp = newvp; + return (0); } - return (ENOENT); - } - - /* - * Handle RENAME case... - */ - if (cnp->cn_nameiop == RENAME && (flags & ISLASTCN)) { - if (NFS_CMPFH(np, nfhp->nfh_fh, nfhp->nfh_len)) { - free(nfhp, M_NFSFH); - return (EISDIR); - } - error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, LK_EXCLUSIVE); - if (error) - return (error); - newvp = NFSTOV(np); - /* - * If n_localmodtime >= time before RPC, then - * a file modification operation, such as - * VOP_SETATTR() of size, has occurred while - * the Lookup RPC and acquisition of the vnode - * happened. As such, the attributes might - * be stale, with possibly an incorrect size. - */ - NFSLOCKNODE(np); - if (timespecisset(&np->n_localmodtime) && - timespeccmp(&np->n_localmodtime, &ts, >=)) { - NFSCL_DEBUG(4, "nfs_lookup: rename localmod " - "stale attributes\n"); - attrflag = 0; - } - NFSUNLOCKNODE(np); - if (attrflag) - (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, 0, 1); - *vpp = newvp; - return (0); - } - - if (flags & ISDOTDOT) { - ltype = NFSVOPISLOCKED(dvp); - error = vfs_busy(mp, MBF_NOWAIT); - if (error != 0) { - vfs_ref(mp); + + if (flags & ISDOTDOT) { + ltype = NFSVOPISLOCKED(dvp); + error = vfs_busy(mp, MBF_NOWAIT); + if (error != 0) { + vfs_ref(mp); + NFSVOPUNLOCK(dvp); + error = vfs_busy(mp, 0); + NFSVOPLOCK(dvp, ltype | LK_RETRY); + vfs_rel(mp); + if (error == 0 && VN_IS_DOOMED(dvp)) { + vfs_unbusy(mp); + error = ENOENT; + } + if (error != 0) + return (error); + } NFSVOPUNLOCK(dvp); - error = vfs_busy(mp, 0); - NFSVOPLOCK(dvp, ltype | LK_RETRY); - vfs_rel(mp); - if (error == 0 && VN_IS_DOOMED(dvp)) { - vfs_unbusy(mp); + error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, + cnp->cn_lkflags); + if (error == 0) + newvp = NFSTOV(np); + vfs_unbusy(mp); + if (newvp != dvp) + NFSVOPLOCK(dvp, ltype | LK_RETRY); + if (VN_IS_DOOMED(dvp)) { + if (error == 0) { + if (newvp == dvp) + vrele(newvp); + else + vput(newvp); + } error = ENOENT; } if (error != 0) return (error); - } - NFSVOPUNLOCK(dvp); - error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, - cnp->cn_lkflags); - if (error == 0) + if (attrflag) + (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, + 0, 1); + } else if (NFS_CMPFH(np, nfhp->nfh_fh, nfhp->nfh_len)) { + free(nfhp, M_NFSFH); + VREF(dvp); + newvp = dvp; + if (attrflag) + (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, + 0, 1); + } else { + error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, + cnp->cn_lkflags); + if (error) + return (error); newvp = NFSTOV(np); - vfs_unbusy(mp); - if (newvp != dvp) - NFSVOPLOCK(dvp, ltype | LK_RETRY); - if (VN_IS_DOOMED(dvp)) { - if (error == 0) { - if (newvp == dvp) - vrele(newvp); + if (opennamed) { +printf("Got vp for opennamed needs_nameddir=%d\n", needs_nameddir); + if (needs_nameddir) + vn_irflag_set_cond(newvp, + VIRF_NAMEDDIR); else - vput(newvp); + vn_irflag_set_cond(newvp, + VIRF_NAMEDATTR); } - error = ENOENT; - } - if (error != 0) - return (error); - if (attrflag) - (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, 0, 1); - } else if (NFS_CMPFH(np, nfhp->nfh_fh, nfhp->nfh_len)) { - free(nfhp, M_NFSFH); - VREF(dvp); - newvp = dvp; - if (attrflag) - (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, 0, 1); - } else { - error = nfscl_nget(mp, dvp, nfhp, cnp, td, &np, - cnp->cn_lkflags); - if (error) - return (error); - newvp = NFSTOV(np); - /* - * If n_localmodtime >= time before RPC, then - * a file modification operation, such as - * VOP_SETATTR() of size, has occurred while - * the Lookup RPC and acquisition of the vnode - * happened. As such, the attributes might - * be stale, with possibly an incorrect size. - */ - NFSLOCKNODE(np); - if (timespecisset(&np->n_localmodtime) && - timespeccmp(&np->n_localmodtime, &ts, >=)) { - NFSCL_DEBUG(4, "nfs_lookup: localmod " - "stale attributes\n"); - attrflag = 0; - } - NFSUNLOCKNODE(np); - if (attrflag) - (void) nfscl_loadattrcache(&newvp, &nfsva, NULL, 0, 1); - else if ((flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN) && - !(np->n_flag & NMODIFIED)) { /* - * Flush the attribute cache when opening a - * leaf node to ensure that fresh attributes - * are fetched in nfs_open() since we did not - * fetch attributes from the LOOKUP reply. + * If n_localmodtime >= time before RPC, then + * a file modification operation, such as + * VOP_SETATTR() of size, has occurred while + * the Lookup RPC and acquisition of the vnode + * happened. As such, the attributes might + * be stale, with possibly an incorrect size. */ NFSLOCKNODE(np); - np->n_attrstamp = 0; - KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(newvp); + if (timespecisset(&np->n_localmodtime) && + timespeccmp(&np->n_localmodtime, &ts, >=)) { + NFSCL_DEBUG(4, "nfs_lookup: localmod " + "stale attributes\n"); + attrflag = 0; + } NFSUNLOCKNODE(np); + if (attrflag) + (void)nfscl_loadattrcache(&newvp, &nfsva, NULL, + 0, 1); + else if ((flags & (ISLASTCN | ISOPEN)) == + (ISLASTCN | ISOPEN) && + !(np->n_flag & NMODIFIED)) { + /* + * Flush the attribute cache when opening a + * leaf node to ensure that fresh attributes + * are fetched in nfs_open() since we did not + * fetch attributes from the LOOKUP reply. + */ + NFSLOCKNODE(np); + np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(newvp); + NFSUNLOCKNODE(np); + } } } if ((cnp->cn_flags & MAKEENTRY) && dvp != newvp && @@ -2159,6 +2226,7 @@ nfs_link(struct vop_link_args *ap) struct nfsvattr nfsva, dnfsva; int error = 0, attrflag, dattrflag; +printf("attempting link...\n"); /* * Push all writes to the server, so that the attribute cache * doesn't get "out of sync" with the server. @@ -2168,6 +2236,7 @@ nfs_link(struct vop_link_args *ap) error = nfsrpc_link(tdvp, vp, cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_cred, curthread, &dnfsva, &nfsva, &attrflag, &dattrflag); +printf("aft link=%d\n", error); tdnp = VTONFS(tdvp); NFSLOCKNODE(tdnp); tdnp->n_flag |= NMODIFIED; @@ -4375,9 +4444,13 @@ nfs_pathconf(struct vop_pathconf_args *ap) struct nfsmount *nmp; struct thread *td = curthread; off_t off; - bool eof; + bool eof, named_enabled; int attrflag, error; + struct nfsnode *np; + nmp = VFSTONFS(vp->v_mount); + np = VTONFS(vp); + named_enabled = false; if ((NFS_ISV34(vp) && (ap->a_name == _PC_LINK_MAX || ap->a_name == _PC_NAME_MAX || ap->a_name == _PC_CHOWN_RESTRICTED || ap->a_name == _PC_NO_TRUNC)) || @@ -4394,6 +4467,23 @@ nfs_pathconf(struct vop_pathconf_args *ap) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (error != 0) return (error); + } else if (NFS_ISV4(vp) && ap->a_name == _PC_NAMEDATTR_ENABLED && + (np->n_flag & NNAMEDNOTSUPP) == 0) { + struct nfsfh *nfhp; + + error = nfsrpc_openattr(nmp, vp, np->n_fhp->nfh_fh, + np->n_fhp->nfh_len, false, td->td_ucred, td, &nfsva, &nfhp, + &attrflag); + named_enabled = true; + if (error == 0) { + free(nfhp, M_NFSFH); + } else if (error == NFSERR_NOTSUPP) { + named_enabled = false; + NFSLOCKNODE(np); + np->n_flag |= NNAMEDNOTSUPP; + NFSUNLOCKNODE(np); + } + error = 0; } else { /* * For NFSv2 (or NFSv3 when not one of the above 4 a_names), @@ -4476,7 +4566,6 @@ nfs_pathconf(struct vop_pathconf_args *ap) case _PC_MIN_HOLE_SIZE: /* Only some NFSv4.2 servers support Seek for Holes. */ *ap->a_retval = 0; - nmp = VFSTONFS(vp->v_mount); if (NFS_ISV4(vp) && nmp->nm_minorvers == NFSV42_MINORVERSION) { /* * NFSv4.2 doesn't have an attribute for hole size, @@ -4506,6 +4595,11 @@ nfs_pathconf(struct vop_pathconf_args *ap) *ap->a_retval = vp->v_mount->mnt_stat.f_iosize; mtx_unlock(&nmp->nm_mtx); } + break; + case _PC_NAMEDATTR_ENABLED: + *ap->a_retval = 0; + if (named_enabled) + *ap->a_retval = 1; break; default: --- sys/fs/nfsclient/nfs_clrpcops.c.xattr 2025-04-02 13:22:59.000000000 -0700 +++ sys/fs/nfsclient/nfs_clrpcops.c 2025-04-03 12:53:36.885201000 -0700 @@ -392,7 +392,8 @@ nfsrpc_open(vnode_t vp, int amode, struct ucred *cred, mode |= NFSV4OPEN_ACCESSWRITE; if (NFSHASNFSV4N(nmp)) { if (!NFSHASPNFS(nmp) && nfscl_enablecallb != 0 && - nfs_numnfscbd > 0) { + nfs_numnfscbd > 0 && + (vn_irflag_read(vp) & VIRF_NAMEDATTR) == 0) { if ((mode & NFSV4OPEN_ACCESSWRITE) != 0) mode |= NFSV4OPEN_WANTWRITEDELEG; else @@ -3878,13 +3879,16 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui size_t tresid; u_int32_t *tl2 = NULL, rderr; struct timespec dctime, ts; - bool attr_ok, validentry; + bool attr_ok, named_dir, validentry; KASSERT(uiop->uio_iovcnt == 1 && (uiop->uio_resid & (DIRBLKSIZ - 1)) == 0, ("nfs readdirplusrpc bad uio")); KASSERT(uiop->uio_segflg == UIO_SYSSPACE, ("nfsrpc_readdirplus: uio userspace")); + named_dir = false; + if ((vp->v_irflag & VIRF_NAMEDDIR) != 0) + named_dir = true; ncookie.lval[0] = ncookie.lval[1] = 0; timespecclear(&dctime); *attrflagp = 0; @@ -4322,7 +4326,8 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui if (cnp->cn_namelen <= NCHNAMLEN && ndp->ni_dvp != ndp->ni_vp && (newvp->v_type != VDIR || - dctime.tv_sec != 0)) { + dctime.tv_sec != 0) && + !named_dir) { cache_enter_time_flags(ndp->ni_dvp, ndp->ni_vp, cnp, &nfsva.na_ctime, @@ -9527,6 +9532,50 @@ nfsmout: if (error != 0) printf("nfsrpc_bindconnsess: reply bad xdr\n"); m_freem(nd->nd_mrep); +} + +/* + * nfs opeattr rpc + */ +int +nfsrpc_openattr(struct nfsmount *nmp, struct vnode *vp, uint8_t *fhp, int fhlen, + bool createit, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, + struct nfsfh **nfhpp, int *attrflagp) +{ + uint32_t *tl; + struct nfsrv_descript nfsd, *nd = &nfsd; + nfsattrbit_t attrbits; + int error = 0; + + *attrflagp = 0; + nfscl_reqstart(nd, NFSPROC_OPENATTR, nmp, fhp, fhlen, NULL, NULL, 0, 0, + cred); + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if (createit) + *tl = newnfs_true; + else + *tl = newnfs_false; + NFSGETATTR_ATTRBIT(&attrbits); + NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED); + *tl++ = txdr_unsigned(NFSV4OP_GETFH); + *tl = txdr_unsigned(NFSV4OP_GETATTR); + (void)nfsrv_putattrbit(nd, &attrbits); + error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, vp, p, cred, + NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); + if (error != 0) + return (error); + if (nd->nd_repstat == 0) { + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + error = nfsm_getfh(nd, nfhpp); + if (error != 0) + goto nfsmout; + error = nfscl_postop_attr(nd, nap, attrflagp); + } +nfsmout: + m_freem(nd->nd_mrep); + if (error == 0 && nd->nd_repstat != 0) + error = nd->nd_repstat; + return (error); } /* --- sys/fs/nfsclient/nfsnode.h.xattr 2024-04-30 18:20:49.000000000 -0700 +++ sys/fs/nfsclient/nfsnode.h 2025-04-03 12:53:36.885913000 -0700 @@ -162,6 +162,7 @@ struct nfsnode { #define NDSCOMMIT 0x00100000 /* Commit is done via the DS. */ #define NVNSETSZSKIP 0x00200000 /* Skipped vnode_pager_setsize() */ #define NMIGHTBELOCKED 0x00400000 /* Might be file locked. */ +#define NNAMEDNOTSUPP 0x00800000 /* Openattr is not supported. */ /* * Convert between nfsnode pointers and vnode pointers --- sys/fs/nfs/nfs_var.h.xattr 2025-04-02 13:22:59.000000000 -0700 +++ sys/fs/nfs/nfs_var.h 2025-04-03 12:57:50.561054000 -0700 @@ -368,6 +368,8 @@ void nfsm_set(struct nfsrv_descript *, u_int); struct mbuf *nfsm_add_ext_pgs(struct mbuf *, int, int *); int nfsrpc_destroysession(struct nfsmount *, struct nfsclsession *, struct ucred *, NFSPROC_T *); +uint32_t vtonfsv4_type(struct vattr *); +__enum_uint8(vtype) nfsv4tov_type(uint32_t, uint16_t *); /* nfs_clcomsubs.c */ int nfsm_uiombuf(struct nfsrv_descript *, struct uio *, int); @@ -568,6 +570,9 @@ int nfsrpc_listextattr(vnode_t, uint64_t *, struct uio int nfsrpc_rmextattr(vnode_t, const char *, struct nfsvattr *, int *, struct ucred *, NFSPROC_T *); void nfsrpc_bindconnsess(CLIENT *, void *, struct ucred *); +int nfsrpc_openattr(struct nfsmount *, struct vnode *, uint8_t *, int, + bool, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsfh **, + int *); /* nfs_clstate.c */ int nfscl_open(vnode_t, u_int8_t *, int, u_int32_t, int, --- sys/fs/nfs/nfsport.h.xattr 2025-02-28 13:15:31.000000000 -0800 +++ sys/fs/nfs/nfsport.h 2025-04-03 13:09:15.859848000 -0700 @@ -439,10 +439,13 @@ /* Do an NFSv4 Verify+Write. */ #define NFSPROC_APPENDWRITE 69 +/* Do a NFSv4 Openattr. */ +#define NFSPROC_OPENATTR 70 + /* * Must be defined as one higher than the last NFSv4.2 Proc# above. */ -#define NFSV42_NPROCS 70 +#define NFSV42_NPROCS 71 /* Value of NFSV42_NPROCS for old nfsstats structure. (Always 69) */ #define NFSV42_OLDNPROCS 69 @@ -474,7 +477,7 @@ struct nfsstatsv1 { uint64_t readlink_bios; uint64_t biocache_readdirs; uint64_t readdir_bios; - uint64_t rpccnt[NFSV42_NPROCS + 10]; + uint64_t rpccnt[NFSV42_NPROCS + 9]; uint64_t rpcretries; uint64_t srvrpccnt[NFSV42_NOPS + NFSV4OP_FAKENOPS + 15]; uint64_t srvlayouts; @@ -690,6 +693,7 @@ struct nfsvattr { #define na_bytes na_vattr.va_bytes #define na_filerev na_vattr.va_filerev #define na_vaflags na_vattr.va_vaflags +#define na_bsdflags na_vattr.va_bsdflags #include @@ -1180,9 +1184,11 @@ struct nfsreq { */ #ifdef VV_DISABLEDELEG #define NFSVNO_DELEGOK(v) \ - ((v) == NULL || ((v)->v_vflag & VV_DISABLEDELEG) == 0) + ((v) == NULL || ((v)->v_vflag & VV_DISABLEDELEG) == 0 || \ + (vn_irflag_read(v) & VIRF_NAMEDATTR) == 0) #else -#define NFSVNO_DELEGOK(v) (1) +#define NFSVNO_DELEGOK(v) \ + ((v) == NULL || (vn_irflag_read(v) & VIRF_NAMEDATTR) == 0) #endif /* --- sys/fs/nfs/nfsproto.h.xattr 2025-03-03 18:20:45.000000000 -0800 +++ sys/fs/nfs/nfsproto.h 2025-04-03 12:53:36.888999000 -0700 @@ -275,6 +275,8 @@ #define NFSX_V4SESSIONID 16 #define NFSX_V4DEVICEID 16 #define NFSX_V4PNFSFH (sizeof(fhandle_t) + 1) +#define NFSX_V4NAMEDDIRFH 2 +#define NFSX_V4NAMEDATTRFH 3 #define NFSX_V4FILELAYOUT (4 * NFSX_UNSIGNED + NFSX_V4DEVICEID + \ NFSX_HYPER + NFSM_RNDUP(NFSX_V4PNFSFH)) #define NFSX_V4FLEXLAYOUT(m) (NFSX_HYPER + 3 * NFSX_UNSIGNED + \ --- sys/fs/nfs/nfs_commonsubs.c.xattr 2025-04-02 13:22:59.000000000 -0700 +++ sys/fs/nfs/nfs_commonsubs.c 2025-04-03 13:10:47.616257000 -0700 @@ -135,7 +135,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 1, 2, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Lookupp */ { 0, 1, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* NVerify */ { 1, 1, 0, 1, LK_EXCLUSIVE, 1, 0 }, /* Open */ - { 1, 1, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* OpenAttr */ + { 1, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* OpenAttr */ { 0, 1, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* OpenConfirm */ { 0, 1, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* OpenDowngrade */ { 1, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* PutFH */ @@ -219,7 +219,7 @@ NFSD_VNET_DEFINE_STATIC(u_char *, nfsrv_dnsname) = NUL static int nfs_bigreply[NFSV42_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 0, 0, 0, 0, 0 }; + 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 }; /* local functions */ static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep); @@ -307,6 +307,7 @@ static struct { { NFSV4OP_DEALLOCATE, 2, "Deallocate", 10, }, { NFSV4OP_LAYOUTERROR, 1, "LayoutError", 11, }, { NFSV4OP_VERIFY, 3, "AppendWrite", 11, }, + { NFSV4OP_OPENATTR, 3, "OpenAttr", 8, }, }; /* @@ -985,6 +986,17 @@ nfsm_fhtom(struct nfsmount *nmp, struct nfsrv_descript (nmp->nm_privflag & NFSMNTP_FAKEROOTFH) != 0) { fhp = nmp->nm_fh; size = nmp->nm_fhsize; + } else if (size >= NFSX_FHMAX + NFSX_V4NAMEDDIRFH && + size <= NFSX_FHMAX + NFSX_V4NAMEDATTRFH) { + size -= (NFSX_FHMAX - NFSX_MYFH); + NFSM_BUILD(tl, uint32_t *, NFSX_MYFH + + 2 * NFSX_UNSIGNED); + *tl++ = txdr_unsigned(size); + NFSBCOPY(fhp, tl, NFSX_MYFH); + tl += (NFSX_MYFH / NFSX_UNSIGNED); + *tl = 0; + bytesize = NFSX_MYFH + 2 * NFSX_UNSIGNED; + break; } fullsiz = NFSM_RNDUP(size); if (set_true) { @@ -1298,6 +1310,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, gid_t gid; u_int32_t freenum = 0, tuint; u_int64_t uquad = 0, thyp, thyp2; + uint16_t tui16; #ifdef QUOTA struct dqblk dqb; uid_t savuid; @@ -1413,11 +1426,16 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); if (compare) { if (!(*retcmpp)) { - if (nap->na_type != nfsv34tov_type(*tl)) + tui16 = 0; + if (nap->na_type != nfsv4tov_type(*tl, + &tui16) || + ((nap->na_bsdflags & SFBSD_NAMEDATTR) ^ + tui16) != 0) *retcmpp = NFSERR_NOTSAME; } } else if (nap != NULL) { - nap->na_type = nfsv34tov_type(*tl); + nap->na_type = nfsv4tov_type(*tl, + &nap->na_bsdflags); } attrsum += NFSX_UNSIGNED; break; @@ -1672,6 +1690,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, goto nfsmout; tfhsize = tnfhp->nfh_len; if (compare) { + if (tfhsize > NFSX_MYFH) + tfhsize = NFSX_MYFH; if (!(*retcmpp) && !NFSRV_CMPFH(tnfhp->nfh_fh, tfhsize, fhp, fhsize)) @@ -2592,6 +2612,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount NFSACL_T *aclp, *naclp = NULL; size_t atsiz; bool xattrsupp; + short irflag; #ifdef QUOTA struct dqblk dqb; uid_t savuid; @@ -2712,7 +2733,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount break; case NFSATTRBIT_TYPE: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); - *tl = vtonfsv34_type(vap->va_type); + *tl = vtonfsv4_type(vap); retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_FHEXPIRETYPE: @@ -2809,7 +2830,15 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_FILEHANDLE: - retnum += nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); + siz = 0; + if (vp != NULL) { + irflag = vn_irflag_read(vp); + if ((irflag & VIRF_NAMEDDIR) != 0) + siz = NFSX_FHMAX + 2; + else if ((irflag & VIRF_NAMEDATTR) != 0) + siz = NFSX_FHMAX + 3; + } + retnum += nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, siz, 0); break; case NFSATTRBIT_FILEID: NFSM_BUILD(tl, u_int32_t *, NFSX_HYPER); @@ -5177,4 +5206,48 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfs error = nd->nd_repstat; m_freem(nd->nd_mrep); return (error); +} + +/* + * Translate a vnode type into an NFSv4 type, including the named + * attribute types. + */ +uint32_t +vtonfsv4_type(struct vattr *vap) +{ + nfstype ntyp; + + if (vap->va_type >= 9) + ntyp = NFNON; + else + ntyp = nfsv34_type[vap->va_type]; + if ((vap->va_bsdflags & SFBSD_NAMEDATTR) != 0) { + if (ntyp == NFDIR) + ntyp = NFATTRDIR; + else if (ntyp == NFREG) + ntyp = NFNAMEDATTR; +printf("SET ATTRTYPE vt=%d\n", vap->va_type); + } + return (txdr_unsigned((uint32_t)ntyp)); +} + +/* + * Translate an NFS type to a vnode type. + */ +__enum_uint8(vtype) +nfsv4tov_type(uint32_t ntyp, uint16_t *bsdflags) +{ + __enum_uint8(vtype) vtyp; + + ntyp = fxdr_unsigned(uint32_t, ntyp) % (NFNAMEDATTR + 1); + if (ntyp == NFATTRDIR) { + vtyp = VDIR; + *bsdflags |= SFBSD_NAMEDATTR; + } else if (ntyp == NFNAMEDATTR) { + vtyp = VREG; + *bsdflags |= SFBSD_NAMEDATTR; + } else { + vtyp = nv34tov_type[ntyp]; + } + return (vtyp); } --- sys/fs/nfsserver/nfs_nfsdport.c.xattr 2025-04-02 13:23:01.000000000 -0700 +++ sys/fs/nfsserver/nfs_nfsdport.c 2025-04-03 13:08:28.014446000 -0700 @@ -122,7 +122,6 @@ extern struct nfsdevicehead nfsrv_devidhead; /* Map d_type to vnode type. */ static uint8_t dtype_to_vnode[DT_WHT + 1] = { VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON, VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON }; -#define NFS_DTYPETOVTYPE(t) ((t) <= DT_WHT ? dtype_to_vnode[(t)] : VNON) static int nfsrv_createiovec(int, struct mbuf **, struct mbuf **, struct iovec **); @@ -130,6 +129,7 @@ static int nfsrv_createiovec_extpgs(int, int, struct m struct mbuf **, struct iovec **); static int nfsrv_createiovecw(int, struct mbuf *, char *, struct iovec **, int *); +static void nfs_dtypetovtype(struct nfsvattr *, struct vnode *, uint8_t); static void nfsrv_pnfscreate(struct vnode *, struct vattr *, struct ucred *, NFSPROC_T *); static void nfsrv_pnfsremovesetup(struct vnode *, NFSPROC_T *, struct vnode **, @@ -444,6 +444,7 @@ nfsvno_getattr(struct vnode *vp, struct nfsvattr *nvap gotattr = 1; } + nvap->na_vattr.va_vaflags = 0; error = VOP_GETATTR(vp, &nvap->na_vattr, nd->nd_cred); if (lockedit != 0) NFSVOPUNLOCK(vp); @@ -2046,6 +2047,23 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct moun return (error); } +/* + * Convert a dirent d_type to a vnode type. + */ +static void nfs_dtypetovtype(struct nfsvattr *nvap, struct vnode *vp, + uint8_t dtype) +{ + + if ((vn_irflag_read(vp) & VIRF_NAMEDDIR) != 0) { + nvap->na_type = VREG; + nvap->na_bsdflags |= SFBSD_NAMEDATTR; + } else if (dtype <= DT_WHT) { + nvap->na_type = dtype_to_vnode[dtype]; + } else { + nvap->na_type = VNON; + } +} + /* Since the Readdir vnode ops vary, put the entire functions in here. */ /* * nfs readdir service @@ -2665,6 +2683,10 @@ again: LK_SHARED, &nvp); else r = EOPNOTSUPP; + if (r == 0 && (vn_irflag_read(vp) & + VIRF_NAMEDDIR) != 0) + vn_irflag_set_cond(nvp, + VIRF_NAMEDATTR); if (r == EOPNOTSUPP) { if (usevget) { usevget = 0; @@ -2679,6 +2701,10 @@ again: cn.cn_namelen = nlen; cn.cn_flags = ISLASTCN | NOFOLLOW | LOCKLEAF; + if ((vn_irflag_read(vp) & + VIRF_NAMEDDIR) != 0) + cn.cn_flags |= + OPENNAMED; if (nlen == 2 && dp->d_name[0] == '.' && dp->d_name[1] == '.') @@ -2796,7 +2822,7 @@ again: /* Only need Type and/or Fileid. */ VATTR_NULL(&nvap->na_vattr); nvap->na_fileid = dp->d_fileno; - nvap->na_type = NFS_DTYPETOVTYPE(dp->d_type); + nfs_dtypetovtype(nvap, vp, dp->d_type); } /* @@ -3461,6 +3487,15 @@ nfsd_fhtovp(struct nfsrv_descript *nd, struct nfsrvfh nd->nd_repstat = nfsvno_fhtovp(mp, fhp, nd->nd_nam, lktype, vpp, exp, &credanon); vfs_unbusy(mp); + + if (nd->nd_repstat == 0 && + nfp->nfsrvfh_len >= NFSX_MYFH + NFSX_V4NAMEDDIRFH && + nfp->nfsrvfh_len <= NFSX_MYFH + NFSX_V4NAMEDATTRFH) { + if (nfp->nfsrvfh_len == NFSX_MYFH + NFSX_V4NAMEDDIRFH) + vn_irflag_set_cond(*vpp, VIRF_NAMEDDIR); + else + vn_irflag_set_cond(*vpp, VIRF_NAMEDATTR); + } /* * For NFSv4 without a pseudo root fs, unexported file handles --- sys/fs/nfsserver/nfs_nfsdserv.c.xattr 2025-02-28 13:15:32.000000000 -0800 +++ sys/fs/nfsserver/nfs_nfsdserv.c 2025-04-03 12:53:36.900508000 -0700 @@ -595,6 +595,8 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int char *bufp; u_long *hashp; struct thread *p = curthread; + struct componentname *cnp; + short irflag; if (nd->nd_repstat) { nfsrv_postopattr(nd, dattr_ret, &dattr); @@ -611,8 +613,14 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int goto out; } - NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP, - LOCKLEAF); + cnp = &named.ni_cnd; + irflag = vn_irflag_read(dp); + if ((irflag & VIRF_NAMEDDIR) != 0) +{ printf("nfsrvd_lookup: nameddir!!\n"); + NFSNAMEICNDSET(cnp, nd->nd_cred, LOOKUP, LOCKLEAF | OPENNAMED); +} + else + NFSNAMEICNDSET(cnp, nd->nd_cred, LOOKUP, LOCKLEAF); nfsvno_setpathbuf(&named, &bufp, &hashp); error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen); if (error) { @@ -621,6 +629,12 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int goto out; } if (!nd->nd_repstat) { + /* Don't set OPENNAMED for Lookupp (".."). */ + if (cnp->cn_namelen == 2 && *cnp->cn_nameptr == '.' && + *(cnp->cn_nameptr + 1) == '.') { +printf("nfsrvd_lookup ..\n"); + cnp->cn_flags &= ~OPENNAMED; + } nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, &dirp); } else { vrele(dp); @@ -639,6 +653,7 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int } nfsvno_relpathbuf(&named); vp = named.ni_vp; +if (cnp->cn_namelen == 3 && (cnp->cn_flags & OPENNAMED) != 0) printf("Got attr vty=%d\n", vp->v_type); if ((nd->nd_flag & ND_NFSV4) != 0 && !NFSVNO_EXPORTED(exp) && vp->v_type != VDIR && vp->v_type != VLNK) /* @@ -1348,6 +1363,18 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int i NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); vtyp = nfsv34tov_type(*tl); nfs4type = fxdr_unsigned(nfstype, *tl); + if ((vn_irflag_read(dp) & VIRF_NAMEDDIR) != 0) { + /* + * Don't allow creation of non-regular file objects + * in a named attribute directory. + */ + nd->nd_repstat = NFSERR_INVAL; + vrele(dp); +#ifdef NFS4_ACL_EXTATTR_NAME + acl_free(aclp); +#endif + goto out; + } switch (nfs4type) { case NFLNK: error = nfsvno_getsymlink(nd, &nva, p, &pathcp, @@ -1680,8 +1707,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgram, } /* If this is the same file handle, just VREF() the vnode. */ - if (tfh.nfsrvfh_len == NFSX_MYFH && - !NFSBCMP(tfh.nfsrvfh_data, &fh, NFSX_MYFH)) { + if (!NFSBCMP(tfh.nfsrvfh_data, &fh, NFSX_MYFH)) { VREF(dp); tdp = dp; tnes = *exp; @@ -1804,8 +1830,15 @@ nfsrvd_link(struct nfsrv_descript *nd, int isdgram, nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft); goto out; } + if ((vn_irflag_read(vp) & (VIRF_NAMEDDIR | VIRF_NAMEDATTR)) != 0 || + (tovp != NULL && + (vn_irflag_read(tovp) & (VIRF_NAMEDDIR | VIRF_NAMEDATTR)) != 0)) { + nd->nd_repstat = NFSERR_INVAL; + if (tovp != NULL) + vrele(tovp); + } NFSVOPUNLOCK(vp); - if (vp->v_type == VDIR) { + if (!nd->nd_repstat && vp->v_type == VDIR) { if (nd->nd_flag & ND_NFSV4) nd->nd_repstat = NFSERR_ISDIR; else @@ -2971,6 +3004,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int is NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF); cverf[0] = *tl++; cverf[1] = *tl; + if ((vn_irflag_read(dp) & VIRF_NAMEDDIR) != 0) + nd->nd_repstat = NFSERR_INVAL; break; case NFSCREATE_EXCLUSIVE41: NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF); @@ -2979,7 +3014,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int is error = nfsv4_sattr(nd, NULL, &nva, &attrbits, aclp, p); if (error != 0) goto nfsmout; - if (NFSISSET_ATTRBIT(&attrbits, + if ((vn_irflag_read(dp) & VIRF_NAMEDDIR) != 0 || + NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_TIMEACCESSSET)) nd->nd_repstat = NFSERR_INVAL; /* @@ -3473,11 +3509,20 @@ nfsrvd_getfh(struct nfsrv_descript *nd, __unused int i { fhandle_t fh; struct thread *p = curthread; + int siz; + short irflag; nd->nd_repstat = nfsvno_getfh(vp, &fh, p); + irflag = vn_irflag_read(vp); vput(vp); - if (!nd->nd_repstat) - (void)nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 0); + if (nd->nd_repstat == 0) { + siz = 0; + if ((irflag & VIRF_NAMEDDIR) != 0) + siz = NFSX_FHMAX + NFSX_V4NAMEDDIRFH; + else if ((irflag & VIRF_NAMEDATTR) != 0) + siz = NFSX_FHMAX + NFSX_V4NAMEDATTRFH; + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, siz, 0); + } NFSEXITCODE2(0, nd); return (0); } @@ -4209,15 +4254,35 @@ nfsrvd_verify(struct nfsrv_descript *nd, int isdgram, */ int nfsrvd_openattr(struct nfsrv_descript *nd, __unused int isdgram, - vnode_t dp, __unused vnode_t *vpp, __unused fhandle_t *fhp, + struct vnode *dp, struct vnode **vpp, __unused fhandle_t *fhp, __unused struct nfsexstuff *exp) { - u_int32_t *tl; - int error = 0, createdir __unused; + uint32_t *tl; + struct componentname cn; + int error = 0; - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - createdir = fxdr_unsigned(int, *tl); - nd->nd_repstat = NFSERR_NOTSUPP; + NFSNAMEICNDSET(&cn, nd->nd_cred, LOOKUP, OPENNAMED | ISLASTCN); + cn.cn_nameptr = "."; + cn.cn_namelen = 1; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (*tl == newnfs_true) + cn.cn_flags |= CREATENAMED; + + nd->nd_repstat = vn_lock(dp, LK_SHARED); + if (nd->nd_repstat != 0) + goto nfsmout; + + if ((dp->v_mount->mnt_flag & MNT_NAMEDATTR) == 0) + nd->nd_repstat = NFSERR_NOTSUPP; + if (nd->nd_repstat == 0 && (vn_irflag_read(dp) & (VIRF_NAMEDDIR | + VIRF_NAMEDATTR)) != 0) + nd->nd_repstat = NFSERR_WRONGTYPE; + if (nd->nd_repstat == 0) + nd->nd_repstat = VOP_LOOKUP(dp, vpp, &cn); + + vput(dp); + NFSEXITCODE2(0, nd); + return (0); nfsmout: vrele(dp); NFSEXITCODE2(error, nd); --- sys/fs/nfsserver/nfs_nfsdsubs.c.xattr 2025-02-28 13:15:32.000000000 -0800 +++ sys/fs/nfsserver/nfs_nfsdsubs.c 2025-04-03 12:53:36.901717000 -0700 @@ -1473,8 +1473,9 @@ int nfsrv_mtofh(struct nfsrv_descript *nd, struct nfsrvfh *fhp) { u_int32_t *tl; - int error = 0, len, copylen; + int error = 0, len, copylen, namedlen; + namedlen = 0; if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) { NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); len = fxdr_unsigned(int, *tl); @@ -1490,6 +1491,11 @@ nfsrv_mtofh(struct nfsrv_descript *nd, struct nfsrvfh copylen = NFSX_MYFH; len = NFSM_RNDUP(len); nd->nd_flag |= ND_DSSERVER; + } else if (len >= NFSX_MYFH + NFSX_V4NAMEDDIRFH && + len <= NFSX_MYFH + NFSX_V4NAMEDATTRFH) { + copylen = NFSX_MYFH; + namedlen = len; + len = NFSM_RNDUP(len); } else if (len < NFSRV_MINFH || len > NFSRV_MAXFH) { if (nd->nd_flag & ND_NFSV4) { if (len > 0 && len <= NFSX_V4FHMAX) { @@ -1524,7 +1530,10 @@ nfsrv_mtofh(struct nfsrv_descript *nd, struct nfsrvfh goto nfsmout; } NFSBCOPY(tl, (caddr_t)fhp->nfsrvfh_data, copylen); - fhp->nfsrvfh_len = copylen; + if (namedlen > 0) + fhp->nfsrvfh_len = namedlen; + else + fhp->nfsrvfh_len = copylen; nfsmout: NFSEXITCODE2(error, nd); return (error);