From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47136322545; Wed, 24 Sep 2025 18:06:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758737209; cv=none; b=WUsg8mmOMoIa6XQC2V39BYBo6/Ugb/jRDuhs8qqmuC4KVwU/GjfqL2MhjCcyR+1domBAUNNDMs8I9ui2pbuprfpjBGWpeUtUsxReNnKjBIRSFjnJEFVV+pR7uxgCFDnHhyk4ZSAmMXxEPEAG0t9qc5/XD7ltwok8Hf5p0l7D65w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758737209; c=relaxed/simple; bh=GilQR9rCkClK6yjFSJzcv9UxHFQKZMynp0cG2YAKBos=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bqHOnid8D9SdS2TpqQJjco3FDgW2ba4/lzcT9SHeFcCtziSas+QmST5pS/Q9pXjZz64Glxq9Vpgdf2RQN1ly4z9IIJGfVKpG2wumgmYnXSjB5/TDGNyvngJO8ChbTRMNMMdqOZhIefcfNuAEed3UUKzx5imrv7uYpaMAlRMW7Ic= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pk112Vga; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pk112Vga" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E04DEC113CF; Wed, 24 Sep 2025 18:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758737209; bh=GilQR9rCkClK6yjFSJzcv9UxHFQKZMynp0cG2YAKBos=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pk112VgaXg8kyzT4rqwobb4js6OdGVWqGqFzc/HdDLnCoVIiZgtAjkXXWCH7SuPL+ dIGYo2eXWQ3S7y98RaZB1MXPCq75CpHZYUXioOFroR3SDxS/KRT1taVh5cd2iYornT I0K14tmioXkDMvXYR/Jc+slLCxGRymLw9P0cI6J4yXy2BJABFAWCX7I1e7sz0orzGZ Xo9897x6LZBJ95iD235JbY3/KnAdFVoKrEd9hFUoTqUwhQTS7CyeKfSN2JTe4hbtqE VcBGdSh1ByJWV3YLdDIqxc5tWXTk7HJLk/MufVQS36DR5pMZrEUaBhJYS80nIXD4NB e1Pcoyk/X+m2g== From: Jeff Layton Date: Wed, 24 Sep 2025 14:05:56 -0400 Subject: [PATCH v3 10/38] nfsd: allow filecache to hold S_IFDIR files Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250924-dir-deleg-v3-10-9f3af8bc5c40@kernel.org> References: <20250924-dir-deleg-v3-0-9f3af8bc5c40@kernel.org> In-Reply-To: <20250924-dir-deleg-v3-0-9f3af8bc5c40@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Chuck Lever , Alexander Aring , Trond Myklebust , Anna Schumaker , Steve French , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Bharath SM , NeilBrown , Olga Kornievskaia , Dai Ngo , Jonathan Corbet , Amir Goldstein , Miklos Szeredi , Paulo Alcantara , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , David Howells , Tyler Hicks , Namjae Jeon , Steve French , Sergey Senozhatsky , Carlos Maiolino , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Paulo Alcantara Cc: Rick Macklem , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, netfs@lists.linux.dev, ecryptfs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6750; i=jlayton@kernel.org; h=from:subject:message-id; bh=GilQR9rCkClK6yjFSJzcv9UxHFQKZMynp0cG2YAKBos=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBo1DMM5BSG4jrO8og3U52Iut5TsdQug7uXjSERr s7TlSfRO1iJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaNQzDAAKCRAADmhBGVaC FcZHD/9XwiIc8eVz8q5DClUvSQsjRXwFyLHZKuJDjv5HMyp6tx6V9gX06lp3ATY4od8lOhxYrow VD3J+J5yBUDXx161KBbi8nOeDdPvuK/GFXH8bP8tgTcUYrR0pRwUjhiA5b11yQq65I/rFBXuQ6v LNUwGd7j+nYGaA7ykD0Ap4x8Zdcakc88UJClpCCGbuYhFiLtW+99OA70u6mAZCcgT72rEe2wq5c qplpTAyT4aXtuN5FIe5nlxN8HuJCGnIvAiyCI/y4EUnH2qLw2DlLaFzx0kYiXvWnEgB4WW7aNZa XW/7pJBPUk7sulcdyTFk9+QeLPAiOr5LEso7mdTE5yALTqNV4jg1195vZIyQ9uI9uadSPLiUmCH pdjUpRLH8EAYFCBhFBaJAZ9SfKcYIfjRqzpughIuKJzX2tuAX6B5l00aeJPV1nmPGmhgacQ/31k 5QTQeVdAbHfZcNdsgjnSqgcplFcKgCrWnMejjECEIVdNx8LINMxmBtNGGe2cM3c9ILzlfdLdimN eMa3eHgROMYvrSEtq+DCMrssdALq1QpAVZMutAl6pW8fbS/Ka55fP/rHei74IlNtmnqtapCwTgC 2f+U7ZKUGyYWCbVpp9PCcpFmS1kJzyzpfNls1Kko9Gs64sNbm9WrGFerGPHxjxWZ9hqJehbpfUi lLsoAgD7Pi/Q8Zw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The filecache infrastructure will only handle S_ISREG files at the moment. Plumb a "type" variable into nfsd_file_do_acquire and have all of the existing callers set it to S_ISREG. Add a new nfsd_file_acquire_dir() wrapper that we can then call to request a nfsd_file that holds a directory open. Signed-off-by: Jeff Layton --- fs/nfsd/filecache.c | 50 ++++++++++++++++++++++++++++++++++++++------------ fs/nfsd/filecache.h | 2 ++ fs/nfsd/vfs.c | 5 +++-- fs/nfsd/vfs.h | 2 +- 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 75bc48031c0770cda4b68b4f1b5c5be1c51acd3e..0b9ee6c6baa89a306c88c56d8a7b80b5683c03e3 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -1054,7 +1054,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net, struct auth_domain *client, struct svc_fh *fhp, unsigned int may_flags, struct file *file, - struct nfsd_file **pnf, bool want_gc) + umode_t type, bool want_gc, struct nfsd_file **pnf) { unsigned char need = may_flags & NFSD_FILE_MAY_MASK; struct nfsd_file *new, *nf; @@ -1065,13 +1065,13 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net, int ret; retry: - if (rqstp) { - status = fh_verify(rqstp, fhp, S_IFREG, + if (rqstp) + status = fh_verify(rqstp, fhp, type, may_flags|NFSD_MAY_OWNER_OVERRIDE); - } else { - status = fh_verify_local(net, cred, client, fhp, S_IFREG, + else + status = fh_verify_local(net, cred, client, fhp, type, may_flags|NFSD_MAY_OWNER_OVERRIDE); - } + if (status != nfs_ok) return status; inode = d_inode(fhp->fh_dentry); @@ -1152,7 +1152,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net, status = nfs_ok; trace_nfsd_file_opened(nf, status); } else { - ret = nfsd_open_verified(fhp, may_flags, &nf->nf_file); + ret = nfsd_open_verified(fhp, type, may_flags, &nf->nf_file); if (ret == -EOPENSTALE && stale_retry) { stale_retry = false; nfsd_file_unhash(nf); @@ -1212,7 +1212,7 @@ nfsd_file_acquire_gc(struct svc_rqst *rqstp, struct svc_fh *fhp, unsigned int may_flags, struct nfsd_file **pnf) { return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL, - fhp, may_flags, NULL, pnf, true); + fhp, may_flags, NULL, S_IFREG, true, pnf); } /** @@ -1237,7 +1237,7 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, unsigned int may_flags, struct nfsd_file **pnf) { return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL, - fhp, may_flags, NULL, pnf, false); + fhp, may_flags, NULL, S_IFREG, false, pnf); } /** @@ -1280,8 +1280,8 @@ nfsd_file_acquire_local(struct net *net, struct svc_cred *cred, const struct cred *save_cred = get_current_cred(); __be32 beres; - beres = nfsd_file_do_acquire(NULL, net, cred, client, - fhp, may_flags, NULL, pnf, false); + beres = nfsd_file_do_acquire(NULL, net, cred, client, fhp, may_flags, + NULL, S_IFREG, false, pnf); put_cred(revert_creds(save_cred)); return beres; } @@ -1310,7 +1310,33 @@ nfsd_file_acquire_opened(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file **pnf) { return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL, - fhp, may_flags, file, pnf, false); + fhp, may_flags, file, S_IFREG, false, pnf); +} + +/** + * nfsd_file_acquire_dir - Get a struct nfsd_file with an open directory + * @rqstp: the RPC transaction being executed + * @fhp: the NFS filehandle of the file to be opened + * @pnf: OUT: new or found "struct nfsd_file" object + * + * The nfsd_file_object returned by this API is reference-counted + * but not garbage-collected. The object is unhashed after the + * final nfsd_file_put(). This opens directories only, and only + * in O_RDONLY mode. + * + * Return values: + * %nfs_ok - @pnf points to an nfsd_file with its reference + * count boosted. + * + * On error, an nfsstat value in network byte order is returned. + */ +__be32 +nfsd_file_acquire_dir(struct svc_rqst *rqstp, struct svc_fh *fhp, + struct nfsd_file **pnf) +{ + return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL, fhp, + NFSD_MAY_READ|NFSD_MAY_64BIT_COOKIE, + NULL, S_IFDIR, false, pnf); } /* diff --git a/fs/nfsd/filecache.h b/fs/nfsd/filecache.h index 24ddf60e8434a23122cc08e23a609c4bd8f0f6c0..c36bd0ac8ce37b9ebde03b4367c60994a4f2d88d 100644 --- a/fs/nfsd/filecache.h +++ b/fs/nfsd/filecache.h @@ -78,5 +78,7 @@ __be32 nfsd_file_acquire_opened(struct svc_rqst *rqstp, struct svc_fh *fhp, __be32 nfsd_file_acquire_local(struct net *net, struct svc_cred *cred, struct auth_domain *client, struct svc_fh *fhp, unsigned int may_flags, struct nfsd_file **pnf); +__be32 nfsd_file_acquire_dir(struct svc_rqst *rqstp, struct svc_fh *fhp, + struct nfsd_file **pnf); int nfsd_file_cache_stats_show(struct seq_file *m, void *v); #endif /* _FS_NFSD_FILECACHE_H */ diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6f1275fdc8ac831aa0ea8da588f751eddff88df1..e1a84117f61610c0b2fb82680a2fa7d50d39238b 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -959,15 +959,16 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, /** * nfsd_open_verified - Open a regular file for the filecache * @fhp: NFS filehandle of the file to open + * @type: S_IFMT inode type allowed (0 means any type is allowed) * @may_flags: internal permission flags * @filp: OUT: open "struct file *" * * Returns zero on success, or a negative errno value. */ int -nfsd_open_verified(struct svc_fh *fhp, int may_flags, struct file **filp) +nfsd_open_verified(struct svc_fh *fhp, umode_t type, int may_flags, struct file **filp) { - return __nfsd_open(fhp, S_IFREG, may_flags, filp); + return __nfsd_open(fhp, type, may_flags, filp); } /* diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h index 0c0292611c6de3daf6f3ed51e2c61c0ad2751de4..09de48c50cbef8e7c4828b38dcb663b529514a30 100644 --- a/fs/nfsd/vfs.h +++ b/fs/nfsd/vfs.h @@ -114,7 +114,7 @@ __be32 nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, int nfsd_open_break_lease(struct inode *, int); __be32 nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t, int, struct file **); -int nfsd_open_verified(struct svc_fh *fhp, int may_flags, +int nfsd_open_verified(struct svc_fh *fhp, umode_t type, int may_flags, struct file **filp); __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, loff_t offset, -- 2.51.0