mirror of
https://github.com/armbian/linux-cix.git
synced 2026-01-06 12:30:45 -08:00
mm: shrinkers: provide shrinkers with names
Currently shrinkers are anonymous objects. For debugging purposes they
can be identified by count/scan function names, but it's not always
useful: e.g. for superblock's shrinkers it's nice to have at least an
idea of to which superblock the shrinker belongs.
This commit adds names to shrinkers. register_shrinker() and
prealloc_shrinker() functions are extended to take a format and arguments
to master a name.
In some cases it's not possible to determine a good name at the time when
a shrinker is allocated. For such cases shrinker_debugfs_rename() is
provided.
The expected format is:
<subsystem>-<shrinker_type>[:<instance>]-<id>
For some shrinkers an instance can be encoded as (MAJOR:MINOR) pair.
After this change the shrinker debugfs directory looks like:
$ cd /sys/kernel/debug/shrinker/
$ ls
dquota-cache-16 sb-devpts-28 sb-proc-47 sb-tmpfs-42
mm-shadow-18 sb-devtmpfs-5 sb-proc-48 sb-tmpfs-43
mm-zspool:zram0-34 sb-hugetlbfs-17 sb-pstore-31 sb-tmpfs-44
rcu-kfree-0 sb-hugetlbfs-33 sb-rootfs-2 sb-tmpfs-49
sb-aio-20 sb-iomem-12 sb-securityfs-6 sb-tracefs-13
sb-anon_inodefs-15 sb-mqueue-21 sb-selinuxfs-22 sb-xfs:vda1-36
sb-bdev-3 sb-nsfs-4 sb-sockfs-8 sb-zsmalloc-19
sb-bpf-32 sb-pipefs-14 sb-sysfs-26 thp-deferred_split-10
sb-btrfs:vda2-24 sb-proc-25 sb-tmpfs-1 thp-zero-9
sb-cgroup2-30 sb-proc-39 sb-tmpfs-27 xfs-buf:vda1-37
sb-configfs-23 sb-proc-41 sb-tmpfs-29 xfs-inodegc:vda1-38
sb-dax-11 sb-proc-45 sb-tmpfs-35
sb-debugfs-7 sb-proc-46 sb-tmpfs-40
[roman.gushchin@linux.dev: fix build warnings]
Link: https://lkml.kernel.org/r/Yr+ZTnLb9lJk6fJO@castle
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lkml.kernel.org/r/20220601032227.4076670-4-roman.gushchin@linux.dev
Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Hillf Danton <hdanton@sina.com>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
@@ -6317,7 +6317,7 @@ int kvm_mmu_vendor_module_init(void)
|
||||
if (percpu_counter_init(&kvm_total_used_mmu_pages, 0, GFP_KERNEL))
|
||||
goto out;
|
||||
|
||||
ret = register_shrinker(&mmu_shrinker);
|
||||
ret = register_shrinker(&mmu_shrinker, "x86-mmu");
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
||||
@@ -1084,7 +1084,7 @@ int binder_alloc_shrinker_init(void)
|
||||
int ret = list_lru_init(&binder_alloc_lru);
|
||||
|
||||
if (ret == 0) {
|
||||
ret = register_shrinker(&binder_shrinker);
|
||||
ret = register_shrinker(&binder_shrinker, "android-binder");
|
||||
if (ret)
|
||||
list_lru_destroy(&binder_alloc_lru);
|
||||
}
|
||||
|
||||
@@ -426,7 +426,8 @@ void i915_gem_driver_register__shrinker(struct drm_i915_private *i915)
|
||||
i915->mm.shrinker.count_objects = i915_gem_shrinker_count;
|
||||
i915->mm.shrinker.seeks = DEFAULT_SEEKS;
|
||||
i915->mm.shrinker.batch = 4096;
|
||||
drm_WARN_ON(&i915->drm, register_shrinker(&i915->mm.shrinker));
|
||||
drm_WARN_ON(&i915->drm, register_shrinker(&i915->mm.shrinker,
|
||||
"drm-i915_gem"));
|
||||
|
||||
i915->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;
|
||||
drm_WARN_ON(&i915->drm, register_oom_notifier(&i915->mm.oom_notifier));
|
||||
|
||||
@@ -221,7 +221,7 @@ void msm_gem_shrinker_init(struct drm_device *dev)
|
||||
priv->shrinker.count_objects = msm_gem_shrinker_count;
|
||||
priv->shrinker.scan_objects = msm_gem_shrinker_scan;
|
||||
priv->shrinker.seeks = DEFAULT_SEEKS;
|
||||
WARN_ON(register_shrinker(&priv->shrinker));
|
||||
WARN_ON(register_shrinker(&priv->shrinker, "drm-msm_gem"));
|
||||
|
||||
priv->vmap_notifier.notifier_call = msm_gem_shrinker_vmap;
|
||||
WARN_ON(register_vmap_purge_notifier(&priv->vmap_notifier));
|
||||
|
||||
@@ -103,7 +103,7 @@ void panfrost_gem_shrinker_init(struct drm_device *dev)
|
||||
pfdev->shrinker.count_objects = panfrost_gem_shrinker_count;
|
||||
pfdev->shrinker.scan_objects = panfrost_gem_shrinker_scan;
|
||||
pfdev->shrinker.seeks = DEFAULT_SEEKS;
|
||||
WARN_ON(register_shrinker(&pfdev->shrinker));
|
||||
WARN_ON(register_shrinker(&pfdev->shrinker, "drm-panfrost"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -722,7 +722,7 @@ int ttm_pool_mgr_init(unsigned long num_pages)
|
||||
mm_shrinker.count_objects = ttm_pool_shrinker_count;
|
||||
mm_shrinker.scan_objects = ttm_pool_shrinker_scan;
|
||||
mm_shrinker.seeks = 1;
|
||||
return register_shrinker(&mm_shrinker);
|
||||
return register_shrinker(&mm_shrinker, "drm-ttm_pool");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -812,7 +812,7 @@ int bch_btree_cache_alloc(struct cache_set *c)
|
||||
c->shrink.seeks = 4;
|
||||
c->shrink.batch = c->btree_pages * 2;
|
||||
|
||||
if (register_shrinker(&c->shrink))
|
||||
if (register_shrinker(&c->shrink, "md-bcache:%pU", c->set_uuid))
|
||||
pr_warn("bcache: %s: could not register shrinker\n",
|
||||
__func__);
|
||||
|
||||
|
||||
@@ -1806,7 +1806,8 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign
|
||||
c->shrinker.scan_objects = dm_bufio_shrink_scan;
|
||||
c->shrinker.seeks = 1;
|
||||
c->shrinker.batch = 0;
|
||||
r = register_shrinker(&c->shrinker);
|
||||
r = register_shrinker(&c->shrinker, "md-%s:(%u:%u)", slab_name,
|
||||
MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev));
|
||||
if (r)
|
||||
goto bad;
|
||||
|
||||
|
||||
@@ -2944,7 +2944,9 @@ int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev,
|
||||
zmd->mblk_shrinker.seeks = DEFAULT_SEEKS;
|
||||
|
||||
/* Metadata cache shrinker */
|
||||
ret = register_shrinker(&zmd->mblk_shrinker);
|
||||
ret = register_shrinker(&zmd->mblk_shrinker, "md-meta:(%u:%u)",
|
||||
MAJOR(dev->bdev->bd_dev),
|
||||
MINOR(dev->bdev->bd_dev));
|
||||
if (ret) {
|
||||
dmz_zmd_err(zmd, "Register metadata cache shrinker failed");
|
||||
goto err;
|
||||
|
||||
@@ -7414,7 +7414,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
|
||||
conf->shrinker.count_objects = raid5_cache_count;
|
||||
conf->shrinker.batch = 128;
|
||||
conf->shrinker.flags = 0;
|
||||
ret = register_shrinker(&conf->shrinker);
|
||||
ret = register_shrinker(&conf->shrinker, "md-raid5:%s", mdname(mddev));
|
||||
if (ret) {
|
||||
pr_warn("md/raid:%s: couldn't register shrinker.\n",
|
||||
mdname(mddev));
|
||||
|
||||
@@ -1587,7 +1587,7 @@ static int vmballoon_register_shrinker(struct vmballoon *b)
|
||||
b->shrinker.count_objects = vmballoon_shrinker_count;
|
||||
b->shrinker.seeks = DEFAULT_SEEKS;
|
||||
|
||||
r = register_shrinker(&b->shrinker);
|
||||
r = register_shrinker(&b->shrinker, "vmw-balloon");
|
||||
|
||||
if (r == 0)
|
||||
b->shrinker_registered = true;
|
||||
|
||||
@@ -875,7 +875,7 @@ static int virtio_balloon_register_shrinker(struct virtio_balloon *vb)
|
||||
vb->shrinker.count_objects = virtio_balloon_shrinker_count;
|
||||
vb->shrinker.seeks = DEFAULT_SEEKS;
|
||||
|
||||
return register_shrinker(&vb->shrinker);
|
||||
return register_shrinker(&vb->shrinker, "virtio-balloon");
|
||||
}
|
||||
|
||||
static int virtballoon_probe(struct virtio_device *vdev)
|
||||
|
||||
@@ -305,7 +305,7 @@ static int __init xenbus_probe_backend_init(void)
|
||||
|
||||
register_xenstore_notifier(&xenstore_notifier);
|
||||
|
||||
if (register_shrinker(&backend_memory_shrinker))
|
||||
if (register_shrinker(&backend_memory_shrinker, "xen-backend"))
|
||||
pr_warn("shrinker registration failed\n");
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -1815,6 +1815,8 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
|
||||
error = -EBUSY;
|
||||
} else {
|
||||
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
|
||||
shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", fs_type->name,
|
||||
s->s_id);
|
||||
btrfs_sb(s)->bdev_holder = fs_type;
|
||||
if (!strstr(crc32c_impl(), "generic"))
|
||||
set_bit(BTRFS_FS_CSUM_IMPL_FAST, &fs_info->flags);
|
||||
|
||||
@@ -282,7 +282,7 @@ static struct shrinker erofs_shrinker_info = {
|
||||
|
||||
int __init erofs_init_shrinker(void)
|
||||
{
|
||||
return register_shrinker(&erofs_shrinker_info);
|
||||
return register_shrinker(&erofs_shrinker_info, "erofs-shrinker");
|
||||
}
|
||||
|
||||
void erofs_exit_shrinker(void)
|
||||
|
||||
@@ -1654,7 +1654,8 @@ int ext4_es_register_shrinker(struct ext4_sb_info *sbi)
|
||||
sbi->s_es_shrinker.scan_objects = ext4_es_scan;
|
||||
sbi->s_es_shrinker.count_objects = ext4_es_count;
|
||||
sbi->s_es_shrinker.seeks = DEFAULT_SEEKS;
|
||||
err = register_shrinker(&sbi->s_es_shrinker);
|
||||
err = register_shrinker(&sbi->s_es_shrinker, "ext4-es:%s",
|
||||
sbi->s_sb->s_id);
|
||||
if (err)
|
||||
goto err4;
|
||||
|
||||
|
||||
@@ -4579,7 +4579,7 @@ static int __init init_f2fs_fs(void)
|
||||
err = f2fs_init_sysfs();
|
||||
if (err)
|
||||
goto free_garbage_collection_cache;
|
||||
err = register_shrinker(&f2fs_shrinker_info);
|
||||
err = register_shrinker(&f2fs_shrinker_info, "f2fs-shrinker");
|
||||
if (err)
|
||||
goto free_sysfs;
|
||||
err = register_filesystem(&f2fs_fs_type);
|
||||
|
||||
@@ -2533,7 +2533,7 @@ int __init gfs2_glock_init(void)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ret = register_shrinker(&glock_shrinker);
|
||||
ret = register_shrinker(&glock_shrinker, "gfs2-glock");
|
||||
if (ret) {
|
||||
destroy_workqueue(gfs2_delete_workqueue);
|
||||
destroy_workqueue(glock_workqueue);
|
||||
|
||||
@@ -148,7 +148,7 @@ static int __init init_gfs2_fs(void)
|
||||
if (!gfs2_trans_cachep)
|
||||
goto fail_cachep8;
|
||||
|
||||
error = register_shrinker(&gfs2_qd_shrinker);
|
||||
error = register_shrinker(&gfs2_qd_shrinker, "gfs2-qd");
|
||||
if (error)
|
||||
goto fail_shrinker;
|
||||
|
||||
|
||||
@@ -1418,7 +1418,8 @@ static journal_t *journal_init_common(struct block_device *bdev,
|
||||
if (percpu_counter_init(&journal->j_checkpoint_jh_count, 0, GFP_KERNEL))
|
||||
goto err_cleanup;
|
||||
|
||||
if (register_shrinker(&journal->j_shrinker)) {
|
||||
if (register_shrinker(&journal->j_shrinker, "jbd2-journal:(%u:%u)",
|
||||
MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev))) {
|
||||
percpu_counter_destroy(&journal->j_checkpoint_jh_count);
|
||||
goto err_cleanup;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user