All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org, netdev@vger.kernel.org
Cc: david@fromorbit.com, jlayton@redhat.com, tgraf@suug.ch
Subject: [PATCH v3 25/32] NFSD: Set up an rhashtable for the filecache
Date: Fri, 08 Jul 2022 14:26:23 -0400	[thread overview]
Message-ID: <165730478358.28142.6001387762372626227.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <165730437087.28142.6731645688073512500.stgit@klimt.1015granger.net>

Add code to initialize and tear down an rhashtable. The rhashtable
is not used yet.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/filecache.c |  160 ++++++++++++++++++++++++++++++++++++++++++++-------
 fs/nfsd/filecache.h |    1 
 2 files changed, 140 insertions(+), 21 deletions(-)

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index b075c9223377..bc2ec7db4927 100644
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -13,6 +13,7 @@
 #include <linux/fsnotify_backend.h>
 #include <linux/fsnotify.h>
 #include <linux/seq_file.h>
+#include <linux/rhashtable.h>
 
 #include "vfs.h"
 #include "nfsd.h"
@@ -63,6 +64,136 @@ static unsigned long			nfsd_file_flags;
 static struct fsnotify_group		*nfsd_file_fsnotify_group;
 static atomic_long_t			nfsd_filecache_count;
 static struct delayed_work		nfsd_filecache_laundrette;
+static struct rhashtable		nfsd_file_rhash_tbl
+						____cacheline_aligned_in_smp;
+
+enum nfsd_file_lookup_type {
+	NFSD_FILE_KEY_INODE,
+	NFSD_FILE_KEY_FULL,
+};
+
+struct nfsd_file_lookup_key {
+	struct inode			*inode;
+	struct net			*net;
+	const struct cred		*cred;
+	unsigned char			need;
+	enum nfsd_file_lookup_type	type;
+};
+
+/*
+ * The returned hash value is based solely on the address of an in-code
+ * inode, a pointer to a slab-allocated object. The entropy in such a
+ * pointer is concentrated in its middle bits.
+ */
+static u32 nfsd_file_inode_hash(const struct inode *inode, u32 seed)
+{
+	unsigned long ptr = (unsigned long)inode;
+	u32 k;
+
+	k = ptr >> L1_CACHE_SHIFT;
+	k &= 0x00ffffff;
+	return jhash2(&k, 1, seed);
+}
+
+/**
+ * nfsd_file_key_hashfn - Compute the hash value of a lookup key
+ * @data: key on which to compute the hash value
+ * @len: rhash table's key_len parameter (unused)
+ * @seed: rhash table's random seed of the day
+ *
+ * Return value:
+ *   Computed 32-bit hash value
+ */
+static u32 nfsd_file_key_hashfn(const void *data, u32 len, u32 seed)
+{
+	const struct nfsd_file_lookup_key *key = data;
+
+	return nfsd_file_inode_hash(key->inode, seed);
+}
+
+/**
+ * nfsd_file_obj_hashfn - Compute the hash value of an nfsd_file
+ * @data: object on which to compute the hash value
+ * @len: rhash table's key_len parameter (unused)
+ * @seed: rhash table's random seed of the day
+ *
+ * Return value:
+ *   Computed 32-bit hash value
+ */
+static u32 nfsd_file_obj_hashfn(const void *data, u32 len, u32 seed)
+{
+	const struct nfsd_file *nf = data;
+
+	return nfsd_file_inode_hash(nf->nf_inode, seed);
+}
+
+static bool
+nfsd_match_cred(const struct cred *c1, const struct cred *c2)
+{
+	int i;
+
+	if (!uid_eq(c1->fsuid, c2->fsuid))
+		return false;
+	if (!gid_eq(c1->fsgid, c2->fsgid))
+		return false;
+	if (c1->group_info == NULL || c2->group_info == NULL)
+		return c1->group_info == c2->group_info;
+	if (c1->group_info->ngroups != c2->group_info->ngroups)
+		return false;
+	for (i = 0; i < c1->group_info->ngroups; i++) {
+		if (!gid_eq(c1->group_info->gid[i], c2->group_info->gid[i]))
+			return false;
+	}
+	return true;
+}
+
+/**
+ * nfsd_file_obj_cmpfn - Match a cache item against search criteria
+ * @arg: search criteria
+ * @ptr: cache item to check
+ *
+ * Return values:
+ *   %0 - Item matches search criteria
+ *   %1 - Item does not match search criteria
+ */
+static int nfsd_file_obj_cmpfn(struct rhashtable_compare_arg *arg,
+			       const void *ptr)
+{
+	const struct nfsd_file_lookup_key *key = arg->key;
+	const struct nfsd_file *nf = ptr;
+
+	switch (key->type) {
+	case NFSD_FILE_KEY_INODE:
+		if (nf->nf_inode != key->inode)
+			return 1;
+		break;
+	case NFSD_FILE_KEY_FULL:
+		if (nf->nf_inode != key->inode)
+			return 1;
+		if (nf->nf_may != key->need)
+			return 1;
+		if (nf->nf_net != key->net)
+			return 1;
+		if (!nfsd_match_cred(nf->nf_cred, key->cred))
+			return 1;
+		if (test_bit(NFSD_FILE_HASHED, &nf->nf_flags) == 0)
+			return 1;
+		break;
+	}
+	return 0;
+}
+
+static const struct rhashtable_params nfsd_file_rhash_params = {
+	.key_len		= sizeof_field(struct nfsd_file, nf_inode),
+	.key_offset		= offsetof(struct nfsd_file, nf_inode),
+	.head_offset		= offsetof(struct nfsd_file, nf_rhash),
+	.hashfn			= nfsd_file_key_hashfn,
+	.obj_hashfn		= nfsd_file_obj_hashfn,
+	.obj_cmpfn		= nfsd_file_obj_cmpfn,
+	/* Reduce resizing churn on light workloads */
+	.min_size		= 512,		/* buckets */
+	.automatic_shrinking	= true,
+};
 
 static void
 nfsd_file_schedule_laundrette(void)
