From patchwork Thu Jun 22 08:39:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288503 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 6BFB1EB64D8 for ; Thu, 22 Jun 2023 08:41:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 10A378D0007; Thu, 22 Jun 2023 04:41:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 094CE8D0001; Thu, 22 Jun 2023 04:41:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E50C88D0007; Thu, 22 Jun 2023 04:41:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D0DA78D0001 for ; Thu, 22 Jun 2023 04:41:29 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B067D1A08E9 for ; Thu, 22 Jun 2023 08:41:29 +0000 (UTC) X-FDA: 80929739898.10.B7B360D Received: from out-39.mta1.migadu.com (out-39.mta1.migadu.com [95.215.58.39]) by imf26.hostedemail.com (Postfix) with ESMTP id 0D53514000A for ; Thu, 22 Jun 2023 08:41:26 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lnC4EAsr; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.39 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=1687423287; 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=FjncEPBmZQNKtUMkKxyWnfUd+QNedTmj64H5ENjps78=; b=Ff97Ze7HorAFPG/bjyAc4dJjbRoKY88nnCYb2u8hXeVukoC6vfUJTQPd6oRIm1xN8fWkrc C9Mej9UvCohmpjLqVbw7+fZwZoy1PCl8u0byR2r45hbiuMMnTspg63DfZHXLihq8ff6yvp 90KgSlqa7OOTq888XlskPn3ABI0ONjU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lnC4EAsr; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.39 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423287; a=rsa-sha256; cv=none; b=CWmSMfktYQu+AtghMQm6ngMN8am8Uz6PrOlXR6eUENtatyASQ5iF/fDtuYbiIjiqXT2fhh n+ka/MwTsjN+Q7qArQ6pY3EiafUFSZjoSWj9x7csbr8TjpUMC0E/PCuz/lzEI/YcyBaLaD 6cfVBcxCrvK7nooBI7doAQFBAx9Zb5g= 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=1687423285; 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=FjncEPBmZQNKtUMkKxyWnfUd+QNedTmj64H5ENjps78=; b=lnC4EAsriqzk6Vg3PsGJ6YdZPgIBp18Lhel2S0f8vfVmaxOMpUH7w6LfdRXOcYPLlNu3I3 j/qu/8a2yrW6Gfq3DhvSuklliGWfa6l2tvkk9Ar9ygKDw9xtKuJU8ntv2Opi7E65LTv/fu oxqUNwg0dU4TV+Hlx7tn3EnVt9tgXR8= 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 12/29] mbcache: dynamically allocate the mbcache shrinker Date: Thu, 22 Jun 2023 08:39:15 +0000 Message-Id: <20230622083932.4090339-13-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-Rspamd-Queue-Id: 0D53514000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: r7hky43z6tfw3awc7jajoitiurftcnw4 X-HE-Tag: 1687423286-986827 X-HE-Meta: U2FsdGVkX1/TNXxpCeppCu9AloETX05KT9qQxzQC5pW/AXnl4jvzNujnEneZpxGgblgobzOdHae0D4+4uNYgzvDyYM3B6J6Y/nXxKqmrsMynAlsjPliiYtXi5cx33sHo/gLxNz7giumS2KlmqoDAPni2DcVB5px1iDBG8U3fv6oVKgbG+G7m9GoUq4kUKhv2gPpdBFEej7n6v6lp4GvjzsVa9xhBR6UlD81NXzLpL03E1KN883bY81D7lYLEs7MG16Y7Bi0ynAd59F89IWGkeCPJp4e9p9xb1vWDb6g7Cl7Oc5BESQHW+ytsRNWuU3Pm6GkZUvo5WEAgdwGWNKLruMFjtUfaBp29KgzGFGrSXxfRMDEzjqqP6844YJDSRm5mTgM7FuQiUSemFIoRTUvWrTLJxIXJKnEOHPF8wFBa4t2sFsR735QsVsMgkjD/2NC01kZNGzgaldL4hfkWSwR9urH7GgNdi1Jpb7ToFYfkhtXHzaFWTDndPaUHi9RLrt1IeNEyNH5vqGoERlp9ce7MF8yYIG9h6VeOulEjgkfHMHSWxdJJsdc3CIiFiDIY2zfJSHB3dqsn5rZIdnElJNEjK5xGzsRq89N/DdbKwE/X69hoK7OPzqC5t7oL1goqPvDMC20igWCeTRW3ep/HJNpwxGikBaDr/39UozJJmoOLXdTs/YcLsTB70xMaOeh+DNWu4FU3PZ/acxWSnxBHmFf3I5/sne2OnN6TAukuuhU5W7rt57dUEcIoOYbnoucfmeTtAo29f8MzgX0yDDpWuOZGjYP0MKexRY8Vc7/+qbhNL8Fk7FJk6WAyh3yxYRh5IXd3cWdROPYpko8fROKmrJVUGLU/0kXfpsnCK/e0n6tU3eFQT7hOY9rhyaUN8vWYpRdWRbndkLjOVkQCz+khpX8q2ibWf4A78HHf0csyPx1IjI0fNMQWnAqZf/4NEnS91cxwO5vXbq2Vcji+KelLwFj N73DC5J4 wYUSw/A6rWVQ/n5t8FH2dPX9V/fLtvB+ty2cUg4UYqCBC+CKv4ypUZzCrCkwSVY9FpEO1i9bk3c/S5ytTVY/CxWaUNxIpWgauFg+aq1KAgHyYYEWUmq1QI7nujQomzjzG2MksUOwPkU5eClzn2IdW6kw0BVAeUQBmpJZtUrVX1OaQ3iQ= 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 mbcache 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 mb_cache. Signed-off-by: Qi Zheng --- fs/mbcache.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/fs/mbcache.c b/fs/mbcache.c index 2a4b8b549e93..fec393e55a66 100644 --- a/fs/mbcache.c +++ b/fs/mbcache.c @@ -37,7 +37,7 @@ struct mb_cache { struct list_head c_list; /* Number of entries in cache */ unsigned long c_entry_count; - struct shrinker c_shrink; + struct shrinker *c_shrink; /* Work for shrinking when the cache has too many entries */ struct work_struct c_shrink_work; }; @@ -293,8 +293,7 @@ EXPORT_SYMBOL(mb_cache_entry_touch); static unsigned long mb_cache_count(struct shrinker *shrink, struct shrink_control *sc) { - struct mb_cache *cache = container_of(shrink, struct mb_cache, - c_shrink); + struct mb_cache *cache = shrink->private_data; return cache->c_entry_count; } @@ -333,8 +332,8 @@ static unsigned long mb_cache_shrink(struct mb_cache *cache, static unsigned long mb_cache_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct mb_cache *cache = container_of(shrink, struct mb_cache, - c_shrink); + struct mb_cache *cache = shrink->private_data; + return mb_cache_shrink(cache, sc->nr_to_scan); } @@ -370,26 +369,30 @@ struct mb_cache *mb_cache_create(int bucket_bits) cache->c_hash = kmalloc_array(bucket_count, sizeof(struct hlist_bl_head), GFP_KERNEL); - if (!cache->c_hash) { - kfree(cache); - goto err_out; - } + if (!cache->c_hash) + goto err_c_hash; + for (i = 0; i < bucket_count; i++) INIT_HLIST_BL_HEAD(&cache->c_hash[i]); - cache->c_shrink.count_objects = mb_cache_count; - cache->c_shrink.scan_objects = mb_cache_scan; - cache->c_shrink.seeks = DEFAULT_SEEKS; - if (register_shrinker(&cache->c_shrink, "mbcache-shrinker")) { - kfree(cache->c_hash); - kfree(cache); - goto err_out; - } + cache->c_shrink = shrinker_alloc_and_init(mb_cache_count, mb_cache_scan, + 0, DEFAULT_SEEKS, 0, cache); + if (!cache->c_shrink) + goto err_shrinker; + + if (register_shrinker(cache->c_shrink, "mbcache-shrinker")) + goto err_register; INIT_WORK(&cache->c_shrink_work, mb_cache_shrink_worker); return cache; +err_register: + shrinker_free(cache->c_shrink); +err_shrinker: + kfree(cache->c_hash); +err_c_hash: + kfree(cache); err_out: return NULL; } @@ -406,7 +409,7 @@ void mb_cache_destroy(struct mb_cache *cache) { struct mb_cache_entry *entry, *next; - unregister_shrinker(&cache->c_shrink); + unregister_and_free_shrinker(cache->c_shrink); /* * We don't bother with any locking. Cache must not be used at this