mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-04 04:06:26 +00:00
mm: shrinker: remove old APIs
Now no users are using the old APIs, just remove them. Link: https://lkml.kernel.org/r/20230911094444.68966-40-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Reviewed-by: Muchun Song <songmuchun@bytedance.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: 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: 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
1720f5dd8d
commit
f2383e0150
@ -105,14 +105,6 @@ struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...);
|
||||
void shrinker_register(struct shrinker *shrinker);
|
||||
void shrinker_free(struct shrinker *shrinker);
|
||||
|
||||
extern int __printf(2, 3) prealloc_shrinker(struct shrinker *shrinker,
|
||||
const char *fmt, ...);
|
||||
extern void register_shrinker_prepared(struct shrinker *shrinker);
|
||||
extern int __printf(2, 3) register_shrinker(struct shrinker *shrinker,
|
||||
const char *fmt, ...);
|
||||
extern void unregister_shrinker(struct shrinker *shrinker);
|
||||
extern void free_prealloced_shrinker(struct shrinker *shrinker);
|
||||
|
||||
#ifdef CONFIG_SHRINKER_DEBUG
|
||||
extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker,
|
||||
const char *fmt, ...);
|
||||
|
143
mm/shrinker.c
143
mm/shrinker.c
@ -655,146 +655,3 @@ void shrinker_free(struct shrinker *shrinker)
|
||||
kfree(shrinker);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(shrinker_free);
|
||||
|
||||
/*
|
||||
* Add a shrinker callback to be called from the vm.
|
||||
*/
|
||||
static int __prealloc_shrinker(struct shrinker *shrinker)
|
||||
{
|
||||
unsigned int size;
|
||||
int err;
|
||||
|
||||
if (shrinker->flags & SHRINKER_MEMCG_AWARE) {
|
||||
err = prealloc_memcg_shrinker(shrinker);
|
||||
if (err != -ENOSYS)
|
||||
return err;
|
||||
|
||||
shrinker->flags &= ~SHRINKER_MEMCG_AWARE;
|
||||
}
|
||||
|
||||
size = sizeof(*shrinker->nr_deferred);
|
||||
if (shrinker->flags & SHRINKER_NUMA_AWARE)
|
||||
size *= nr_node_ids;
|
||||
|
||||
shrinker->nr_deferred = kzalloc(size, GFP_KERNEL);
|
||||
if (!shrinker->nr_deferred)
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SHRINKER_DEBUG
|
||||
int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
int err;
|
||||
|
||||
va_start(ap, fmt);
|
||||
shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap);
|
||||
va_end(ap);
|
||||
if (!shrinker->name)
|
||||
return -ENOMEM;
|
||||
|
||||
err = __prealloc_shrinker(shrinker);
|
||||
if (err) {
|
||||
kfree_const(shrinker->name);
|
||||
shrinker->name = NULL;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
#else
|
||||
int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...)
|
||||
{
|
||||
return __prealloc_shrinker(shrinker);
|
||||
}
|
||||
#endif
|
||||
|
||||
void free_prealloced_shrinker(struct shrinker *shrinker)
|
||||
{
|
||||
#ifdef CONFIG_SHRINKER_DEBUG
|
||||
kfree_const(shrinker->name);
|
||||
shrinker->name = NULL;
|
||||
#endif
|
||||
if (shrinker->flags & SHRINKER_MEMCG_AWARE) {
|
||||
down_write(&shrinker_rwsem);
|
||||
unregister_memcg_shrinker(shrinker);
|
||||
up_write(&shrinker_rwsem);
|
||||
return;
|
||||
}
|
||||
|
||||
kfree(shrinker->nr_deferred);
|
||||
shrinker->nr_deferred = NULL;
|
||||
}
|
||||
|
||||
void register_shrinker_prepared(struct shrinker *shrinker)
|
||||
{
|
||||
down_write(&shrinker_rwsem);
|
||||
list_add_tail(&shrinker->list, &shrinker_list);
|
||||
shrinker->flags |= SHRINKER_REGISTERED;
|
||||
shrinker_debugfs_add(shrinker);
|
||||
up_write(&shrinker_rwsem);
|
||||
}
|
||||
|
||||
static int __register_shrinker(struct shrinker *shrinker)
|
||||
{
|
||||
int err = __prealloc_shrinker(shrinker);
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
register_shrinker_prepared(shrinker);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SHRINKER_DEBUG
|
||||
int register_shrinker(struct shrinker *shrinker, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
int err;
|
||||
|
||||
va_start(ap, fmt);
|
||||
shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap);
|
||||
va_end(ap);
|
||||
if (!shrinker->name)
|
||||
return -ENOMEM;
|
||||
|
||||
err = __register_shrinker(shrinker);
|
||||
if (err) {
|
||||
kfree_const(shrinker->name);
|
||||
shrinker->name = NULL;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
#else
|
||||
int register_shrinker(struct shrinker *shrinker, const char *fmt, ...)
|
||||
{
|
||||
return __register_shrinker(shrinker);
|
||||
}
|
||||
#endif
|
||||
EXPORT_SYMBOL(register_shrinker);
|
||||
|
||||
/*
|
||||
* Remove one
|
||||
*/
|
||||
void unregister_shrinker(struct shrinker *shrinker)
|
||||
{
|
||||
struct dentry *debugfs_entry;
|
||||
int debugfs_id;
|
||||
|
||||
if (!(shrinker->flags & SHRINKER_REGISTERED))
|
||||
return;
|
||||
|
||||
down_write(&shrinker_rwsem);
|
||||
list_del(&shrinker->list);
|
||||
shrinker->flags &= ~SHRINKER_REGISTERED;
|
||||
if (shrinker->flags & SHRINKER_MEMCG_AWARE)
|
||||
unregister_memcg_shrinker(shrinker);
|
||||
debugfs_entry = shrinker_debugfs_detach(shrinker, &debugfs_id);
|
||||
up_write(&shrinker_rwsem);
|
||||
|
||||
shrinker_debugfs_remove(debugfs_entry, debugfs_id);
|
||||
|
||||
kfree(shrinker->nr_deferred);
|
||||
shrinker->nr_deferred = NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(unregister_shrinker);
|
||||
|
Loading…
Reference in New Issue
Block a user