From patchwork Thu Jun 22 08:39:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CABDEB64D8 for ; Thu, 22 Jun 2023 08:40:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E60D8D0003; Thu, 22 Jun 2023 04:40:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96DD68D0001; Thu, 22 Jun 2023 04:40:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 835708D0003; Thu, 22 Jun 2023 04:40:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6F2698D0001 for ; Thu, 22 Jun 2023 04:40:23 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 362311A0ABA for ; Thu, 22 Jun 2023 08:40:23 +0000 (UTC) X-FDA: 80929737126.14.5F8DB0D Received: from out-32.mta1.migadu.com (out-32.mta1.migadu.com [95.215.58.32]) by imf21.hostedemail.com (Postfix) with ESMTP id 6AB451C0006 for ; Thu, 22 Jun 2023 08:40:21 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="thZHi/Qo"; spf=pass (imf21.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.32 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687423221; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YBVLZ8T0AUSalQOZ4Fae/Pcqr0gB1hnArD6YsGE5SYs=; b=626B+PEnmuHjlWW3drRZkj9VJ2xvfjoYqLUsg6kSt8hBQCz4HqTQ2jBqVVo2R0OrqDW3IT QNEtGY++AR1z865c0aRH+9RoZ6bjeepihD/PU9M4UewtlLbKX8NIgTKeUs3s892eJN5rCf BlWf+6OBAR9q20sM5qFyfE5AZjv2AYk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423221; a=rsa-sha256; cv=none; b=nDA41nXXtyJtwgaGJG7bNimurxFQZfilCIu9dtkNmCuEFxkdM9wObxm36teNXA+fO+Qwwg hTy2ryEOZH9Q52XYwkZuWvduvZ1mwZAg8gg143rro7g6J0xKweHJGIrzdfL416IiovxFc9 LswEjnc+xZjTlXUl29wmEFXVKiDN8bA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="thZHi/Qo"; spf=pass (imf21.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.32 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687423219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YBVLZ8T0AUSalQOZ4Fae/Pcqr0gB1hnArD6YsGE5SYs=; b=thZHi/QoTVPq1csTgIMqpUQ20OvMjdsBsXeaUpPeKH85EW7BiRYD9ttr4T9v65hxCRywKP T9HVLydQbpkQmLM6vybmydCQ1LElnGP36fjdA5gXjDxbPqwbWcRer+Apq8kcm7jlkNu6Y4 ZwS+4SOpSOeGyGFeH5pFLiR5QGJm6Oo= From: Qi Zheng 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 Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH 03/29] drm/i915: dynamically allocate the i915_gem_mm shrinker Date: Thu, 22 Jun 2023 08:39:06 +0000 Message-Id: <20230622083932.4090339-4-qi.zheng@linux.dev> In-Reply-To: <20230622083932.4090339-1-qi.zheng@linux.dev> References: <20230622083932.4090339-1-qi.zheng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: nrpketcxdo3krosirwzrmodtqx97xmtb X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6AB451C0006 X-Rspam-User: X-HE-Tag: 1687423221-520277 X-HE-Meta: U2FsdGVkX1+fLYiUGO5OJrugD2Njzo+6Q69u81bjwH3cbCD22hbYvxe/O4pk3JtWHmZzCGi1jz3n+FHXQuk3PE3KssHPUF6dYVHi/Pl72+USqTl+7xHcPaoz3l55j9liGMnKOdmZDr0DPftlqAuIU5072SkF8jEjgk0CvSYXOdvhPfihGfsmlAFOe+y27dG3y013O1Ua8egRMVq8XrvTutFxiRmSU1oGRR0nOhwNILhWtZncHK8eJZffdQRVPj2fXtVkhirg25/joiiqGKtvi/Jxe7sJ4N4QAG4lnDRYzFrB1CNGG/cl2RsxPvqeSXs8UZ/WkY0G7blGxB4Ot+1CSY4BLxdeCY3jmyaILajWiy2XIYS9KkBhDDhjDjSi3c0CFFzmo3M/cXiOODzInVj9fi/Y3A5Y7GpRyHjBroZGKvPs9vfppdKHaonZvMnzpNiYP1wwjb9LTE5NwTTkTYrW+IYJ23Db9Z5FThCRffj+CwpuKTOqNlucX8qqV7HT/eyN0/GRZhD64DV7/UTl+fF2UaX33zWvnwH+4L9Dal0y7Vt6N2kM8QOfoAAPlyjuH2R48L1cyrxeO4JImZY2sFOyqikePz7XrBlDeht+D2X0rp+QFGFQsY2BDlBr4jc2s8D2a+Gzivt+WuZnfKo4uP8TqiOMNv/3xBmWMG5IAUofXXKLwqIpXKjMsxwCvgtYUX158Xv+G0ZZdXO9RbGdc3lhbjFcBtJ0sQruHPkVaCAZS0UUnoXAESQfSX/MiNzhSJPyIxXjFpzoKNBAlr33wpQFiV9u+Svde5Y1hs8Dtq1et4o+HDgyhbZXDF5gXGRHURL3AHBDkBxqm3OalC9FmxZRlJLcKfoVKjQuRdyt7Xq1vSK3yRmjorgyncGLY1DNy8uCGcoJCIn7/oOWTre9XNhrWOOOmZkMWmcnAFVs4ym4dVgyjcHuDrfc5rrGrz+mK8ep25oWJ5uAc1Q5VYMRX6e 1scwNwxd 8w2ft7zgsUADzLNMUmqZ00lbwB+rWSl+l3KqXnibXMRuEleZ0c8GZDmh5hRPx/yHN8axrRpsEk+xjm9rw1vdDX+mMP/r6nGCFcmsh/ARhgKZ3BUeVqz1fF0+PXgEzFgPaP56uHh7+rVM4X1Ty6CjhC9zX2xkByhIjSIGjF4Jq/5fHDcf18RrVLZ4vRg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Qi Zheng In preparation for implementing lockless slab shrink, we need to dynamically allocate the i915_gem_mm shrinker, so that it can be freed asynchronously by using kfree_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 --- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 27 ++++++++++---------- drivers/gpu/drm/i915/i915_drv.h | 3 ++- 2 files changed, 16 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..4dcdace26a08 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,15 @@ 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_and_init(i915_gem_shrinker_count, + i915_gem_shrinker_scan, + 4096, DEFAULT_SEEKS, 0, + i915); + if (i915->mm.shrinker && + register_shrinker(i915->mm.shrinker, "drm-i915_gem")) { + shrinker_free(i915->mm.shrinker); + drm_WARN_ON(&i915->drm, 1); + } i915->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom; drm_WARN_ON(&i915->drm, register_oom_notifier(&i915->mm.oom_notifier)); @@ -443,7 +444,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); + unregister_and_free_shrinker(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 b4cf6f0f636d..06b04428596d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -163,7 +163,8 @@ struct i915_gem_mm { struct notifier_block oom_notifier; struct notifier_block vmap_notifier; - struct shrinker shrinker; + + struct shrinker *shrinker; #ifdef CONFIG_MMU_NOTIFIER /**