From patchwork Thu Jun 22 08:39:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288476 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 B0D86EB64D8 for ; Thu, 22 Jun 2023 08:40:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 503928D0007; Thu, 22 Jun 2023 04:40:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48CDA8D0001; Thu, 22 Jun 2023 04:40:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 353368D0007; Thu, 22 Jun 2023 04:40:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 21F098D0001 for ; Thu, 22 Jun 2023 04:40:32 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DCEE01C8DBD for ; Thu, 22 Jun 2023 08:40:31 +0000 (UTC) X-FDA: 80929737462.10.9A47584 Received: from out-52.mta1.migadu.com (out-52.mta1.migadu.com [95.215.58.52]) by imf20.hostedemail.com (Postfix) with ESMTP id 3761F1C000A for ; Thu, 22 Jun 2023 08:40:29 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=ozPKp77x; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf20.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.52 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687423230; 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=jsEwzAna4029RV6z6obfQmMl2Vwh1p3nS0yc9a+2Lh0=; b=HuHJBaoZjVQGbOOAwcdiAU6sSvt3PX0bJ3Zt4sizn9TCHBKk87xDyzdSWjgPh7cjEZxe18 iE5qvjO++KSiIZKn3hqFa7Qa/XkAk2n/gHjLTvcw28o8pfXR6elGpYV/ojoaOexpt3+nzv SB5ojWNJjaEINOcfuveSKLDcjq1FNek= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=ozPKp77x; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf20.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.52 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423230; a=rsa-sha256; cv=none; b=tUDLA9BuePNmIoNomgu/3ouDhzJXC9F3ZNGnz+lqvODIK1RECAKo1FkF6aoyFG5Acdsoeg Vs52jABPqQ6/eXs6JWpiV8GAfNVXaunNw3/k4j4irjDfJ3DqWYnizIkNZqdErDT72gMD2d I0jYovmgc5tC0pFopLrKwv43VnVwYnY= 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=1687423228; 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=jsEwzAna4029RV6z6obfQmMl2Vwh1p3nS0yc9a+2Lh0=; b=ozPKp77xrQTWFLrt5JY9FY9sDiWzb4NwK8832YIIgpBuCa58zB9A3C1Ik+LPSf5cTp7v3t 9IJAZpdL4oTT3emFrHswJJuH9cCY+iz0ywCM1rCIq+rKQviZQ+esI9j+46bDRakK4PDGM5 vgbb47CgXrJSb8zRxEAcYTBfo6A4am8= 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 04/29] drm/msm: dynamically allocate the drm-msm_gem shrinker Date: Thu, 22 Jun 2023 08:39:07 +0000 Message-Id: <20230622083932.4090339-5-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-Rspam-User: X-Stat-Signature: ztp6ft5y1zgqbih7697bbcrjyac7ewae X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3761F1C000A X-HE-Tag: 1687423229-513510 X-HE-Meta: U2FsdGVkX1/p8ic3ax/h3WwnZw+JgF8ZLlvIzlccrrgq01IUeheMA8apwpkT9/Mo2KiyG/oo8y5HxfXTx1jTn8WRB8eGxkuezXVJJo9za0pskLpT/a4bSs08363StzHbaJ7AmkLDdO+42gyxOD0P8wJenpXfLoZM+T4qHAvTISZluLQA/d03CSRFKeBop1sTtnx5wdj/URsthQe24r/JAHDo2+uzhP/kXZYT3tQCwfQEr52dlKWzomDRzZ+GNkrhkm6rvigpG2XQkgps1u/yIZ/m0w7LAYh/MAiNwh+n0Ddc2eHq7HfEBqDTbBs26G3jUvsJC35AB6kXZQvHKxrEV7H8fZ8NurhnlfTTfE0OtdfgLO3BgjStqzPJ8FIdfSnZgyfvqeuSLaS67Z9bVqoXgrJoF/Tqff+lHCjjg+BxPj5vfGMi4GlsQOV+GtDScGUbI7B/zTdVC125TOl2M+rNQtmMZbRp22g2BMX0MGrF+FnxXpW4gyUFlTEjHkxkCmYxIAFOAd3Jie+EBXO//MsqW1g/dx2pwtBYP2KzutpwcGYESM8xozxSZAuzHTZB0yN3EcFS3UzQlqzGuQL4CuKrX5iFWKHjeclfLKzg4ieT2Govta89EnUpHCuhmtzP7FubZVo1O0TGnQZs9XUlYJjPpIOXQnL/0Iz0Gtc4PM2fQCi9otaNKJWP53xtOnvVgloT5TVwiXzCXdepyS6O3NOSmA4E17OBz6KLfGU1Gvy8idHEhZw8QJtF/c7Ek3UOl0iMECXhfrCAc9ETPjo6rroCd42QRGrdmxlinwXgfAMgXgUSIZHiSe/SfU6u7/llQWn4WQU1CSOUyr3A7GFRaaaHrLd0j+1s+/KB7/5yXcTE2aNohaQqHotrQnwelGl3JhoQvSxXpLphdES6ZwafCxhUadhhWQlJ2778FZXT+xjXlEe0WIhESg9TUsknNffOsZz1Mf3Hbl4DuU7kiESYPuI 2XlUPXrU vEgxgv+0m87dnWG1coXF+AHvhK6dWUsyvtYZ55n8b9eOl39M5UfgfKJ4B5bxiif3++FkchJ96SL1QKf76ufIpR4mmqJLRBMWbUI7ienx8LuBh+VrHsnaIPON1cpp16QptSR5GqmimMaPhE//u0dJhGjVY18TcIe07+JBuRwLbOI3hhFKmPlfA5x/6QQ== 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-msm_gem 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 msm_drm_private. Signed-off-by: Qi Zheng --- drivers/gpu/drm/msm/msm_drv.h | 2 +- drivers/gpu/drm/msm/msm_gem_shrinker.c | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index e13a8cbd61c9..4f3ba55058cd 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -217,7 +217,7 @@ struct msm_drm_private { } vram; struct notifier_block vmap_notifier; - struct shrinker shrinker; + struct shrinker *shrinker; struct drm_atomic_state *pm_state; diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c index f38296ad8743..db7582ae1f19 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -34,8 +34,7 @@ static bool can_block(struct shrink_control *sc) static unsigned long msm_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) { - struct msm_drm_private *priv = - container_of(shrinker, struct msm_drm_private, shrinker); + struct msm_drm_private *priv = shrinker->private_data; unsigned count = priv->lru.dontneed.count; if (can_swap()) @@ -100,8 +99,7 @@ active_evict(struct drm_gem_object *obj) static unsigned long msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { - struct msm_drm_private *priv = - container_of(shrinker, struct msm_drm_private, shrinker); + struct msm_drm_private *priv = shrinker->private_data; struct { struct drm_gem_lru *lru; bool (*shrink)(struct drm_gem_object *obj); @@ -151,7 +149,7 @@ msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_to_scan) int ret; fs_reclaim_acquire(GFP_KERNEL); - ret = msm_gem_shrinker_scan(&priv->shrinker, &sc); + ret = msm_gem_shrinker_scan(priv->shrinker, &sc); fs_reclaim_release(GFP_KERNEL); return ret; @@ -213,10 +211,15 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) void msm_gem_shrinker_init(struct drm_device *dev) { struct msm_drm_private *priv = dev->dev_private; - 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, "drm-msm_gem")); + + priv->shrinker = shrinker_alloc_and_init(msm_gem_shrinker_count, + msm_gem_shrinker_scan, 0, + DEFAULT_SEEKS, 0, priv); + if (priv->shrinker && + register_shrinker(priv->shrinker, "drm-msm_gem")) { + shrinker_free(priv->shrinker); + WARN_ON(1); + } priv->vmap_notifier.notifier_call = msm_gem_shrinker_vmap; WARN_ON(register_vmap_purge_notifier(&priv->vmap_notifier)); @@ -232,8 +235,8 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev) { struct msm_drm_private *priv = dev->dev_private; - if (priv->shrinker.nr_deferred) { + if (priv->shrinker->nr_deferred) { WARN_ON(unregister_vmap_purge_notifier(&priv->vmap_notifier)); - unregister_shrinker(&priv->shrinker); + unregister_and_free_shrinker(priv->shrinker); } }