Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Roman Gushchin and committed by
akpm
e33c267a 5035ebc6

+167 -45
+1 -1
arch/x86/kvm/mmu/mmu.c
··· 6317 6317 if (percpu_counter_init(&kvm_total_used_mmu_pages, 0, GFP_KERNEL)) 6318 6318 goto out; 6319 6319 6320 - ret = register_shrinker(&mmu_shrinker); 6320 + ret = register_shrinker(&mmu_shrinker, "x86-mmu"); 6321 6321 if (ret) 6322 6322 goto out; 6323 6323
+1 -1
drivers/android/binder_alloc.c
··· 1084 1084 int ret = list_lru_init(&binder_alloc_lru); 1085 1085 1086 1086 if (ret == 0) { 1087 - ret = register_shrinker(&binder_shrinker); 1087 + ret = register_shrinker(&binder_shrinker, "android-binder"); 1088 1088 if (ret) 1089 1089 list_lru_destroy(&binder_alloc_lru); 1090 1090 }
+2 -1
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
··· 426 426 i915->mm.shrinker.count_objects = i915_gem_shrinker_count; 427 427 i915->mm.shrinker.seeks = DEFAULT_SEEKS; 428 428 i915->mm.shrinker.batch = 4096; 429 - drm_WARN_ON(&i915->drm, register_shrinker(&i915->mm.shrinker)); 429 + drm_WARN_ON(&i915->drm, register_shrinker(&i915->mm.shrinker, 430 + "drm-i915_gem")); 430 431 431 432 i915->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom; 432 433 drm_WARN_ON(&i915->drm, register_oom_notifier(&i915->mm.oom_notifier));
+1 -1
drivers/gpu/drm/msm/msm_gem_shrinker.c
··· 221 221 priv->shrinker.count_objects = msm_gem_shrinker_count; 222 222 priv->shrinker.scan_objects = msm_gem_shrinker_scan; 223 223 priv->shrinker.seeks = DEFAULT_SEEKS; 224 - WARN_ON(register_shrinker(&priv->shrinker)); 224 + WARN_ON(register_shrinker(&priv->shrinker, "drm-msm_gem")); 225 225 226 226 priv->vmap_notifier.notifier_call = msm_gem_shrinker_vmap; 227 227 WARN_ON(register_vmap_purge_notifier(&priv->vmap_notifier));
+1 -1
drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c
··· 103 103 pfdev->shrinker.count_objects = panfrost_gem_shrinker_count; 104 104 pfdev->shrinker.scan_objects = panfrost_gem_shrinker_scan; 105 105 pfdev->shrinker.seeks = DEFAULT_SEEKS; 106 - WARN_ON(register_shrinker(&pfdev->shrinker)); 106 + WARN_ON(register_shrinker(&pfdev->shrinker, "drm-panfrost")); 107 107 } 108 108 109 109 /**
+1 -1
drivers/gpu/drm/ttm/ttm_pool.c
··· 722 722 mm_shrinker.count_objects = ttm_pool_shrinker_count; 723 723 mm_shrinker.scan_objects = ttm_pool_shrinker_scan; 724 724 mm_shrinker.seeks = 1; 725 - return register_shrinker(&mm_shrinker); 725 + return register_shrinker(&mm_shrinker, "drm-ttm_pool"); 726 726 } 727 727 728 728 /**
+1 -1
drivers/md/bcache/btree.c
··· 812 812 c->shrink.seeks = 4; 813 813 c->shrink.batch = c->btree_pages * 2; 814 814 815 - if (register_shrinker(&c->shrink)) 815 + if (register_shrinker(&c->shrink, "md-bcache:%pU", c->set_uuid)) 816 816 pr_warn("bcache: %s: could not register shrinker\n", 817 817 __func__); 818 818
+2 -1
drivers/md/dm-bufio.c
··· 1806 1806 c->shrinker.scan_objects = dm_bufio_shrink_scan; 1807 1807 c->shrinker.seeks = 1; 1808 1808 c->shrinker.batch = 0; 1809 - r = register_shrinker(&c->shrinker); 1809 + r = register_shrinker(&c->shrinker, "md-%s:(%u:%u)", slab_name, 1810 + MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev)); 1810 1811 if (r) 1811 1812 goto bad; 1812 1813
+3 -1
drivers/md/dm-zoned-metadata.c
··· 2944 2944 zmd->mblk_shrinker.seeks = DEFAULT_SEEKS; 2945 2945 2946 2946 /* Metadata cache shrinker */ 2947 - ret = register_shrinker(&zmd->mblk_shrinker); 2947 + ret = register_shrinker(&zmd->mblk_shrinker, "md-meta:(%u:%u)", 2948 + MAJOR(dev->bdev->bd_dev), 2949 + MINOR(dev->bdev->bd_dev)); 2948 2950 if (ret) { 2949 2951 dmz_zmd_err(zmd, "Register metadata cache shrinker failed"); 2950 2952 goto err;
+1 -1
drivers/md/raid5.c
··· 7414 7414 conf->shrinker.count_objects = raid5_cache_count; 7415 7415 conf->shrinker.batch = 128; 7416 7416 conf->shrinker.flags = 0; 7417 - ret = register_shrinker(&conf->shrinker); 7417 + ret = register_shrinker(&conf->shrinker, "md-raid5:%s", mdname(mddev)); 7418 7418 if (ret) { 7419 7419 pr_warn("md/raid:%s: couldn't register shrinker.\n", 7420 7420 mdname(mddev));
+1 -1
drivers/misc/vmw_balloon.c
··· 1587 1587 b->shrinker.count_objects = vmballoon_shrinker_count; 1588 1588 b->shrinker.seeks = DEFAULT_SEEKS; 1589 1589 1590 - r = register_shrinker(&b->shrinker); 1590 + r = register_shrinker(&b->shrinker, "vmw-balloon"); 1591 1591 1592 1592 if (r == 0) 1593 1593 b->shrinker_registered = true;
+1 -1
drivers/virtio/virtio_balloon.c
··· 875 875 vb->shrinker.count_objects = virtio_balloon_shrinker_count; 876 876 vb->shrinker.seeks = DEFAULT_SEEKS; 877 877 878 - return register_shrinker(&vb->shrinker); 878 + return register_shrinker(&vb->shrinker, "virtio-balloon"); 879 879 } 880 880 881 881 static int virtballoon_probe(struct virtio_device *vdev)
+1 -1
drivers/xen/xenbus/xenbus_probe_backend.c
··· 305 305 306 306 register_xenstore_notifier(&xenstore_notifier); 307 307 308 - if (register_shrinker(&backend_memory_shrinker)) 308 + if (register_shrinker(&backend_memory_shrinker, "xen-backend")) 309 309 pr_warn("shrinker registration failed\n"); 310 310 311 311 return 0;
+2
fs/btrfs/super.c
··· 1815 1815 error = -EBUSY; 1816 1816 } else { 1817 1817 snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); 1818 + shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", fs_type->name, 1819 + s->s_id); 1818 1820 btrfs_sb(s)->bdev_holder = fs_type; 1819 1821 if (!strstr(crc32c_impl(), "generic")) 1820 1822 set_bit(BTRFS_FS_CSUM_IMPL_FAST, &fs_info->flags);
+1 -1
fs/erofs/utils.c
··· 282 282 283 283 int __init erofs_init_shrinker(void) 284 284 { 285 - return register_shrinker(&erofs_shrinker_info); 285 + return register_shrinker(&erofs_shrinker_info, "erofs-shrinker"); 286 286 } 287 287 288 288 void erofs_exit_shrinker(void)
+2 -1
fs/ext4/extents_status.c
··· 1654 1654 sbi->s_es_shrinker.scan_objects = ext4_es_scan; 1655 1655 sbi->s_es_shrinker.count_objects = ext4_es_count; 1656 1656 sbi->s_es_shrinker.seeks = DEFAULT_SEEKS; 1657 - err = register_shrinker(&sbi->s_es_shrinker); 1657 + err = register_shrinker(&sbi->s_es_shrinker, "ext4-es:%s", 1658 + sbi->s_sb->s_id); 1658 1659 if (err) 1659 1660 goto err4; 1660 1661
+1 -1
fs/f2fs/super.c
··· 4579 4579 err = f2fs_init_sysfs(); 4580 4580 if (err) 4581 4581 goto free_garbage_collection_cache; 4582 - err = register_shrinker(&f2fs_shrinker_info); 4582 + err = register_shrinker(&f2fs_shrinker_info, "f2fs-shrinker"); 4583 4583 if (err) 4584 4584 goto free_sysfs; 4585 4585 err = register_filesystem(&f2fs_fs_type);
+1 -1
fs/gfs2/glock.c
··· 2533 2533 return -ENOMEM; 2534 2534 } 2535 2535 2536 - ret = register_shrinker(&glock_shrinker); 2536 + ret = register_shrinker(&glock_shrinker, "gfs2-glock"); 2537 2537 if (ret) { 2538 2538 destroy_workqueue(gfs2_delete_workqueue); 2539 2539 destroy_workqueue(glock_workqueue);
+1 -1
fs/gfs2/main.c
··· 148 148 if (!gfs2_trans_cachep) 149 149 goto fail_cachep8; 150 150 151 - error = register_shrinker(&gfs2_qd_shrinker); 151 + error = register_shrinker(&gfs2_qd_shrinker, "gfs2-qd"); 152 152 if (error) 153 153 goto fail_shrinker; 154 154
+2 -1
fs/jbd2/journal.c
··· 1418 1418 if (percpu_counter_init(&journal->j_checkpoint_jh_count, 0, GFP_KERNEL)) 1419 1419 goto err_cleanup; 1420 1420 1421 - if (register_shrinker(&journal->j_shrinker)) { 1421 + if (register_shrinker(&journal->j_shrinker, "jbd2-journal:(%u:%u)", 1422 + MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev))) { 1422 1423 percpu_counter_destroy(&journal->j_checkpoint_jh_count); 1423 1424 goto err_cleanup; 1424 1425 }
+1 -1
fs/mbcache.c
··· 367 367 cache->c_shrink.count_objects = mb_cache_count; 368 368 cache->c_shrink.scan_objects = mb_cache_scan; 369 369 cache->c_shrink.seeks = DEFAULT_SEEKS; 370 - if (register_shrinker(&cache->c_shrink)) { 370 + if (register_shrinker(&cache->c_shrink, "mbcache-shrinker")) { 371 371 kfree(cache->c_hash); 372 372 kfree(cache); 373 373 goto err_out;
+4 -3
fs/nfs/nfs42xattr.c
··· 1017 1017 if (ret) 1018 1018 goto out2; 1019 1019 1020 - ret = register_shrinker(&nfs4_xattr_cache_shrinker); 1020 + ret = register_shrinker(&nfs4_xattr_cache_shrinker, "nfs-xattr_cache"); 1021 1021 if (ret) 1022 1022 goto out1; 1023 1023 1024 - ret = register_shrinker(&nfs4_xattr_entry_shrinker); 1024 + ret = register_shrinker(&nfs4_xattr_entry_shrinker, "nfs-xattr_entry"); 1025 1025 if (ret) 1026 1026 goto out; 1027 1027 1028 - ret = register_shrinker(&nfs4_xattr_large_entry_shrinker); 1028 + ret = register_shrinker(&nfs4_xattr_large_entry_shrinker, 1029 + "nfs-xattr_large_entry"); 1029 1030 if (!ret) 1030 1031 return 0; 1031 1032
+1 -1
fs/nfs/super.c
··· 149 149 ret = nfs_register_sysctl(); 150 150 if (ret < 0) 151 151 goto error_2; 152 - ret = register_shrinker(&acl_shrinker); 152 + ret = register_shrinker(&acl_shrinker, "nfs-acl"); 153 153 if (ret < 0) 154 154 goto error_3; 155 155 #ifdef CONFIG_NFS_V4_2
+1 -1
fs/nfsd/filecache.c
··· 670 670 goto out_err; 671 671 } 672 672 673 - ret = register_shrinker(&nfsd_file_shrinker); 673 + ret = register_shrinker(&nfsd_file_shrinker, "nfsd-filecache"); 674 674 if (ret) { 675 675 pr_err("nfsd: failed to register nfsd_file_shrinker: %d\n", ret); 676 676 goto out_lru;
+2 -1
fs/nfsd/nfscache.c
··· 176 176 nn->nfsd_reply_cache_shrinker.scan_objects = nfsd_reply_cache_scan; 177 177 nn->nfsd_reply_cache_shrinker.count_objects = nfsd_reply_cache_count; 178 178 nn->nfsd_reply_cache_shrinker.seeks = 1; 179 - status = register_shrinker(&nn->nfsd_reply_cache_shrinker); 179 + status = register_shrinker(&nn->nfsd_reply_cache_shrinker, 180 + "nfsd-reply:%s", nn->nfsd_name); 180 181 if (status) 181 182 goto out_stats_destroy; 182 183
+1 -1
fs/quota/dquot.c
··· 2995 2995 pr_info("VFS: Dquot-cache hash table entries: %ld (order %ld," 2996 2996 " %ld bytes)\n", nr_hash, order, (PAGE_SIZE << order)); 2997 2997 2998 - if (register_shrinker(&dqcache_shrinker)) 2998 + if (register_shrinker(&dqcache_shrinker, "dquota-cache")) 2999 2999 panic("Cannot register dquot shrinker"); 3000 3000 3001 3001 return 0;
+5 -1
fs/super.c
··· 265 265 s->s_shrink.count_objects = super_cache_count; 266 266 s->s_shrink.batch = 1024; 267 267 s->s_shrink.flags = SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE; 268 - if (prealloc_shrinker(&s->s_shrink)) 268 + if (prealloc_shrinker(&s->s_shrink, "sb-%s", type->name)) 269 269 goto fail; 270 270 if (list_lru_init_memcg(&s->s_dentry_lru, &s->s_shrink)) 271 271 goto fail; ··· 1288 1288 } else { 1289 1289 s->s_mode = mode; 1290 1290 snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); 1291 + shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", 1292 + fc->fs_type->name, s->s_id); 1291 1293 sb_set_blocksize(s, block_size(bdev)); 1292 1294 error = fill_super(s, fc); 1293 1295 if (error) { ··· 1365 1363 } else { 1366 1364 s->s_mode = mode; 1367 1365 snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); 1366 + shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", 1367 + fs_type->name, s->s_id); 1368 1368 sb_set_blocksize(s, block_size(bdev)); 1369 1369 error = fill_super(s, data, flags & SB_SILENT ? 1 : 0); 1370 1370 if (error) {
+1 -1
fs/ubifs/super.c
··· 2430 2430 if (!ubifs_inode_slab) 2431 2431 return -ENOMEM; 2432 2432 2433 - err = register_shrinker(&ubifs_shrinker_info); 2433 + err = register_shrinker(&ubifs_shrinker_info, "ubifs-slab"); 2434 2434 if (err) 2435 2435 goto out_slab; 2436 2436
+2 -1
fs/xfs/xfs_buf.c
··· 1986 1986 btp->bt_shrinker.scan_objects = xfs_buftarg_shrink_scan; 1987 1987 btp->bt_shrinker.seeks = DEFAULT_SEEKS; 1988 1988 btp->bt_shrinker.flags = SHRINKER_NUMA_AWARE; 1989 - if (register_shrinker(&btp->bt_shrinker)) 1989 + if (register_shrinker(&btp->bt_shrinker, "xfs-buf:%s", 1990 + mp->m_super->s_id)) 1990 1991 goto error_pcpu; 1991 1992 return btp; 1992 1993
+1 -1
fs/xfs/xfs_icache.c
··· 2201 2201 shrink->flags = SHRINKER_NONSLAB; 2202 2202 shrink->batch = XFS_INODEGC_SHRINKER_BATCH; 2203 2203 2204 - return register_shrinker(shrink); 2204 + return register_shrinker(shrink, "xfs-inodegc:%s", mp->m_super->s_id); 2205 2205 }
+2 -1
fs/xfs/xfs_qm.c
··· 677 677 qinf->qi_shrinker.seeks = DEFAULT_SEEKS; 678 678 qinf->qi_shrinker.flags = SHRINKER_NUMA_AWARE; 679 679 680 - error = register_shrinker(&qinf->qi_shrinker); 680 + error = register_shrinker(&qinf->qi_shrinker, "xfs-qm:%s", 681 + mp->m_super->s_id); 681 682 if (error) 682 683 goto out_free_inos; 683 684
+12 -2
include/linux/shrinker.h
··· 75 75 #endif 76 76 #ifdef CONFIG_SHRINKER_DEBUG 77 77 int debugfs_id; 78 + const char *name; 78 79 struct dentry *debugfs_entry; 79 80 #endif 80 81 /* objs pending delete, per node */ ··· 93 92 */ 94 93 #define SHRINKER_NONSLAB (1 << 3) 95 94 96 - extern int prealloc_shrinker(struct shrinker *shrinker); 95 + extern int __printf(2, 3) prealloc_shrinker(struct shrinker *shrinker, 96 + const char *fmt, ...); 97 97 extern void register_shrinker_prepared(struct shrinker *shrinker); 98 - extern int register_shrinker(struct shrinker *shrinker); 98 + extern int __printf(2, 3) register_shrinker(struct shrinker *shrinker, 99 + const char *fmt, ...); 99 100 extern void unregister_shrinker(struct shrinker *shrinker); 100 101 extern void free_prealloced_shrinker(struct shrinker *shrinker); 101 102 extern void synchronize_shrinkers(void); ··· 105 102 #ifdef CONFIG_SHRINKER_DEBUG 106 103 extern int shrinker_debugfs_add(struct shrinker *shrinker); 107 104 extern void shrinker_debugfs_remove(struct shrinker *shrinker); 105 + extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker, 106 + const char *fmt, ...); 108 107 #else /* CONFIG_SHRINKER_DEBUG */ 109 108 static inline int shrinker_debugfs_add(struct shrinker *shrinker) 110 109 { ··· 114 109 } 115 110 static inline void shrinker_debugfs_remove(struct shrinker *shrinker) 116 111 { 112 + } 113 + static inline __printf(2, 3) 114 + int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) 115 + { 116 + return 0; 117 117 } 118 118 #endif /* CONFIG_SHRINKER_DEBUG */ 119 119 #endif /* _LINUX_SHRINKER_H */
+1 -1
kernel/rcu/tree.c
··· 4884 4884 INIT_DELAYED_WORK(&krcp->page_cache_work, fill_page_cache_func); 4885 4885 krcp->initialized = true; 4886 4886 } 4887 - if (register_shrinker(&kfree_rcu_shrinker)) 4887 + if (register_shrinker(&kfree_rcu_shrinker, "rcu-kfree")) 4888 4888 pr_err("Failed to register kfree_rcu() shrinker!\n"); 4889 4889 } 4890 4890
+2 -2
mm/huge_memory.c
··· 423 423 if (err) 424 424 goto err_slab; 425 425 426 - err = register_shrinker(&huge_zero_page_shrinker); 426 + err = register_shrinker(&huge_zero_page_shrinker, "thp-zero"); 427 427 if (err) 428 428 goto err_hzp_shrinker; 429 - err = register_shrinker(&deferred_split_shrinker); 429 + err = register_shrinker(&deferred_split_shrinker, "thp-deferred_split"); 430 430 if (err) 431 431 goto err_split_shrinker; 432 432
+45 -2
mm/shrinker_debug.c
··· 102 102 int shrinker_debugfs_add(struct shrinker *shrinker) 103 103 { 104 104 struct dentry *entry; 105 - char buf[16]; 105 + char buf[128]; 106 106 int id; 107 107 108 108 lockdep_assert_held(&shrinker_rwsem); ··· 116 116 return id; 117 117 shrinker->debugfs_id = id; 118 118 119 - snprintf(buf, sizeof(buf), "%d", id); 119 + snprintf(buf, sizeof(buf), "%s-%d", shrinker->name, id); 120 120 121 121 /* create debugfs entry */ 122 122 entry = debugfs_create_dir(buf, shrinker_debugfs_root); ··· 131 131 return 0; 132 132 } 133 133 134 + int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) 135 + { 136 + struct dentry *entry; 137 + char buf[128]; 138 + const char *new, *old; 139 + va_list ap; 140 + int ret = 0; 141 + 142 + va_start(ap, fmt); 143 + new = kvasprintf_const(GFP_KERNEL, fmt, ap); 144 + va_end(ap); 145 + 146 + if (!new) 147 + return -ENOMEM; 148 + 149 + down_write(&shrinker_rwsem); 150 + 151 + old = shrinker->name; 152 + shrinker->name = new; 153 + 154 + if (shrinker->debugfs_entry) { 155 + snprintf(buf, sizeof(buf), "%s-%d", shrinker->name, 156 + shrinker->debugfs_id); 157 + 158 + entry = debugfs_rename(shrinker_debugfs_root, 159 + shrinker->debugfs_entry, 160 + shrinker_debugfs_root, buf); 161 + if (IS_ERR(entry)) 162 + ret = PTR_ERR(entry); 163 + else 164 + shrinker->debugfs_entry = entry; 165 + } 166 + 167 + up_write(&shrinker_rwsem); 168 + 169 + kfree_const(old); 170 + 171 + return ret; 172 + } 173 + EXPORT_SYMBOL(shrinker_debugfs_rename); 174 + 134 175 void shrinker_debugfs_remove(struct shrinker *shrinker) 135 176 { 136 177 lockdep_assert_held(&shrinker_rwsem); 178 + 179 + kfree_const(shrinker->name); 137 180 138 181 if (!shrinker->debugfs_entry) 139 182 return;
+55 -3
mm/vmscan.c
··· 608 608 /* 609 609 * Add a shrinker callback to be called from the vm. 610 610 */ 611 - int prealloc_shrinker(struct shrinker *shrinker) 611 + static int __prealloc_shrinker(struct shrinker *shrinker) 612 612 { 613 613 unsigned int size; 614 614 int err; ··· 632 632 return 0; 633 633 } 634 634 635 + #ifdef CONFIG_SHRINKER_DEBUG 636 + int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...) 637 + { 638 + va_list ap; 639 + int err; 640 + 641 + va_start(ap, fmt); 642 + shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap); 643 + va_end(ap); 644 + if (!shrinker->name) 645 + return -ENOMEM; 646 + 647 + err = __prealloc_shrinker(shrinker); 648 + if (err) 649 + kfree_const(shrinker->name); 650 + 651 + return err; 652 + } 653 + #else 654 + int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...) 655 + { 656 + return __prealloc_shrinker(shrinker); 657 + } 658 + #endif 659 + 635 660 void free_prealloced_shrinker(struct shrinker *shrinker) 636 661 { 662 + #ifdef CONFIG_SHRINKER_DEBUG 663 + kfree_const(shrinker->name); 664 + #endif 637 665 if (shrinker->flags & SHRINKER_MEMCG_AWARE) { 638 666 down_write(&shrinker_rwsem); 639 667 unregister_memcg_shrinker(shrinker); ··· 682 654 up_write(&shrinker_rwsem); 683 655 } 684 656 685 - int register_shrinker(struct shrinker *shrinker) 657 + static int __register_shrinker(struct shrinker *shrinker) 686 658 { 687 - int err = prealloc_shrinker(shrinker); 659 + int err = __prealloc_shrinker(shrinker); 688 660 689 661 if (err) 690 662 return err; 691 663 register_shrinker_prepared(shrinker); 692 664 return 0; 693 665 } 666 + 667 + #ifdef CONFIG_SHRINKER_DEBUG 668 + int register_shrinker(struct shrinker *shrinker, const char *fmt, ...) 669 + { 670 + va_list ap; 671 + int err; 672 + 673 + va_start(ap, fmt); 674 + shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap); 675 + va_end(ap); 676 + if (!shrinker->name) 677 + return -ENOMEM; 678 + 679 + err = __register_shrinker(shrinker); 680 + if (err) 681 + kfree_const(shrinker->name); 682 + return err; 683 + } 684 + #else 685 + int register_shrinker(struct shrinker *shrinker, const char *fmt, ...) 686 + { 687 + return __register_shrinker(shrinker); 688 + } 689 + #endif 694 690 EXPORT_SYMBOL(register_shrinker); 695 691 696 692 /*
+1 -1
mm/workingset.c
··· 625 625 pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n", 626 626 timestamp_bits, max_order, bucket_order); 627 627 628 - ret = prealloc_shrinker(&workingset_shadow_shrinker); 628 + ret = prealloc_shrinker(&workingset_shadow_shrinker, "mm-shadow"); 629 629 if (ret) 630 630 goto err; 631 631 ret = __list_lru_init(&shadow_nodes, true, &shadow_nodes_key,
+2 -1
mm/zsmalloc.c
··· 2217 2217 pool->shrinker.batch = 0; 2218 2218 pool->shrinker.seeks = DEFAULT_SEEKS; 2219 2219 2220 - return register_shrinker(&pool->shrinker); 2220 + return register_shrinker(&pool->shrinker, "mm-zspool:%s", 2221 + pool->name); 2221 2222 } 2222 2223 2223 2224 /**
+1 -1
net/sunrpc/auth.c
··· 874 874 err = rpc_init_authunix(); 875 875 if (err < 0) 876 876 goto out1; 877 - err = register_shrinker(&rpc_cred_shrinker); 877 + err = register_shrinker(&rpc_cred_shrinker, "sunrpc_cred"); 878 878 if (err < 0) 879 879 goto out2; 880 880 return 0;