From mboxrd@z Thu Jan 1 00:00:00 1970 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 B18BCEB64D8 for ; Thu, 22 Jun 2023 08:54:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D7338D0009; Thu, 22 Jun 2023 04:54:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 487488D0001; Thu, 22 Jun 2023 04:54:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34F9A8D0009; Thu, 22 Jun 2023 04:54:30 -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 264428D0001 for ; Thu, 22 Jun 2023 04:54:30 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F2C0F160A3E for ; Thu, 22 Jun 2023 08:54:29 +0000 (UTC) X-FDA: 80929772658.11.DEECD84 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf15.hostedemail.com (Postfix) with ESMTP id 2452BA001F for ; Thu, 22 Jun 2023 08:54:27 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=cC13yiK2; spf=pass (imf15.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687424068; a=rsa-sha256; cv=none; b=JOQavfSEvHsM3q493vVyRj0/aBXRNrgpxLvLZ8WSUlMqH1yNRDQ5EhLGld1yeY9mGQh3jo i97Itocdn8x4Yk9pA+c5C22lgH5Lc+/rrMEDVTqLbWkM1R7SMZaWUwfZMrM7+gSghmzGut GQbSFZUo8mYtfyNYbre0uXpsRX9iuYg= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=cC13yiK2; spf=pass (imf15.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687424068; 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=qIt8zXdDCaGLXCE6rKF2JMKvp8G2AK8nuTQphjV73ms=; b=QKgN/hQxs7N/tqDlnSZ+XGv9C5KyP3yXsMITJl/ofiTcTz1PFtEPO8vrARAjtsuvXB78B2 HaIMRyaOEBJqsH6WJ1tPlYKl+dh86Oy7D+RzmoKlJCYVNcNSIJfARAlKEg6JFYScMcHHzu rYOyYldRXIyE4j/z24WF2eZAajN+mgI= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b5466bc5f8so9652365ad.1 for ; Thu, 22 Jun 2023 01:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1687424067; x=1690016067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qIt8zXdDCaGLXCE6rKF2JMKvp8G2AK8nuTQphjV73ms=; b=cC13yiK2b2HqEC2WYanx92tTHG9ibgrmYLbrgzYcUarLdydxeypI53cwuyYhjaQzJp onJq4vBBmMajr1poWh86FQTLq2y1xSvoknQDzCFUhqc78tS5eFxPwQt8ueUiPUlQcGJ1 NoUMAyqrL7rvWv1XaJ4CPnN6K7xK1sRx+XiYPW8paVbE3vb5Wkc4IFamUXhI7GXmfwho QPeLUm4YlUE0P3+vsMp1UZZv6g44Pla+Jp2DOFJOg6O2qS7xw748UZa1YIoXHuTtcdry A4esVq8CH+pV+6r7bJr/mBJgAfFPjM5J1TM9ToGnDJSCePlm9yunBGrnuwbojkh7OG6q rFSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687424067; x=1690016067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qIt8zXdDCaGLXCE6rKF2JMKvp8G2AK8nuTQphjV73ms=; b=Mkvl80SCfadx9TUSglND/Z2z+RwCoVH1dYN7r4AOjx6+Z94rciqRKHDxWYzQtfIonr ta1F5PgyZLbKW43hkJez2sgIm9ezMfamT0OT2A+ocnmknZ6OX6EhmNXVeWy83Wya+ILl xvDArrKMU+M0LIHWj7gCh+njcTq8ZZisq5zIto+2JtCC09p2lq7xumoMJ+wpC8yq7+pm /tu0st9tEBewOt6Nw9wNgnMOwUwvQriOTPEK6Ir67vHjAOfzrUChKQnPnEmykMUEHjqQ LEkSdY9h0wqDmynv+AvsCzU9O4CKPXmI5+Uq4yrxHU3Kpv3nLIPMsrbKtEeyYktcwvVJ TIbg== X-Gm-Message-State: AC+VfDzFwQY0h+//ZOXZayNZoBuQuzBg2kGbBvRwMJGbrjxQGTJstmKU Qghv5lY8tzP03/yBVwzsi6dVzw== X-Google-Smtp-Source: ACHHUZ68xppE2OzenI0HziNaJw5pBbhsLnOSkDmr33RiuwGHaNU1efiGcJgTbt3uCyHHsLierWgKoQ== X-Received: by 2002:a17:902:d489:b0:1ae:4567:2737 with SMTP id c9-20020a170902d48900b001ae45672737mr21909019plg.2.1687424067136; Thu, 22 Jun 2023 01:54:27 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id h2-20020a170902f7c200b001b549fce345sm4806971plw.230.2023.06.22.01.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 01:54:26 -0700 (PDT) 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, 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 16:53:09 +0800 Message-Id: <20230622085335.77010-4-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230622085335.77010-1-zhengqi.arch@bytedance.com> References: <20230622085335.77010-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2452BA001F X-Stat-Signature: x5bggp454jueadfp5z6x18wc9qapx61p X-Rspam-User: X-HE-Tag: 1687424067-400971 X-HE-Meta: U2FsdGVkX1/PgaF4qMZvtbYtIhh3kz7yj5sOQhFsXE90Fh4PHS52HN5IkiNuiMu3ssOm1e2dRtiWjZmzuZm0+mvrOfPNs82aiSc/D/8Gqah7AQYiaWQ48U2IQAykrCV3udbg7XqwwSanvyoV6EnTDNEiaSslmLOzMnsC7UjkxzIBsO849Pt623+605N0bdMp0WXqHHRVelBk8JpWfMbDmYlenW/1gYEaG4QEfw6ilh8nxFx7D1y78P63SQDksf/zCeoAW3uDlH9uyrfISHW+tAzmhti8A6AEk2sdWVhXzFjpBZ/j5e7WZ6R4xwrNMupEcHjKz8/WXupFjHHYK+14QQ+/CWStWr388IdUDDA4WMwc6ATEWXYOjvIUoh5CUmqibnPyuch7HUXmPe3hJZIUImRKkYz3g39sxEeYDP8fVolcsZd9WQZtuc7tyVnRWeG2vFjC+W/zjOPN2lPvfnRk4S11KYvbRdyMsGs38seI6nfnubsv2ctTw7qOFv5WcGnVMXmmeeZ5XgDSw0l66LKLjnVtW9q8k5coiEW6MhjgtWxEzFKzYEz8b0+OTVaeisNY5Wka+Lge1YZwssxKjGnRtUbKniOeUaOkLX6FR3Gt7S7oJcFV8hPj4sA2movNpciyBn9kJBun4xLtFhxe5N80yrsS/NsTgn0deejy0W+HHQld5JOkBzQxA+qGW9D3kjHfwCIgZmZtBLsJzXk1Arwzh/QRSYmLCDou/r3LDobyilU639fAEm9HiI6qemfSbsccAJOtHplkWKVHqRrIeu8nFY3bHaqQJPrXz+u2myflDj5fHz+cN7ri1xoiWh6jUNBEQXtf79hw3wcDzAsT11sHk12xhjfLPWcAjJTUDlklFgRP14+I9eVcJohfa45s9UFUEUgoSGnsPwtB6xQqrMcna8wvWLDrov2HZJCbseFnk4ko4V4ovgR3/U8BqMRZu0vvTXt3G5M371fNJICo/Nl QzjszAXw WGpk2ely4GeCrHjfNfKUJ/lEm3NewNpWQT3kUIycD8+4HuirrheHRvCoGLKgZUaHdQC9jokFx5JUyyTgi38b4WBT6/Y54cEXUlHhzbuW5jWpyoCd5P3+EiQgDlQYr3SAWuxUnmai1u7nTwDqquO4fLB0udG0PDgDeM91GkA8kSNrlas4gmfmPPWo3br7Q6+LcIQ2VyuGPaVg7AVmrZyHtP0Xhs1ImHWl58NxQB8ptD7iTTZ+7CBr5/pfgSWJIT9bGbIqC4gfQaIT8AZBdJBWN6wG/AneFNJdxcZ8mvJOeNw5/6fVLvM7YOHgsxFsWgIJH+cKbwTMm1vqqo+EUiNL0jSuhZC2g44njI2JGMdb7KyR8ObVI9nbtAY8+3HUc5A/5nA+6nnT6vqHtgnGPgiUxDpimkYwSR257EkPffB2ocGFOWH86LNuiOCizgDGMLT+B8cEkZtAbS3m9dZcxggi09sURoQ== 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: 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 /** -- 2.30.2