mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
drm/ttm: dynamically allocate the drm-ttm_pool shrinker
Use new APIs to dynamically allocate the drm-ttm_pool shrinker. Link: https://lkml.kernel.org/r/20230911094444.68966-5-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Christian Koenig <christian.koenig@amd.com> Cc: Huang Rui <ray.huang@amd.com> Cc: David Airlie <airlied@gmail.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: 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: "Darrick J. Wong" <djwong@kernel.org> Cc: Dave Chinner <david@fromorbit.com> Cc: Dave Hansen <dave.hansen@linux.intel.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: 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: 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
95a542da53
commit
d35b5c98c1
1 changed files with 15 additions and 8 deletions
|
@ -73,7 +73,7 @@ static struct ttm_pool_type global_dma32_uncached[MAX_ORDER + 1];
|
||||||
|
|
||||||
static spinlock_t shrinker_lock;
|
static spinlock_t shrinker_lock;
|
||||||
static struct list_head shrinker_list;
|
static struct list_head shrinker_list;
|
||||||
static struct shrinker mm_shrinker;
|
static struct shrinker *mm_shrinker;
|
||||||
static DECLARE_RWSEM(pool_shrink_rwsem);
|
static DECLARE_RWSEM(pool_shrink_rwsem);
|
||||||
|
|
||||||
/* Allocate pages of size 1 << order with the given gfp_flags */
|
/* Allocate pages of size 1 << order with the given gfp_flags */
|
||||||
|
@ -749,8 +749,8 @@ static int ttm_pool_debugfs_shrink_show(struct seq_file *m, void *data)
|
||||||
struct shrink_control sc = { .gfp_mask = GFP_NOFS };
|
struct shrink_control sc = { .gfp_mask = GFP_NOFS };
|
||||||
|
|
||||||
fs_reclaim_acquire(GFP_KERNEL);
|
fs_reclaim_acquire(GFP_KERNEL);
|
||||||
seq_printf(m, "%lu/%lu\n", ttm_pool_shrinker_count(&mm_shrinker, &sc),
|
seq_printf(m, "%lu/%lu\n", ttm_pool_shrinker_count(mm_shrinker, &sc),
|
||||||
ttm_pool_shrinker_scan(&mm_shrinker, &sc));
|
ttm_pool_shrinker_scan(mm_shrinker, &sc));
|
||||||
fs_reclaim_release(GFP_KERNEL);
|
fs_reclaim_release(GFP_KERNEL);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -794,10 +794,17 @@ int ttm_pool_mgr_init(unsigned long num_pages)
|
||||||
&ttm_pool_debugfs_shrink_fops);
|
&ttm_pool_debugfs_shrink_fops);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mm_shrinker.count_objects = ttm_pool_shrinker_count;
|
mm_shrinker = shrinker_alloc(0, "drm-ttm_pool");
|
||||||
mm_shrinker.scan_objects = ttm_pool_shrinker_scan;
|
if (!mm_shrinker)
|
||||||
mm_shrinker.seeks = 1;
|
return -ENOMEM;
|
||||||
return register_shrinker(&mm_shrinker, "drm-ttm_pool");
|
|
||||||
|
mm_shrinker->count_objects = ttm_pool_shrinker_count;
|
||||||
|
mm_shrinker->scan_objects = ttm_pool_shrinker_scan;
|
||||||
|
mm_shrinker->seeks = 1;
|
||||||
|
|
||||||
|
shrinker_register(mm_shrinker);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -817,6 +824,6 @@ void ttm_pool_mgr_fini(void)
|
||||||
ttm_pool_type_fini(&global_dma32_uncached[i]);
|
ttm_pool_type_fini(&global_dma32_uncached[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
unregister_shrinker(&mm_shrinker);
|
shrinker_free(mm_shrinker);
|
||||||
WARN_ON(!list_empty(&shrinker_list));
|
WARN_ON(!list_empty(&shrinker_list));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue