Commit e33c267a authored by Roman Gushchin's avatar Roman Gushchin Committed by Andrew Morton
Browse files

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: default avatarkernel test robot <lkp@intel.com>
Link: https://lkml.kernel.org/r/20220601032227.4076670-4-roman.gushchin@linux.dev


Signed-off-by: default avatarRoman 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5035ebc6

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/android/binder_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

+2 −1
Original line number Diff line number Diff line
@@ -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));

drivers/gpu/drm/msm/msm_gem_shrinker.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c

+1 −1
Original line number Diff line number Diff line
@@ -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"));

}



/**