@@ -700,13 +831,18 @@ static const struct fsnotify_ops nfsd_file_fsnotify_ops = {
 int
 nfsd_file_cache_init(void)
 {
-	int		ret = -ENOMEM;
+	int		ret;
 	unsigned int	i;
 
 	lockdep_assert_held(&nfsd_mutex);
 	if (test_and_set_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags) == 1)
 		return 0;
 
+	ret = rhashtable_init(&nfsd_file_rhash_tbl, &nfsd_file_rhash_params);
+	if (ret)
+		return ret;
+
+	ret = -ENOMEM;
 	nfsd_filecache_wq = alloc_workqueue("nfsd_filecache", 0, 0);
 	if (!nfsd_filecache_wq)
 		goto out;
@@ -784,6 +920,7 @@ nfsd_file_cache_init(void)
 	nfsd_file_hashtbl = NULL;
 	destroy_workqueue(nfsd_filecache_wq);
 	nfsd_filecache_wq = NULL;
+	rhashtable_destroy(&nfsd_file_rhash_tbl);
 	goto out;
 }
 
@@ -909,6 +1046,7 @@ nfsd_file_cache_shutdown(void)
 	nfsd_file_hashtbl = NULL;
 	destroy_workqueue(nfsd_filecache_wq);
 	nfsd_filecache_wq = NULL;
+	rhashtable_destroy(&nfsd_file_rhash_tbl);
 
 	for_each_possible_cpu(i) {
 		per_cpu(nfsd_file_cache_hits, i) = 0;
@@ -920,26 +1058,6 @@ nfsd_file_cache_shutdown(void)
 	}
 }
 
-static bool
-nfsd_match_cred(const struct cred *c1, const struct cred *c2)
-{
-	int i;
-
-	if (!uid_eq(c1->fsuid, c2->fsuid))
-		return false;
-	if (!gid_eq(c1->fsgid, c2->fsgid))
-		return false;
-	if (c1->group_info == NULL || c2->group_info == NULL)
-		return c1->group_info == c2->group_info;
-	if (c1->group_info->ngroups != c2->group_info->ngroups)
-		return false;
-	for (i = 0; i < c1->group_info->ngroups; i++) {
-		if (!gid_eq(c1->group_info->gid[i], c2->group_info->gid[i]))
-			return false;
-	}
-	return true;
-}
-
 static struct nfsd_file *
 nfsd_file_find_locked(struct inode *inode, unsigned int may_flags,
 			unsigned int hashval, struct net *net)
