NFSv4.2: dynamically allocate the nfs-xattr shrinkers

Use new APIs to dynamically allocate the nfs-xattr shrinkers.

Link: https://lkml.kernel.org/r/20230911094444.68966-11-zhengqi.arch@bytedance.com
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: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Alasdair Kergon <agk@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bob Peterson <rpeterso@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Carlos Llamas <cmllamas@google.com>
Cc: Chandan Babu R <chandan.babu@oracle.com>
Cc: Chao Yu <chao@kernel.org>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: Chuck Lever <cel@kernel.org>
Cc: Coly Li <colyli@suse.de>
Cc: Dai Ngo <Dai.Ngo@oracle.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Airlie <airlied@gmail.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Gao Xiang <hsiangkao@linux.alibaba.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Huang Rui <ray.huang@amd.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Jeffle Xu <jefflexu@linux.alibaba.com>
Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Kirill Tkhai <tkhai@ya.ru>
Cc: Marijn Suijten <marijn.suijten@somainline.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nadav Amit <namit@vmware.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Cc: Olga Kornievskaia <kolga@netapp.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Sean Paul <sean@poorly.run>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Song Liu <song@kernel.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Steven Price <steven.price@arm.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: Yue Hu <huyue2@coolpad.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c
index 911f634ba3da745022abf8b639387c38683749cf..2ad66a8922f4213a4e2ece9cb55370dd787c7dcd 100644 (file)
--- 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 @@ out1:
 
 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);
 }