This is a note to let you know that I've just added the patch titled
NFSD: Clean up find_or_add_file()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfsd-clean-up-find_or_add_file.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 51805844c0d7f3311515967959269b4f38278d31 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Date: Fri, 28 Oct 2022 10:47:41 -0400
Subject: NFSD: Clean up find_or_add_file()
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
[ Upstream commit 9270fc514ba7d415636b23bcb937573a1ce54f6a ]
Remove the call to find_file_locked() in insert_nfs4_file(). Tracing
shows that over 99% of these calls return NULL. Thus it is not worth
the expense of the extra bucket list traversal. insert_file() already
deals correctly with the case where the item is already in the hash
bucket.
Since nfsd4_file_hash_insert() is now just a wrapper around
insert_file(), move the meat of insert_file() into
nfsd4_file_hash_insert() and get rid of it.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Reviewed-by: NeilBrown <neilb@xxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfsd/nfs4state.c | 64 ++++++++++++++++++++++------------------------------
1 file changed, 28 insertions(+), 36 deletions(-)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4699,24 +4699,42 @@ find_file_locked(const struct svc_fh *fh
return NULL;
}
-static struct nfs4_file *insert_file(struct nfs4_file *new, struct svc_fh *fh,
- unsigned int hashval)
+static struct nfs4_file * find_file(struct svc_fh *fh)
{
struct nfs4_file *fp;
+ unsigned int hashval = file_hashval(fh);
+
+ rcu_read_lock();
+ fp = find_file_locked(fh, hashval);
+ rcu_read_unlock();
+ return fp;
+}
+
+/*
+ * On hash insertion, identify entries with the same inode but
+ * distinct filehandles. They will all be in the same hash bucket
+ * because nfs4_file's are hashed by the address in the fi_inode
+ * field.
+ */
+static noinline_for_stack struct nfs4_file *
+nfsd4_file_hash_insert(struct nfs4_file *new, const struct svc_fh *fhp)
+{
+ unsigned int hashval = file_hashval(fhp);
struct nfs4_file *ret = NULL;
bool alias_found = false;
+ struct nfs4_file *fi;
spin_lock(&state_lock);
- hlist_for_each_entry_rcu(fp, &file_hashtbl[hashval], fi_hash,
+ hlist_for_each_entry_rcu(fi, &file_hashtbl[hashval], fi_hash,
lockdep_is_held(&state_lock)) {
- if (fh_match(&fp->fi_fhandle, &fh->fh_handle)) {
- if (refcount_inc_not_zero(&fp->fi_ref))
- ret = fp;
- } else if (d_inode(fh->fh_dentry) == fp->fi_inode)
- fp->fi_aliased = alias_found = true;
+ if (fh_match(&fi->fi_fhandle, &fhp->fh_handle)) {
+ if (refcount_inc_not_zero(&fi->fi_ref))
+ ret = fi;
+ } else if (d_inode(fhp->fh_dentry) == fi->fi_inode)
+ fi->fi_aliased = alias_found = true;
}
if (likely(ret == NULL)) {
- nfsd4_file_init(fh, new);
+ nfsd4_file_init(fhp, new);
hlist_add_head_rcu(&new->fi_hash, &file_hashtbl[hashval]);
new->fi_aliased = alias_found;
ret = new;
@@ -4725,32 +4743,6 @@ static struct nfs4_file *insert_file(str
return ret;
}
-static struct nfs4_file * find_file(struct svc_fh *fh)
-{
- struct nfs4_file *fp;
- unsigned int hashval = file_hashval(fh);
-
- rcu_read_lock();
- fp = find_file_locked(fh, hashval);
- rcu_read_unlock();
- return fp;
-}
-
-static struct nfs4_file *
-find_or_add_file(struct nfs4_file *new, struct svc_fh *fh)
-{
- struct nfs4_file *fp;
- unsigned int hashval = file_hashval(fh);
-
- rcu_read_lock();
- fp = find_file_locked(fh, hashval);
- rcu_read_unlock();
- if (fp)
- return fp;
-
- return insert_file(new, fh, hashval);
-}
-
static noinline_for_stack void nfsd4_file_hash_remove(struct nfs4_file *fi)
{
hlist_del_rcu(&fi->fi_hash);
@@ -5661,7 +5653,7 @@ nfsd4_process_open2(struct svc_rqst *rqs
* and check for delegations in the process of being recalled.
* If not found, create the nfs4_file struct
*/
- fp = find_or_add_file(open->op_file, current_fh);
+ fp = nfsd4_file_hash_insert(open->op_file, current_fh);
if (fp != open->op_file) {
status = nfs4_check_deleg(cl, open, &dp);
if (status)
Patches currently in stable-queue which might be from chuck.lever@xxxxxxxxxx are
queue-6.1/nfsd-refactor-find_file.patch
queue-6.1/nfsd-register-unregister-of-nfsd-client-shrinker-at-nfsd-startup-shutdown-time.patch
queue-6.1/nfsd-refactoring-courtesy_client_reaper-to-a-generic-low-memory-shrinker.patch
queue-6.1/lockd-use-locks_inode_context-helper.patch
queue-6.1/nfsd-remove-redundant-assignment-to-variable-host_err.patch
queue-6.1/nfsd-use-set_bit-rq_dropme.patch
queue-6.1/nfsd-ignore-requests-to-disable-unsupported-versions.patch
queue-6.1/nfsd-fix-licensing-header-in-filecache.c.patch
queue-6.1/nfsd-add-delegation-reaper-to-react-to-low-memory-condition.patch
queue-6.1/nfsd-trace-stateids-returned-via-delegreturn.patch
queue-6.1/lockd-ensure-we-use-the-correct-file-descriptor-when-unlocking.patch
queue-6.1/trace-relocate-event-helper-files.patch
queue-6.1/nfsd-update-file_hashtbl-helpers.patch
queue-6.1/nfsd-clean-up-nfs4_preprocess_stateid_op-call-sites.patch
queue-6.1/nfsd-don-t-destroy-global-nfs4_file-table-in-per-net-shutdown.patch
queue-6.1/nfsd-use-only-rq_dropme-to-signal-the-need-to-drop-a-reply.patch
queue-6.1/nfsd-use-locks_inode_context-helper.patch
queue-6.1/nfsd-use-struct_size-helper-in-alloc_session.patch
queue-6.1/nfsd-fix-up-the-filecache-laundrette-scheduling.patch
queue-6.1/nfsd-move-nfserrno-to-vfs.c.patch
queue-6.1/exportfs-use-pr_debug-for-unreachable-debug-statements.patch
queue-6.1/nfsd-use-const-pointers-as-parameters-to-fh_-helpers.patch
queue-6.1/nfsd-use-rhashtable-for-managing-nfs4_file-objects.patch
queue-6.1/nfsd-clean-up-nfsd4_init_file.patch
queue-6.1/nfsd-add-a-nfsd4_file_hash_remove-helper.patch
queue-6.1/nfsd-simplify-read_plus.patch
queue-6.1/nfsd-trace-delegation-revocations.patch
queue-6.1/nfsd-allow-disabling-nfsv2-at-compile-time.patch
queue-6.1/nfsd-flesh-out-a-documenting-comment-for-filecache.c.patch
queue-6.1/nfsd-replace-delayed_work-with-work_struct-for-nfsd_client_shrinker.patch
queue-6.1/lockd-set-missing-fl_flags-field-when-retrieving-args.patch
queue-6.1/filelock-add-a-new-locks_inode_context-accessor-function.patch
queue-6.1/nfsd-add-support-for-sending-cb_recall_any.patch
queue-6.1/lockd-fix-file-selection-in-nlmsvc_cancel_blocked.patch
queue-6.1/nfsd-add-cb_recall_any-tracepoints.patch
queue-6.1/nfsd-avoid-clashing-function-prototypes.patch
queue-6.1/nfsd-clean-up-find_or_add_file.patch
