This is a note to let you know that I've just added the patch titled
nfsd: fix up the filecache laundrette scheduling
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-fix-up-the-filecache-laundrette-scheduling.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 98f2fa4692468cd565264518f82d6d669e982547 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Wed, 2 Nov 2022 14:44:50 -0400
Subject: nfsd: fix up the filecache laundrette scheduling
From: Jeff Layton <jlayton@xxxxxxxxxx>
[ Upstream commit 22ae4c114f77b55a4c5036e8f70409a0799a08f8 ]
We don't really care whether there are hashed entries when it comes to
scheduling the laundrette. They might all be non-gc entries, after all.
We only want to schedule it if there are entries on the LRU.
Switch to using list_lru_count, and move the check into
nfsd_file_gc_worker. The other callsite in nfsd_file_put doesn't need to
count entries, since it only schedules the laundrette after adding an
entry to the LRU.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfsd/filecache.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -211,12 +211,9 @@ static const struct rhashtable_params nf
static void
nfsd_file_schedule_laundrette(void)
{
- if ((atomic_read(&nfsd_file_rhash_tbl.nelems) == 0) ||
- test_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags) == 0)
- return;
-
- queue_delayed_work(system_wq, &nfsd_filecache_laundrette,
- NFSD_LAUNDRETTE_DELAY);
+ if (test_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags))
+ queue_delayed_work(system_wq, &nfsd_filecache_laundrette,
+ NFSD_LAUNDRETTE_DELAY);
}
static void
@@ -614,7 +611,8 @@ static void
nfsd_file_gc_worker(struct work_struct *work)
{
nfsd_file_gc();
- nfsd_file_schedule_laundrette();
+ if (list_lru_count(&nfsd_file_lru))
+ nfsd_file_schedule_laundrette();
}
static unsigned long
Patches currently in stable-queue which might be from jlayton@xxxxxxxxxx are
queue-6.1/nfsd-refactor-find_file.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-ignore-requests-to-disable-unsupported-versions.patch
queue-6.1/nfsd-fix-licensing-header-in-filecache.c.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/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/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-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/lockd-fix-file-selection-in-nlmsvc_cancel_blocked.patch
queue-6.1/nfsd-avoid-clashing-function-prototypes.patch
