From patchwork Fri Oct 28 14:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13023792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E933CC38A02 for ; Fri, 28 Oct 2022 14:47:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231216AbiJ1Orm (ORCPT ); Fri, 28 Oct 2022 10:47:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230396AbiJ1OrJ (ORCPT ); Fri, 28 Oct 2022 10:47:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B0D81F9A37 for ; Fri, 28 Oct 2022 07:46:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A467B628D9 for ; Fri, 28 Oct 2022 14:46:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8078C433C1; Fri, 28 Oct 2022 14:46:32 +0000 (UTC) Subject: [PATCH v7 00/14] A course adjustment, for sure... From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: neilb@suse.de, jlayton@redhat.com Date: Fri, 28 Oct 2022 10:46:31 -0400 Message-ID: <166696812922.106044.679812521105874329.stgit@klimt.1015granger.net> User-Agent: StGit/1.5.dev3+g9561319 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org I'm proposing this series for v6.2 (for-next). For quite some time, we've been encouraged to disable filecache garbage collection for NFSv4 files, and I think I found a surgical way to do just that. That is presented in "NFSD: Add an NFSD_FILE_GC flag to enable nfsd_file garbage collection". The other major change in this set is reworking the file_hashtbl to resize itself dynamically. This reduces the average size of its bucket chains, greatly speeding up hash insertion, which holds the state_lock. Comments and opinions are welcome. I think this is the last version of this series...? Jeff's fixes will follow or be squashed into this one. Changes since v6: - Reviewed-by tags have been updated - Renamed nfs4_file hash helper functions Changes since v5: - Wrap hash insertion with inode->i_lock - Replace hashfn and friends with in-built rhashtable functions - Add a tracepoint to report delegation return Changes since v4: - Addressed some comments in the GC patch; more to come - Split clean-ups out of the rhashtable patch, reordered the series - Removed state_lock from the rhashtable helpers Changes since v3: - the new filehandle alias check was still not right Changes since v2: - Converted nfs4_file_rhashtbl to nfs4_file_rhltable - Addressed most or all other review comments Changes since RFC: - checking nfs4_files for inode aliases is now done only on hash insertion - the nfs4_file reference count is now bumped only while the RCU read lock is held - comments and function names have been revised and clarified --- Chuck Lever (14): NFSD: Pass the target nfsd_file to nfsd_commit() NFSD: Revert "NFSD: NFSv4 CLOSE should release an nfsd_file immediately" NFSD: Add an NFSD_FILE_GC flag to enable nfsd_file garbage collection NFSD: Clean up nfs4_preprocess_stateid_op() call sites NFSD: Trace stateids returned via DELEGRETURN NFSD: Trace delegation revocations NFSD: Use const pointers as parameters to fh_ helpers NFSD: Update file_hashtbl() helpers NFSD: Clean up nfsd4_init_file() NFSD: Add a nfsd4_file_hash_remove() helper NFSD: Clean up find_or_add_file() NFSD: Refactor find_file() NFSD: Allocate an rhashtable for nfs4_file objects NFSD: Use rhashtable for managing nfs4_file objects fs/nfsd/filecache.c | 81 ++++++++++++++------- fs/nfsd/filecache.h | 4 +- fs/nfsd/nfs3proc.c | 10 ++- fs/nfsd/nfs4proc.c | 42 +++++------ fs/nfsd/nfs4state.c | 166 +++++++++++++++++++++++++------------------- fs/nfsd/nfsfh.h | 10 +-- fs/nfsd/state.h | 5 +- fs/nfsd/trace.h | 59 +++++++++++++++- fs/nfsd/vfs.c | 19 ++--- fs/nfsd/vfs.h | 3 +- 10 files changed, 250 insertions(+), 149 deletions(-) -- Chuck Lever