From: Qi Zheng <zhengqi.arch@bytedance.com>
To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru,
vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org,
brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu,
steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org,
yujie.liu@intel.com, gregkh@linuxfoundation.org,
muchun.song@linux.dev
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org,
Qi Zheng <zhengqi.arch@bytedance.com>,
Muchun Song <songmuchun@bytedance.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
David Airlie <airlied@gmail.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH v5 20/45] drm/i915: dynamically allocate the i915_gem_mm shrinker
Date: Thu, 24 Aug 2023 11:42:39 +0800 [thread overview]
Message-ID: <20230824034304.37411-21-zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com>
In preparation for implementing lockless slab shrink, use new APIs to
dynamically allocate the i915_gem_mm shrinker, so that it can be freed
asynchronously via RCU. Then it doesn't need to wait for RCU read-side
critical section when releasing the struct drm_i915_private.
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: Jani Nikula <jani.nikula@linux.intel.com>
CC: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
CC: Rodrigo Vivi <rodrigo.vivi@intel.com>
CC: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
CC: David Airlie <airlied@gmail.com>
CC: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 30 +++++++++++---------
drivers/gpu/drm/i915/i915_drv.h | 2 +-
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 214763942aa2..4504eb4f31d5 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -284,8 +284,7 @@ unsigned long i915_gem_shrink_all(struct drm_i915_private *i915)
static unsigned long
i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc)
{
- struct drm_i915_private *i915 =
- container_of(shrinker, struct drm_i915_private, mm.shrinker);
+ struct drm_i915_private *i915 = shrinker->private_data;
unsigned long num_objects;
unsigned long count;
@@ -302,8 +301,8 @@ i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc)
if (num_objects) {
unsigned long avg = 2 * count / num_objects;
- i915->mm.shrinker.batch =
- max((i915->mm.shrinker.batch + avg) >> 1,
+ i915->mm.shrinker->batch =
+ max((i915->mm.shrinker->batch + avg) >> 1,
128ul /* default SHRINK_BATCH */);
}
@@ -313,8 +312,7 @@ i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc)
static unsigned long
i915_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)
{
- struct drm_i915_private *i915 =
- container_of(shrinker, struct drm_i915_private, mm.shrinker);
+ struct drm_i915_private *i915 = shrinker->private_data;
unsigned long freed;
sc->nr_scanned = 0;
@@ -422,12 +420,18 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
void i915_gem_driver_register__shrinker(struct drm_i915_private *i915)
{
- i915->mm.shrinker.scan_objects = i915_gem_shrinker_scan;
- 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-i915_gem"));
+ i915->mm.shrinker = shrinker_alloc(0, "drm-i915_gem");
+ if (!i915->mm.shrinker) {
+ drm_WARN_ON(&i915->drm, 1);
+ } else {
+ i915->mm.shrinker->scan_objects = i915_gem_shrinker_scan;
+ i915->mm.shrinker->count_objects = i915_gem_shrinker_count;
+ i915->mm.shrinker->seeks = DEFAULT_SEEKS;
+ i915->mm.shrinker->batch = 4096;
+ i915->mm.shrinker->private_data = i915;
+
+ shrinker_register(i915->mm.shrinker);
+ }
i915->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;
drm_WARN_ON(&i915->drm, register_oom_notifier(&i915->mm.oom_notifier));
@@ -443,7 +447,7 @@ void i915_gem_driver_unregister__shrinker(struct drm_i915_private *i915)
unregister_vmap_purge_notifier(&i915->mm.vmap_notifier));
drm_WARN_ON(&i915->drm,
unregister_oom_notifier(&i915->mm.oom_notifier));
- unregister_shrinker(&i915->mm.shrinker);
+ shrinker_free(i915->mm.shrinker);
}
void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7a8ce7239bc9..f2f21da4d7f9 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -163,7 +163,7 @@ struct i915_gem_mm {
struct notifier_block oom_notifier;
struct notifier_block vmap_notifier;
- struct shrinker shrinker;
+ struct shrinker *shrinker;
#ifdef CONFIG_MMU_NOTIFIER
/**
--
2.30.2
next prev parent reply other threads:[~2023-08-24 3:46 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 3:42 [PATCH v5 00/45] use refcount+RCU method to implement lockless slab shrink Qi Zheng
2023-08-24 3:42 ` [PATCH v5 01/45] mm: shrinker: add infrastructure for dynamically allocating shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 02/45] kvm: mmu: dynamically allocate the x86-mmu shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 03/45] binder: dynamically allocate the android-binder shrinker Qi Zheng
2023-08-31 16:41 ` Carlos Llamas
2023-08-24 3:42 ` [PATCH v5 04/45] drm/ttm: dynamically allocate the drm-ttm_pool shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 05/45] xenbus/backend: dynamically allocate the xen-backend shrinker Qi Zheng
2023-08-24 6:00 ` Juergen Gross
2023-08-24 6:24 ` Qi Zheng
2023-08-24 3:42 ` [PATCH v5 06/45] erofs: dynamically allocate the erofs-shrinker Qi Zheng
2023-08-25 1:18 ` Chao Yu
2023-08-25 2:54 ` Gao Xiang
2023-08-24 3:42 ` [PATCH v5 07/45] f2fs: dynamically allocate the f2fs-shrinker Qi Zheng
2023-08-25 1:17 ` Chao Yu
2023-08-24 3:42 ` [PATCH v5 08/45] gfs2: dynamically allocate the gfs2-glock shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 09/45] gfs2: dynamically allocate the gfs2-qd shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 10/45] NFSv4.2: dynamically allocate the nfs-xattr shrinkers Qi Zheng
2023-08-24 3:42 ` [PATCH v5 11/45] nfs: dynamically allocate the nfs-acl shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 12/45] nfsd: dynamically allocate the nfsd-filecache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 13/45] quota: dynamically allocate the dquota-cache shrinker Qi Zheng
2023-08-24 9:51 ` Jan Kara
2023-08-24 3:42 ` [PATCH v5 14/45] ubifs: dynamically allocate the ubifs-slab shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 15/45] rcu: dynamically allocate the rcu-lazy shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 16/45] rcu: dynamically allocate the rcu-kfree shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 17/45] mm: thp: dynamically allocate the thp-related shrinkers Qi Zheng
2023-08-24 3:42 ` [PATCH v5 18/45] sunrpc: dynamically allocate the sunrpc_cred shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 19/45] mm: workingset: dynamically allocate the mm-shadow shrinker Qi Zheng
2023-08-24 3:42 ` Qi Zheng [this message]
2023-08-24 3:42 ` [PATCH v5 21/45] drm/msm: dynamically allocate the drm-msm_gem shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 22/45] drm/panfrost: dynamically allocate the drm-panfrost shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 23/45] dm: dynamically allocate the dm-bufio shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 24/45] dm zoned: dynamically allocate the dm-zoned-meta shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 25/45] md/raid5: dynamically allocate the md-raid5 shrinker Qi Zheng
2023-08-24 3:55 ` Song Liu
2023-08-24 3:42 ` [PATCH v5 26/45] bcache: dynamically allocate the md-bcache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 27/45] vmw_balloon: dynamically allocate the vmw-balloon shrinker Qi Zheng
2023-08-24 15:28 ` Nadav Amit
2023-08-25 2:27 ` Qi Zheng
2023-08-24 3:42 ` [PATCH v5 28/45] virtio_balloon: dynamically allocate the virtio-balloon shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 29/45] mbcache: dynamically allocate the mbcache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 30/45] ext4: dynamically allocate the ext4-es shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 31/45] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Qi Zheng
2023-08-24 9:49 ` Jan Kara
2023-08-24 3:42 ` [PATCH v5 32/45] nfsd: dynamically allocate the nfsd-client shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 33/45] nfsd: dynamically allocate the nfsd-reply shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 34/45] xfs: dynamically allocate the xfs-buf shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 35/45] xfs: dynamically allocate the xfs-inodegc shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 36/45] xfs: dynamically allocate the xfs-qm shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 37/45] zsmalloc: dynamically allocate the mm-zspool shrinker Qi Zheng
2023-08-24 4:38 ` Sergey Senozhatsky
2023-08-24 3:42 ` [PATCH v5 38/45] fs: super: dynamically allocate the s_shrink Qi Zheng
2023-08-24 3:42 ` [PATCH v5 39/45] mm: shrinker: remove old APIs Qi Zheng
2023-08-24 3:42 ` [PATCH v5 40/45] mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred} Qi Zheng
2023-08-24 3:43 ` [PATCH v5 41/45] mm: shrinker: rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}() Qi Zheng
2023-08-24 3:43 ` [PATCH v5 42/45] mm: shrinker: make global slab shrink lockless Qi Zheng
2023-08-24 3:43 ` [PATCH v5 43/45] mm: shrinker: make memcg " Qi Zheng
2023-08-24 3:43 ` [PATCH v5 44/45] mm: shrinker: hold write lock to reparent shrinker nr_deferred Qi Zheng
2023-08-24 3:43 ` [PATCH v5 45/45] mm: shrinker: convert shrinker_rwsem to mutex Qi Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230824034304.37411-21-zhengqi.arch@bytedance.com \
--to=zhengqi.arch@bytedance.com \
--cc=airlied@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=cel@kernel.org \
--cc=daniel.vetter@ffwll.ch \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=paulmck@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=roman.gushchin@linux.dev \
--cc=senozhatsky@chromium.org \
--cc=songmuchun@bytedance.com \
--cc=steven.price@arm.com \
--cc=tkhai@ya.ru \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tytso@mit.edu \
--cc=vbabka@suse.cz \
--cc=yujie.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox