From: Qi Zheng <zhengqi.arch@bytedance.com>
To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru,
vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org,
brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu,
steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org,
yujie.liu@intel.com, gregkh@linuxfoundation.org,
muchun.song@linux.dev
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org,
Qi Zheng <zhengqi.arch@bytedance.com>,
Muchun Song <songmuchun@bytedance.com>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna@kernel.org>,
linux-nfs@vger.kernel.org
Subject: [PATCH v5 10/45] NFSv4.2: dynamically allocate the nfs-xattr shrinkers
Date: Thu, 24 Aug 2023 11:42:29 +0800 [thread overview]
Message-ID: <20230824034304.37411-11-zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com>
Use new APIs to dynamically allocate the nfs-xattr shrinkers.
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
CC: Trond Myklebust <trond.myklebust@hammerspace.com>
CC: Anna Schumaker <anna@kernel.org>
CC: linux-nfs@vger.kernel.org
---
fs/nfs/nfs42xattr.c | 87 +++++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 43 deletions(-)
diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c
index 911f634ba3da..2ad66a8922f4 100644
--- a/fs/nfs/nfs42xattr.c
+++ b/fs/nfs/nfs42xattr.c
@@ -796,28 +796,9 @@ static unsigned long nfs4_xattr_cache_scan(struct shrinker *shrink,
static unsigned long nfs4_xattr_entry_scan(struct shrinker *shrink,
struct shrink_control *sc);
-static struct shrinker nfs4_xattr_cache_shrinker = {
- .count_objects = nfs4_xattr_cache_count,
- .scan_objects = nfs4_xattr_cache_scan,
- .seeks = DEFAULT_SEEKS,
- .flags = SHRINKER_MEMCG_AWARE,
-};
-
-static struct shrinker nfs4_xattr_entry_shrinker = {
- .count_objects = nfs4_xattr_entry_count,
- .scan_objects = nfs4_xattr_entry_scan,
- .seeks = DEFAULT_SEEKS,
- .batch = 512,
- .flags = SHRINKER_MEMCG_AWARE,
-};
-
-static struct shrinker nfs4_xattr_large_entry_shrinker = {
- .count_objects = nfs4_xattr_entry_count,
- .scan_objects = nfs4_xattr_entry_scan,
- .seeks = 1,
- .batch = 512,
- .flags = SHRINKER_MEMCG_AWARE,
-};
+static struct shrinker *nfs4_xattr_cache_shrinker;
+static struct shrinker *nfs4_xattr_entry_shrinker;
+static struct shrinker *nfs4_xattr_large_entry_shrinker;
static enum lru_status
cache_lru_isolate(struct list_head *item,
@@ -943,7 +924,7 @@ nfs4_xattr_entry_scan(struct shrinker *shrink, struct shrink_control *sc)
struct nfs4_xattr_entry *entry;
struct list_lru *lru;
- lru = (shrink == &nfs4_xattr_large_entry_shrinker) ?
+ lru = (shrink == nfs4_xattr_large_entry_shrinker) ?
&nfs4_xattr_large_entry_lru : &nfs4_xattr_entry_lru;
freed = list_lru_shrink_walk(lru, sc, entry_lru_isolate, &dispose);
@@ -971,7 +952,7 @@ nfs4_xattr_entry_count(struct shrinker *shrink, struct shrink_control *sc)
unsigned long count;
struct list_lru *lru;
- lru = (shrink == &nfs4_xattr_large_entry_shrinker) ?
+ lru = (shrink == nfs4_xattr_large_entry_shrinker) ?
&nfs4_xattr_large_entry_lru : &nfs4_xattr_entry_lru;
count = list_lru_shrink_count(lru, sc);
@@ -991,18 +972,34 @@ static void nfs4_xattr_cache_init_once(void *p)
INIT_LIST_HEAD(&cache->dispose);
}
-static int nfs4_xattr_shrinker_init(struct shrinker *shrinker,
- struct list_lru *lru, const char *name)
+typedef unsigned long (*count_objects_cb)(struct shrinker *s,
+ struct shrink_control *sc);
+typedef unsigned long (*scan_objects_cb)(struct shrinker *s,
+ struct shrink_control *sc);
+
+static int __init nfs4_xattr_shrinker_init(struct shrinker **shrinker,
+ struct list_lru *lru, const char *name,
+ count_objects_cb count,
+ scan_objects_cb scan, long batch, int seeks)
{
- int ret = 0;
+ int ret;
- ret = register_shrinker(shrinker, name);
- if (ret)
+ *shrinker = shrinker_alloc(SHRINKER_MEMCG_AWARE, name);
+ if (!*shrinker)
+ return -ENOMEM;
+
+ ret = list_lru_init_memcg(lru, *shrinker);
+ if (ret) {
+ shrinker_free(*shrinker);
return ret;
+ }
- ret = list_lru_init_memcg(lru, shrinker);
- if (ret)
- unregister_shrinker(shrinker);
+ (*shrinker)->count_objects = count;
+ (*shrinker)->scan_objects = scan;
+ (*shrinker)->batch = batch;
+ (*shrinker)->seeks = seeks;
+
+ shrinker_register(*shrinker);
return ret;
}
@@ -1010,7 +1007,7 @@ static int nfs4_xattr_shrinker_init(struct shrinker *shrinker,
static void nfs4_xattr_shrinker_destroy(struct shrinker *shrinker,
struct list_lru *lru)
{
- unregister_shrinker(shrinker);
+ shrinker_free(shrinker);
list_lru_destroy(lru);
}
@@ -1026,27 +1023,31 @@ int __init nfs4_xattr_cache_init(void)
return -ENOMEM;
ret = nfs4_xattr_shrinker_init(&nfs4_xattr_cache_shrinker,
- &nfs4_xattr_cache_lru,
- "nfs-xattr_cache");
+ &nfs4_xattr_cache_lru, "nfs-xattr_cache",
+ nfs4_xattr_cache_count,
+ nfs4_xattr_cache_scan, 0, DEFAULT_SEEKS);
if (ret)
goto out1;
ret = nfs4_xattr_shrinker_init(&nfs4_xattr_entry_shrinker,
- &nfs4_xattr_entry_lru,
- "nfs-xattr_entry");
+ &nfs4_xattr_entry_lru, "nfs-xattr_entry",
+ nfs4_xattr_entry_count,
+ nfs4_xattr_entry_scan, 512, DEFAULT_SEEKS);
if (ret)
goto out2;
ret = nfs4_xattr_shrinker_init(&nfs4_xattr_large_entry_shrinker,
&nfs4_xattr_large_entry_lru,
- "nfs-xattr_large_entry");
+ "nfs-xattr_large_entry",
+ nfs4_xattr_entry_count,
+ nfs4_xattr_entry_scan, 512, 1);
if (!ret)
return 0;
- nfs4_xattr_shrinker_destroy(&nfs4_xattr_entry_shrinker,
+ nfs4_xattr_shrinker_destroy(nfs4_xattr_entry_shrinker,
&nfs4_xattr_entry_lru);
out2:
- nfs4_xattr_shrinker_destroy(&nfs4_xattr_cache_shrinker,
+ nfs4_xattr_shrinker_destroy(nfs4_xattr_cache_shrinker,
&nfs4_xattr_cache_lru);
out1:
kmem_cache_destroy(nfs4_xattr_cache_cachep);
@@ -1056,11 +1057,11 @@ int __init nfs4_xattr_cache_init(void)
void nfs4_xattr_cache_exit(void)
{
- nfs4_xattr_shrinker_destroy(&nfs4_xattr_large_entry_shrinker,
+ nfs4_xattr_shrinker_destroy(nfs4_xattr_large_entry_shrinker,
&nfs4_xattr_large_entry_lru);
- nfs4_xattr_shrinker_destroy(&nfs4_xattr_entry_shrinker,
+ nfs4_xattr_shrinker_destroy(nfs4_xattr_entry_shrinker,
&nfs4_xattr_entry_lru);
- nfs4_xattr_shrinker_destroy(&nfs4_xattr_cache_shrinker,
+ nfs4_xattr_shrinker_destroy(nfs4_xattr_cache_shrinker,
&nfs4_xattr_cache_lru);
kmem_cache_destroy(nfs4_xattr_cache_cachep);
}
--
2.30.2
next prev parent reply other threads:[~2023-08-24 3:45 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 3:42 [PATCH v5 00/45] use refcount+RCU method to implement lockless slab shrink Qi Zheng
2023-08-24 3:42 ` [PATCH v5 01/45] mm: shrinker: add infrastructure for dynamically allocating shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 02/45] kvm: mmu: dynamically allocate the x86-mmu shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 03/45] binder: dynamically allocate the android-binder shrinker Qi Zheng
2023-08-31 16:41 ` Carlos Llamas
2023-08-24 3:42 ` [PATCH v5 04/45] drm/ttm: dynamically allocate the drm-ttm_pool shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 05/45] xenbus/backend: dynamically allocate the xen-backend shrinker Qi Zheng
2023-08-24 6:00 ` Juergen Gross
2023-08-24 6:24 ` Qi Zheng
2023-08-24 3:42 ` [PATCH v5 06/45] erofs: dynamically allocate the erofs-shrinker Qi Zheng
2023-08-25 1:18 ` Chao Yu
2023-08-25 2:54 ` Gao Xiang
2023-08-24 3:42 ` [PATCH v5 07/45] f2fs: dynamically allocate the f2fs-shrinker Qi Zheng
2023-08-25 1:17 ` Chao Yu
2023-08-24 3:42 ` [PATCH v5 08/45] gfs2: dynamically allocate the gfs2-glock shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 09/45] gfs2: dynamically allocate the gfs2-qd shrinker Qi Zheng
2023-08-24 3:42 ` Qi Zheng [this message]
2023-08-24 3:42 ` [PATCH v5 11/45] nfs: dynamically allocate the nfs-acl shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 12/45] nfsd: dynamically allocate the nfsd-filecache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 13/45] quota: dynamically allocate the dquota-cache shrinker Qi Zheng
2023-08-24 9:51 ` Jan Kara
2023-08-24 3:42 ` [PATCH v5 14/45] ubifs: dynamically allocate the ubifs-slab shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 15/45] rcu: dynamically allocate the rcu-lazy shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 16/45] rcu: dynamically allocate the rcu-kfree shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 17/45] mm: thp: dynamically allocate the thp-related shrinkers Qi Zheng
2023-08-24 3:42 ` [PATCH v5 18/45] sunrpc: dynamically allocate the sunrpc_cred shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 19/45] mm: workingset: dynamically allocate the mm-shadow shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 20/45] drm/i915: dynamically allocate the i915_gem_mm shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 21/45] drm/msm: dynamically allocate the drm-msm_gem shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 22/45] drm/panfrost: dynamically allocate the drm-panfrost shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 23/45] dm: dynamically allocate the dm-bufio shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 24/45] dm zoned: dynamically allocate the dm-zoned-meta shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 25/45] md/raid5: dynamically allocate the md-raid5 shrinker Qi Zheng
2023-08-24 3:55 ` Song Liu
2023-08-24 3:42 ` [PATCH v5 26/45] bcache: dynamically allocate the md-bcache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 27/45] vmw_balloon: dynamically allocate the vmw-balloon shrinker Qi Zheng
2023-08-24 15:28 ` Nadav Amit
2023-08-25 2:27 ` Qi Zheng
2023-08-24 3:42 ` [PATCH v5 28/45] virtio_balloon: dynamically allocate the virtio-balloon shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 29/45] mbcache: dynamically allocate the mbcache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 30/45] ext4: dynamically allocate the ext4-es shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 31/45] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Qi Zheng
2023-08-24 9:49 ` Jan Kara
2023-08-24 3:42 ` [PATCH v5 32/45] nfsd: dynamically allocate the nfsd-client shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 33/45] nfsd: dynamically allocate the nfsd-reply shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 34/45] xfs: dynamically allocate the xfs-buf shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 35/45] xfs: dynamically allocate the xfs-inodegc shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 36/45] xfs: dynamically allocate the xfs-qm shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 37/45] zsmalloc: dynamically allocate the mm-zspool shrinker Qi Zheng
2023-08-24 4:38 ` Sergey Senozhatsky
2023-08-24 3:42 ` [PATCH v5 38/45] fs: super: dynamically allocate the s_shrink Qi Zheng
2023-08-24 3:42 ` [PATCH v5 39/45] mm: shrinker: remove old APIs Qi Zheng
2023-08-24 3:42 ` [PATCH v5 40/45] mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred} Qi Zheng
2023-08-24 3:43 ` [PATCH v5 41/45] mm: shrinker: rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}() Qi Zheng
2023-08-24 3:43 ` [PATCH v5 42/45] mm: shrinker: make global slab shrink lockless Qi Zheng
2023-08-24 3:43 ` [PATCH v5 43/45] mm: shrinker: make memcg " Qi Zheng
2023-08-24 3:43 ` [PATCH v5 44/45] mm: shrinker: hold write lock to reparent shrinker nr_deferred Qi Zheng
2023-08-24 3:43 ` [PATCH v5 45/45] mm: shrinker: convert shrinker_rwsem to mutex Qi Zheng
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=20230824034304.37411-11-zhengqi.arch@bytedance.com \
--to=zhengqi.arch@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=anna@kernel.org \
--cc=brauner@kernel.org \
--cc=cel@kernel.org \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=muchun.song@linux.dev \
--cc=paulmck@kernel.org \
--cc=roman.gushchin@linux.dev \
--cc=senozhatsky@chromium.org \
--cc=songmuchun@bytedance.com \
--cc=steven.price@arm.com \
--cc=tkhai@ya.ru \
--cc=trond.myklebust@hammerspace.com \
--cc=tytso@mit.edu \
--cc=vbabka@suse.cz \
--cc=yujie.liu@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox