mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
dm: dynamically allocate the dm-bufio shrinker
In preparation for implementing lockless slab shrink, use new APIs to dynamically allocate the dm-bufio 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 dm_bufio_client. Link: https://lkml.kernel.org/r/20230911094444.68966-24-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Cc: Alasdair Kergon <agk@redhat.com> Cc: Mike Snitzer <snitzer@kernel.org> Cc: Abhinav Kumar <quic_abhinavk@quicinc.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: 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: 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: 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
e11c4f3acb
commit
1f1d459c9a
1 changed files with 17 additions and 11 deletions
|
@ -963,7 +963,7 @@ struct dm_bufio_client {
|
||||||
|
|
||||||
sector_t start;
|
sector_t start;
|
||||||
|
|
||||||
struct shrinker shrinker;
|
struct shrinker *shrinker;
|
||||||
struct work_struct shrink_work;
|
struct work_struct shrink_work;
|
||||||
atomic_long_t need_shrink;
|
atomic_long_t need_shrink;
|
||||||
|
|
||||||
|
@ -2368,7 +2368,7 @@ static unsigned long dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink
|
||||||
{
|
{
|
||||||
struct dm_bufio_client *c;
|
struct dm_bufio_client *c;
|
||||||
|
|
||||||
c = container_of(shrink, struct dm_bufio_client, shrinker);
|
c = shrink->private_data;
|
||||||
atomic_long_add(sc->nr_to_scan, &c->need_shrink);
|
atomic_long_add(sc->nr_to_scan, &c->need_shrink);
|
||||||
queue_work(dm_bufio_wq, &c->shrink_work);
|
queue_work(dm_bufio_wq, &c->shrink_work);
|
||||||
|
|
||||||
|
@ -2377,7 +2377,7 @@ static unsigned long dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink
|
||||||
|
|
||||||
static unsigned long dm_bufio_shrink_count(struct shrinker *shrink, struct shrink_control *sc)
|
static unsigned long dm_bufio_shrink_count(struct shrinker *shrink, struct shrink_control *sc)
|
||||||
{
|
{
|
||||||
struct dm_bufio_client *c = container_of(shrink, struct dm_bufio_client, shrinker);
|
struct dm_bufio_client *c = shrink->private_data;
|
||||||
unsigned long count = cache_total(&c->cache);
|
unsigned long count = cache_total(&c->cache);
|
||||||
unsigned long retain_target = get_retain_buffers(c);
|
unsigned long retain_target = get_retain_buffers(c);
|
||||||
unsigned long queued_for_cleanup = atomic_long_read(&c->need_shrink);
|
unsigned long queued_for_cleanup = atomic_long_read(&c->need_shrink);
|
||||||
|
@ -2490,14 +2490,20 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign
|
||||||
INIT_WORK(&c->shrink_work, shrink_work);
|
INIT_WORK(&c->shrink_work, shrink_work);
|
||||||
atomic_long_set(&c->need_shrink, 0);
|
atomic_long_set(&c->need_shrink, 0);
|
||||||
|
|
||||||
c->shrinker.count_objects = dm_bufio_shrink_count;
|
c->shrinker = shrinker_alloc(0, "dm-bufio:(%u:%u)",
|
||||||
c->shrinker.scan_objects = dm_bufio_shrink_scan;
|
|
||||||
c->shrinker.seeks = 1;
|
|
||||||
c->shrinker.batch = 0;
|
|
||||||
r = register_shrinker(&c->shrinker, "dm-bufio:(%u:%u)",
|
|
||||||
MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev));
|
MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev));
|
||||||
if (r)
|
if (!c->shrinker) {
|
||||||
|
r = -ENOMEM;
|
||||||
goto bad;
|
goto bad;
|
||||||
|
}
|
||||||
|
|
||||||
|
c->shrinker->count_objects = dm_bufio_shrink_count;
|
||||||
|
c->shrinker->scan_objects = dm_bufio_shrink_scan;
|
||||||
|
c->shrinker->seeks = 1;
|
||||||
|
c->shrinker->batch = 0;
|
||||||
|
c->shrinker->private_data = c;
|
||||||
|
|
||||||
|
shrinker_register(c->shrinker);
|
||||||
|
|
||||||
mutex_lock(&dm_bufio_clients_lock);
|
mutex_lock(&dm_bufio_clients_lock);
|
||||||
dm_bufio_client_count++;
|
dm_bufio_client_count++;
|
||||||
|
@ -2537,7 +2543,7 @@ void dm_bufio_client_destroy(struct dm_bufio_client *c)
|
||||||
|
|
||||||
drop_buffers(c);
|
drop_buffers(c);
|
||||||
|
|
||||||
unregister_shrinker(&c->shrinker);
|
shrinker_free(c->shrinker);
|
||||||
flush_work(&c->shrink_work);
|
flush_work(&c->shrink_work);
|
||||||
|
|
||||||
mutex_lock(&dm_bufio_clients_lock);
|
mutex_lock(&dm_bufio_clients_lock);
|
||||||
|
|
Loading…
Reference in a new issue