mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-11 13:04:03 +08:00
nfsd: dynamically allocate the nfsd-client shrinker
In preparation for implementing lockless slab shrink, use new APIs to dynamically allocate the nfsd-client shrinker, so that it can be freed asynchronously via RCU. Then it doesn't need to wait for RCU read-side critical section when releasing the struct nfsd_net. Link: https://lkml.kernel.org/r/20230911094444.68966-33-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Acked-by: Chuck Lever <chuck.lever@oracle.com> Acked-by: Jeff Layton <jlayton@kernel.org> Cc: Jeff Layton <jlayton@kernel.org> Cc: Olga Kornievskaia <kolga@netapp.com> Cc: Dai Ngo <Dai.Ngo@oracle.com> Cc: Tom Talpey <tom@talpey.com> 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: Anna Schumaker <anna@kernel.org> 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: 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: 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: Muchun Song <songmuchun@bytedance.com> Cc: Nadav Amit <namit@vmware.com> Cc: Neil Brown <neilb@suse.de> Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.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: Trond Myklebust <trond.myklebust@hammerspace.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>
This commit is contained in:
parent
4b403dfa8e
commit
d17452aa33
@ -195,7 +195,7 @@ struct nfsd_net {
|
|||||||
int nfs4_max_clients;
|
int nfs4_max_clients;
|
||||||
|
|
||||||
atomic_t nfsd_courtesy_clients;
|
atomic_t nfsd_courtesy_clients;
|
||||||
struct shrinker nfsd_client_shrinker;
|
struct shrinker *nfsd_client_shrinker;
|
||||||
struct work_struct nfsd_shrinker_work;
|
struct work_struct nfsd_shrinker_work;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4400,8 +4400,7 @@ static unsigned long
|
|||||||
nfsd4_state_shrinker_count(struct shrinker *shrink, struct shrink_control *sc)
|
nfsd4_state_shrinker_count(struct shrinker *shrink, struct shrink_control *sc)
|
||||||
{
|
{
|
||||||
int count;
|
int count;
|
||||||
struct nfsd_net *nn = container_of(shrink,
|
struct nfsd_net *nn = shrink->private_data;
|
||||||
struct nfsd_net, nfsd_client_shrinker);
|
|
||||||
|
|
||||||
count = atomic_read(&nn->nfsd_courtesy_clients);
|
count = atomic_read(&nn->nfsd_courtesy_clients);
|
||||||
if (!count)
|
if (!count)
|
||||||
@ -8149,12 +8148,16 @@ static int nfs4_state_create_net(struct net *net)
|
|||||||
INIT_WORK(&nn->nfsd_shrinker_work, nfsd4_state_shrinker_worker);
|
INIT_WORK(&nn->nfsd_shrinker_work, nfsd4_state_shrinker_worker);
|
||||||
get_net(net);
|
get_net(net);
|
||||||
|
|
||||||
nn->nfsd_client_shrinker.scan_objects = nfsd4_state_shrinker_scan;
|
nn->nfsd_client_shrinker = shrinker_alloc(0, "nfsd-client");
|
||||||
nn->nfsd_client_shrinker.count_objects = nfsd4_state_shrinker_count;
|
if (!nn->nfsd_client_shrinker)
|
||||||
nn->nfsd_client_shrinker.seeks = DEFAULT_SEEKS;
|
|
||||||
|
|
||||||
if (register_shrinker(&nn->nfsd_client_shrinker, "nfsd-client"))
|
|
||||||
goto err_shrinker;
|
goto err_shrinker;
|
||||||
|
|
||||||
|
nn->nfsd_client_shrinker->scan_objects = nfsd4_state_shrinker_scan;
|
||||||
|
nn->nfsd_client_shrinker->count_objects = nfsd4_state_shrinker_count;
|
||||||
|
nn->nfsd_client_shrinker->private_data = nn;
|
||||||
|
|
||||||
|
shrinker_register(nn->nfsd_client_shrinker);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_shrinker:
|
err_shrinker:
|
||||||
@ -8252,7 +8255,7 @@ nfs4_state_shutdown_net(struct net *net)
|
|||||||
struct list_head *pos, *next, reaplist;
|
struct list_head *pos, *next, reaplist;
|
||||||
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
|
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
|
||||||
|
|
||||||
unregister_shrinker(&nn->nfsd_client_shrinker);
|
shrinker_free(nn->nfsd_client_shrinker);
|
||||||
cancel_work(&nn->nfsd_shrinker_work);
|
cancel_work(&nn->nfsd_shrinker_work);
|
||||||
cancel_delayed_work_sync(&nn->laundromat_work);
|
cancel_delayed_work_sync(&nn->laundromat_work);
|
||||||
locks_end_grace(&nn->nfsd4_manager);
|
locks_end_grace(&nn->nfsd4_manager);
|
||||||
|
Loading…
Reference in New Issue
Block a user