diff --git a/fs/nfsd/filecache.h b/fs/nfsd/filecache.h
index 31dc65f82c75..7fc017e7b09e 100644
--- a/fs/nfsd/filecache.h
+++ b/fs/nfsd/filecache.h
@@ -29,6 +29,7 @@ struct nfsd_file_mark {
  * never be dereferenced, only used for comparison.
  */
 struct nfsd_file {
+	struct rhash_head	nf_rhash;
 	struct hlist_node	nf_node;
 	struct list_head	nf_lru;
 	struct rcu_head		nf_rcu;



  parent reply	other threads:[~2022-07-08 18:27 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-08 18:23 [PATCH v3 00/32] Overhaul NFSD filecache Chuck Lever
2022-07-08 18:23 ` [PATCH v3 01/32] NFSD: Demote a WARN to a pr_warn() Chuck Lever
2022-07-08 18:23 ` [PATCH v3 02/32] NFSD: Report filecache LRU size Chuck Lever
2022-07-08 18:23 ` [PATCH v3 03/32] NFSD: Report count of calls to nfsd_file_acquire() Chuck Lever
2022-07-08 18:24 ` [PATCH v3 04/32] NFSD: Report count of freed filecache items Chuck Lever
2022-07-08 18:24 ` [PATCH v3 05/32] NFSD: Report average age of " Chuck Lever
2022-07-08 18:24 ` [PATCH v3 06/32] NFSD: Add nfsd_file_lru_dispose_list() helper Chuck Lever
2022-07-08 18:24 ` [PATCH v3 07/32] NFSD: Refactor nfsd_file_gc() Chuck Lever
2022-07-08 18:24 ` [PATCH v3 08/32] NFSD: Refactor nfsd_file_lru_scan() Chuck Lever
2022-07-08 18:24 ` [PATCH v3 09/32] NFSD: Report the number of items evicted by the LRU walk Chuck Lever
2022-07-08 18:24 ` [PATCH v3 10/32] NFSD: Record number of flush calls Chuck Lever
2022-07-08 18:24 ` [PATCH v3 11/32] NFSD: Zero counters when the filecache is re-initialized Chuck Lever
2022-07-08 18:24 ` [PATCH v3 12/32] NFSD: Hook up the filecache stat file Chuck Lever
2022-07-08 19:16   ` Jeff Layton
2022-07-08 18:25 ` [PATCH v3 13/32] NFSD: WARN when freeing an item still linked via nf_lru Chuck Lever
2022-07-08 18:25 ` [PATCH v3 14/32] NFSD: Trace filecache LRU activity Chuck Lever
2022-07-08 18:25 ` [PATCH v3 15/32] NFSD: Leave open files out of the filecache LRU Chuck Lever
2022-07-08 19:29   ` Jeff Layton
2022-07-09 20:45     ` Chuck Lever III
2022-07-11 11:39       ` Jeff Layton
2022-07-08 18:25 ` [PATCH v3 16/32] NFSD: Fix the filecache LRU shrinker Chuck Lever
2022-07-08 19:37   ` Jeff Layton
2022-07-08 18:25 ` [PATCH v3 17/32] NFSD: Never call nfsd_file_gc() in foreground paths Chuck Lever
2022-07-08 19:43   ` Jeff Layton
2022-07-08 19:45     ` Chuck Lever III
2022-07-08 18:25 ` [PATCH v3 18/32] NFSD: No longer record nf_hashval in the trace log Chuck Lever
2022-07-08 18:25 ` [PATCH v3 19/32] NFSD: Remove lockdep assertion from unhash_and_release_locked() Chuck Lever
2022-07-08 18:25 ` [PATCH v3 20/32] NFSD: nfsd_file_unhash can compute hashval from nf->nf_inode Chuck Lever
2022-07-08 18:25 ` [PATCH v3 21/32] NFSD: Refactor __nfsd_file_close_inode() Chuck Lever
2022-07-08 18:26 ` [PATCH v3 22/32] NFSD: nfsd_file_hash_remove can compute hashval Chuck Lever
2022-07-08 18:26 ` [PATCH v3 23/32] NFSD: Remove nfsd_file::nf_hashval Chuck Lever
2022-07-08 18:26 ` [PATCH v3 24/32] NFSD: Replace the "init once" mechanism Chuck Lever
2022-07-08 18:26 ` Chuck Lever [this message]
2022-07-08 18:26 ` [PATCH v3 26/32] NFSD: Convert the filecache to use rhashtable Chuck Lever
2022-07-08 18:26 ` [PATCH v3 27/32] NFSD: Clean up unused code after rhashtable conversion Chuck Lever
2022-07-08 18:26 ` [PATCH v3 28/32] NFSD: Separate tracepoints for acquire and create Chuck Lever
2022-07-08 18:26 ` [PATCH v3 29/32] NFSD: Move nfsd_file_trace_alloc() tracepoint Chuck Lever
2022-07-08 18:26 ` [PATCH v3 30/32] NFSD: Update the nfsd_file_fsnotify_handle_event() tracepoint Chuck Lever
2022-07-08 18:27 ` [PATCH v3 31/32] NFSD: NFSv4 CLOSE should release an nfsd_file immediately Chuck Lever
2022-07-08 18:27 ` [PATCH v3 32/32] NFSD: Ensure nf_inode is never dereferenced Chuck Lever
2022-07-08 20:27 ` [PATCH v3 00/32] Overhaul NFSD filecache Jeff Layton
2022-07-08 20:32   ` Chuck Lever III

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=165730478358.28142.6001387762372626227.stgit@klimt.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=david@fromorbit.com \
    --cc=jlayton@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=tgraf@suug.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.