From patchwork Thu Jun 22 08:39:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288477 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 C0E45EB64DA for ; Thu, 22 Jun 2023 08:40:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 613A98D0008; Thu, 22 Jun 2023 04:40:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 59CF28D0001; Thu, 22 Jun 2023 04:40:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43EBE8D0008; Thu, 22 Jun 2023 04:40:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 340208D0001 for ; Thu, 22 Jun 2023 04:40:39 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E8D8AC0A26 for ; Thu, 22 Jun 2023 08:40:38 +0000 (UTC) X-FDA: 80929737756.19.6D9E99B Received: from out-42.mta1.migadu.com (out-42.mta1.migadu.com [95.215.58.42]) by imf19.hostedemail.com (Postfix) with ESMTP id 39E5B1A0004 for ; Thu, 22 Jun 2023 08:40:36 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=H8s1pQs4; spf=pass (imf19.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.42 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=1687423237; 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=IxIKmzzZi67lG9XSJDebD80o50peuZjA/0wHZiu4cuU=; b=z5nQ31NWzCEI5szBUbxyZA3PuyM5w6zM/f6iRxAf3Fo715gzVJpgrkk+k4vSvg4RjKTthK nCDIGr2kxxijmhoeirc2f107u+vRmGujpHSEkfVMWIL8iexkgwgH1uNieJLfweDzNjpaaO t6A5ItCQ5ZA9JSiHh66wuWcuzViK+b0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423237; a=rsa-sha256; cv=none; b=BFn4nZJK0OIOE+YRzzyzN5JuEHmHIUOMkuLDsOjkbSnhiZeebhdhnocL0btutc4MyDPHN8 i3D8WOlTfR8k+KCcsBTQdjGyd+KrdTu69/vh3itMXy9Y0iBCme+/4RxaUc5AyQQ0yo1uxo LQO4nFuqdbFgConkeOTQAy2kjPE0LCo= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=H8s1pQs4; spf=pass (imf19.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.42 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=1687423235; 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=IxIKmzzZi67lG9XSJDebD80o50peuZjA/0wHZiu4cuU=; b=H8s1pQs4VGCf5n+ceh0zwRdlcTNNqN2Py3KDQXuVt1RkndP77diVR1uYW4KzkPkjEIKsys H7QDJljwElq7g1TzIAkvNua8zzlhkxB0H11gFgOBfIt7JJ6zRRMu3JZw1CdR8an7OABUut k6NXXYI9vzZtztWWnS9SmS/quoFvciQ= 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 05/29] drm/panfrost: dynamically allocate the drm-panfrost shrinker Date: Thu, 22 Jun 2023 08:39:08 +0000 Message-Id: <20230622083932.4090339-6-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: oi9a1npd6fd86ecszxhogr1o5fhe4dn7 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 39E5B1A0004 X-Rspam-User: X-HE-Tag: 1687423236-822338 X-HE-Meta: U2FsdGVkX1//9/Bkx//rfXfEpVoGmvDSF00bnUVjndJoEW2tJsiDbRJSWtRgaxFfXQcmXiArH8v+VvGJOpRXGfVIzDOysFuJBaWM3UTws2//nm6SJUnVyzK3r2U1wjlqEHVn+V42I5AmFMX2o05YooyM1XT4Gz9+3RYV07xROsFFlu6nZA+hmWm5FOc0nQACSxJ9JsS/lE3+D7yCaE0R6lpuF7PFTvkWl8FMPXFymWaHcijzpPskzApex0YDViVr6N9gtB76dBrTc399Wp4AOHYWkxEaSX1DJM2uJJPU/zURsHpT8RFeUpwA4KahGXqMWOn9IF4p+eTOvueyvS900h3PwZoPsVZ7QdFzrcBKMkdugZvPCMonEcRtVn22iknLD8StwpDycgQUtpQO29cAreW5ob9l2Gz+ZIThhtwGmDaiim7sn6gS/uc3kfUsCH9pNSquX7r2MtciJywckOQDYEDSqd9puuV8fUBiw0+PymaKLeLNjLbQiyrLbrV6ELxVcnRNJ9jU3hzSyybKfVviA2D/ffux08Gzx5LJk40W98agyCBmA1Ig1Tr4/jz0DxTE6sjfq9V5lecHAoPVLBr756ZUgBDK4/eoVtlErrWuGFYQWGiGh0OBBgy2q58Jcm46xXxxKKv3lGT78q5gukr0AgkAQ6Sqc7qndi76ZHCEqfnjwhFe0LwYSei6vddiL8mXL8LJmCi8eNlJ2U8WHLVNCeOl0Qf85XFiUuokaWqLuXQTQ+G/rWWgawq0e4XSOrZpKnGjnzj7N2oxpRR0PcXP3GemIryfjNq98v2+mdPu7uGwbN6VbN6+pvtHwgxsL4SzG1ZKjxx2H/53FxThkzaTx20LxiqoGxFW1DtN6DBgQaXZBsl7j9A6SIoQgTH3R4MIyfEPSfiAnLFsWR/yadO+mPssUut4clgAYFTBsHMs9GJjGED9+X1G5nY9FRRR1piVFYs60W+a37XYQai//RB 1o/U+lSq 6Os/rhuJXgjgQdVwQK5nyxi2oE+55RMtIPZsf6DMuj0jW/R2C/j/Hs89iwx4CM2dUNgAPe7AcgGEBImTrGhd0uPGhVC2Znr37FJarHNWhG/U78TjRpcxGutGZ4giaT9BQLl08zf7ytfcb3y4= 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 drm-panfrost shrinker, so that it can be freed asynchronously using kfree_rcu(). Then it doesn't need to wait for RCU read-side critical section when releasing the struct panfrost_device. Signed-off-by: Qi Zheng --- drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index b0126b9fbadc..e667e5689353 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -118,7 +118,7 @@ struct panfrost_device { struct mutex shrinker_lock; struct list_head shrinker_list; - struct shrinker shrinker; + struct shrinker *shrinker; struct panfrost_devfreq pfdevfreq; }; diff --git a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c index bf0170782f25..2a5513eb9e1f 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c @@ -18,8 +18,7 @@ static unsigned long panfrost_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) { - struct panfrost_device *pfdev = - container_of(shrinker, struct panfrost_device, shrinker); + struct panfrost_device *pfdev = shrinker->private_data; struct drm_gem_shmem_object *shmem; unsigned long count = 0; @@ -65,8 +64,7 @@ static bool panfrost_gem_purge(struct drm_gem_object *obj) static unsigned long panfrost_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { - struct panfrost_device *pfdev = - container_of(shrinker, struct panfrost_device, shrinker); + struct panfrost_device *pfdev = shrinker->private_data; struct drm_gem_shmem_object *shmem, *tmp; unsigned long freed = 0; @@ -100,10 +98,15 @@ panfrost_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) void panfrost_gem_shrinker_init(struct drm_device *dev) { struct panfrost_device *pfdev = dev->dev_private; - 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, "drm-panfrost")); + + pfdev->shrinker = shrinker_alloc_and_init(panfrost_gem_shrinker_count, + panfrost_gem_shrinker_scan, 0, + DEFAULT_SEEKS, 0, pfdev); + if (pfdev->shrinker && + register_shrinker(pfdev->shrinker, "drm-panfrost")) { + shrinker_free(pfdev->shrinker); + WARN_ON(1); + } } /** @@ -116,7 +119,6 @@ void panfrost_gem_shrinker_cleanup(struct drm_device *dev) { struct panfrost_device *pfdev = dev->dev_private; - if (pfdev->shrinker.nr_deferred) { - unregister_shrinker(&pfdev->shrinker); - } + if (pfdev->shrinker->nr_deferred) + unregister_and_free_shrinker(pfdev->shrinker); }