From patchwork Mon Sep 11 09:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13379074 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 67D0EEE57DF for ; Mon, 11 Sep 2023 09:48:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05F516B0200; Mon, 11 Sep 2023 05:48:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 00F6F6B0201; Mon, 11 Sep 2023 05:48:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF42E6B0202; Mon, 11 Sep 2023 05:48:11 -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 CC6BE6B0200 for ; Mon, 11 Sep 2023 05:48:11 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A211312098A for ; Mon, 11 Sep 2023 09:48:11 +0000 (UTC) X-FDA: 81223840782.15.795F331 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf28.hostedemail.com (Postfix) with ESMTP id CE096C0019 for ; Mon, 11 Sep 2023 09:48:09 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VaNeMDFr; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694425689; 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=TH2SdUyTcD6fjHvcYPnGAz08JEgs2WamZypN/j9OP1o=; b=OhPeXAkIGtHI8ko+Lexsb4ahNc9J7J+kgbJCMaRC+bJ3gPALvM7FLr0uyxHGmqIoSCDARC yqaPwxHK2ElIFqew6liw5yt1uRhBOy1o2eG79IgvHKFZLmaLo3NSMzmxwz3epsg3/VLP/0 0g96XasDjJDVThECXWYl0w77k+3JsXY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VaNeMDFr; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694425689; a=rsa-sha256; cv=none; b=of2MbdVJXzdzGZwpwA+TXEC5bY4povlftaUwXelKajgHGnroMowTZBLAoBsm6Sbw+8R8Uh Qw9J97kluq7eBIOpdP7kI7/EEtyLhh3hUpZwZH8uAFbgaG0IUG/DbC9BLFntoHnYHhh4Gd hSZLlHnZzp73SW4pR3cazBtXKuYtn2o= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1c0efe0c4acso7087875ad.0 for ; Mon, 11 Sep 2023 02:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1694425689; x=1695030489; darn=kvack.org; 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=TH2SdUyTcD6fjHvcYPnGAz08JEgs2WamZypN/j9OP1o=; b=VaNeMDFr0UmJ/keK/9JWOEjLSQYcG6mKIISDTps3XzeXV6gHaHe8nX91aHX22NQwbM /+qWr2NxyixrymUSsHsb22heq9Fnq1F1/85fnCHR9TyaAMi/G0uVVHrk/QNZpd/EtWRd 96R9Zx8m5CNO12ZS7gJtbbOgwnAsr0hwH5ACO0ELlb5wQM2HXlE+iwyMR7hYzGT6cJsH Xb8vAEYsVRUQG6TUF0fR0lvKuEWaFmnDlwYbEzvO3o3H3Xs2lJcFIHT2pw++reDejxbW MWjgkDYHxv+WE8rMtZgfOr3FnVmvdmsjopSAUBntSl5fSHoGmazhF7S06QpI6jvL71Sy S5zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694425689; x=1695030489; 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=TH2SdUyTcD6fjHvcYPnGAz08JEgs2WamZypN/j9OP1o=; b=TLSpkI0doFYdC5Of4wQs0vgnOlUfCmDH5g/P0ODQe560Xy6iXs2W+CiShaAGX9pa7B 1ozXBD9V2EMmPCJeK6/GKHzPNcY3QQm9a+RkQ6yyUGe46CB8Yotjq4RvfkiOz9B/2lYv IwTWlT/uuc4gPK+3iLjAB01rcG5OHh8LkDDW0Ibw+WCZQI0MgdbWaYcPz2FjNoxBoR8k Kb0jSL6SW0CxlzliEh5hK8howlZAMzHf9Fe2zVvy1E2fTdvuYY0EaIpfscEvC6VYtb6F L48BmbUD7tDWNF9K2xwS1cBar0QYC6kFA/zPMe67vBZJs2bohVBFIZ6YAGyf7nucUeWV h8Nw== X-Gm-Message-State: AOJu0YxBaAKrAYehvr04zx1mCNCF8uJBSAMdink5DfoNYtbFd2mevH0Q TOQlxO5OV8HN+QYPUsy1TCdHFA== X-Google-Smtp-Source: AGHT+IFXsoJn9CE40v3H4M+g/tTzTAY/D+R7L1IYVyxz9f8XJyNRX7PJqlNVDB6THijf5N8OiFzBVQ== X-Received: by 2002:a17:902:e750:b0:1c1:fbec:bc3f with SMTP id p16-20020a170902e75000b001c1fbecbc3fmr11507909plf.5.1694425688824; Mon, 11 Sep 2023 02:48:08 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id az7-20020a170902a58700b001bdc2fdcf7esm5988188plb.129.2023.09.11.02.47.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:48:08 -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, 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 , Muchun Song , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH v6 20/45] drm/i915: dynamically allocate the i915_gem_mm shrinker Date: Mon, 11 Sep 2023 17:44:19 +0800 Message-Id: <20230911094444.68966-21-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230911094444.68966-1-zhengqi.arch@bytedance.com> References: <20230911094444.68966-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: CE096C0019 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: kphbqip9kizezfui78panjmxhubiaiis X-HE-Tag: 1694425689-365933 X-HE-Meta: U2FsdGVkX188BufjV4zvC30rqg2GCkYYw1rZr5Fut4c/5hGOWO116TsqtRaxUqidSz3Mh+4Qpm2VGc5LAIpywC4/NJ6B+gJQwAy9kxek5HbQBb5ehmSIUEcsONOAiWa0z8a/MGKQCNgOJOlSBG1qJASZUWmi2EmA0Ipi3rNyXhRKdMfApBT0sPKA2DkmdgcdQ5kLoDYLIY27JPLdCfPAn6VvLsKRIf3GS337+NfSV6b0Te/Ad9mgO7TagU1qObuuN4Y0UyelkeeEVk6i+PFAhvfsFdvRYQy9xeWv2i9ZTnwBfjLauXjP6sSv94Ledd2ew9CkB8lzGSnRUJC0c0W3SBEEXHapllVEiVeE3zHZKT1JtGSiou1pE7wC7qxyKUI/0YoQvPusfQKGSlRu2p2b4pIoczO6d/WgnXWFXFnGBRNIkHn2JIv5rXjBLmZ/sljgf28SdFowxYtVYrfm2mfV3PLCa5NSammHTIaXSPPuQryL6C+jmfvWBq0N/dSOn3qPyYQxKoa2QYwt36/7XtyZNpl70qLZwagXu/8UHaN5lXlzwNZ1RRH4cYBNLG08efRpa5FqXM4yvIc6s5GtK9EVO+t+YChI0knV4zKzgXiUz2cD0RVzqeO72m2EODvC3vmkjLlFB3wtKSy+lzBvjwLYLj0B9t4felTLYK6qvnrMmD6myCh7xhEgLpssFqTrgMEk4CdpuZ9qhP5zd93leP8CKuHzkIpFC9WaH2uh/2YzbfiMwRcbfiyGwZGKCjAELXiqCrGNjSrxbOsRU/iJ7D4q2uNckdxLeg41PBz3er5xq3BFrkv+Oz5XBbwNS8W5DqNODAhnEArGehXrat+bm7kfgmp826twYoL85Ik4ZF2J9IQfw8cMhat8qviWdxUNL0piU1hf/itry4VqGYg2nTMP/FpGR/Fl2DV4bqnUDlJKtFEEYRAemYu/6niI/ZeSN5SVvei5YkIjW6F5LEjERed CypNehtJ dg4NomzCy9nw7Tw+tPWs8K7LXcRxmWYYPYBypXE/hVnhj31VyP+O0XEdtPBhCr7Q+miuIELxIdKpqrpCY5ITbTouv2B9RSlEGsnc59L/hiuRh7yzPvQPjYlBDgUpU0oFpQTeh0M9LhpGe9zgMa9ZNTndnHsmRwJ30pXtL/utN4csl4wUk/593k8y+3/VdeiKZ4yYCK0I6bhP1Yh5uXGfGLJmPWcLR0jpaRnR5i0y1x3dL/zyVkGvHdf/EFUAajj/f6oNoZcScN0MMPQOGvqBqyEyR2+FoOSNLCPkrHAnZb6LH02+iWuJSyhmCFOLHuIvPi8ES5eAJCNAmyDTmhIoeSFguFCXXYkqZCNzq9D4ikaexJfQk+MDH0wMCTrxls55Y2pHf3c2CIXhjpPxJAsZa/41C+nWfK2HNVgRi5MRVj/CPvBxUFrMGURSyW27zEOwiKlXYqznLpFK9KxOVCtxVTw0VGdQCewvvPFpeRSrlsMSDxCIkeYSXmpitdoRWkBCpRIQXQFYWnTJRGsrL/91OPmx66mVGBHlJlzfgWnDEimcstNH3AEcbqTVfHhsK9ml5QAuA 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, 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 Reviewed-by: Muchun Song Acked-by: Daniel Vetter CC: Jani Nikula CC: Joonas Lahtinen CC: Rodrigo Vivi CC: Tvrtko Ursulin CC: David Airlie CC: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 29 +++++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 17 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..e07ffbd9eab3 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,17 @@ 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->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 +446,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 /**