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 E043BC04E69 for ; Thu, 27 Jul 2023 08:12:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8830C8D0003; Thu, 27 Jul 2023 04:12:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8357C8D0001; Thu, 27 Jul 2023 04:12:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FBAD8D0003; Thu, 27 Jul 2023 04:12:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 610D58D0001 for ; Thu, 27 Jul 2023 04:12:33 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 254E0B2A5A for ; Thu, 27 Jul 2023 08:12:33 +0000 (UTC) X-FDA: 81056674986.08.FF8226A Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf23.hostedemail.com (Postfix) with ESMTP id 54431140003 for ; Thu, 27 Jul 2023 08:12:31 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VWs5xsEp; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.179 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=1690445551; 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=xVRvDV5EwClRaurogoo7jeCmWiPiam6NNimoVigpYsU=; b=DcxAXNqKfkEIAsIODv6V2QwXA/g3Bj3d6fSOzErVdAnWyHxSc2CBQynG+vNu79CstBpQWP p73mgwR67u/aDcHUs32YCz+OwS6W0G4a6SI6hELleyDoSfHjmyeZfPxQVzgyzmm0I6nWua GMnrQlnczADYjm1l6dmWRDllbwv6Zpw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VWs5xsEp; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445551; a=rsa-sha256; cv=none; b=2gY8m8YHMcQBhRpbHnp6kN6k3n7kxBTsX+INjnKf/Pha+XxwwV0uofIFpZlwHCM+/pnOpD Ctw8MSMP8vGACRMUvS3xKtWhT/pLxU2q80/FLNyt1f4PWZcukxzX9c1Cn9hzEBjrOwbqH3 /3vyIwwHP//2PzeVGThJqZFKl2ID0Mk= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6748a616e17so183582b3a.1 for ; Thu, 27 Jul 2023 01:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445550; x=1691050350; 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=xVRvDV5EwClRaurogoo7jeCmWiPiam6NNimoVigpYsU=; b=VWs5xsEpAgA4DYNqF8K/FN4j7udZSbXqCeXnxv3YTG0Ik0TL2nl/Ugga9u7R+ZJeNR Wigeakgpk32H5TPwyUhkE7IqyM04zeUMVcePDa9eTKcIqF7mvyeMYMdU6pDKFeWcNWaR qvQCy7Nu/xowW6gGi5vD7bu0NuXZ8UlBiffMC2ufEn1khdTpqjsjaFRzBjIrPJfwSFKG LuwPnQLNAsZ+sSXWuMdy2i4BIcl75Eemb6JwQ/h/qU8W848mv79pSK1svvdUmrASzQOQ aQzV7ZNEhcTzx5oZvxCfNrl/tTU7BbbCJB9SufDvnC5P9J0UXQ5a+DGx/aTVEKn/U2IP 9i7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445550; x=1691050350; 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=xVRvDV5EwClRaurogoo7jeCmWiPiam6NNimoVigpYsU=; b=GQWgH6zNIXDDKQlAsNgSSp4GD7Pz0m+/eTa1bUNb4NcJZNhrMj4v+pBSDvCu1FniJw iDNUCI87IPzT4yrtaXIhxSfBB22pcU0TvijT3GrT8XUZq5GPP/cNY5Fzk4IPqKvjAnaJ 9ocKdrgRDzWqqgi/HC5dt6D7M45J+t01d/bYRN0NSqZq1oPIUNuHcfd3btotOMEIpFKg BHj10pkwTljSTB9VraVQPFCZPQav4JPsC8zFkhxKoQ+zRa6VHIzzaQwVdWr+GHRpcwJt 2EOSaM8Nt7YnAPknBPlP240parcn7Zd4MD3pv7QtjvP6Ucz4z/hf5EX81Agcs5R8E0wY OYyg== X-Gm-Message-State: ABy/qLacnH+oxsARjRNfYYpSiA/qRvA4w93Nyj8GYbUoMAAiJ+OnWjYR PO9a/9yVt3ScKVJXQDrP15qlTA== X-Google-Smtp-Source: APBJJlF08KF/2Ja1GiYKXzi0SbMDWba0XluK8fJxZEI3QrufrkFF+7lpMuNnhPZU1iQtSxNfzq1jqw== X-Received: by 2002:a05:6a21:32a9:b0:136:f3ef:4d2 with SMTP id yt41-20020a056a2132a900b00136f3ef04d2mr6069372pzb.3.1690445550183; Thu, 27 Jul 2023 01:12:30 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.12.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:12:29 -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, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.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-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v3 33/49] mbcache: dynamically allocate the mbcache shrinker Date: Thu, 27 Jul 2023 16:04:46 +0800 Message-Id: <20230727080502.77895-34-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 54431140003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: prjzgidmurjyntnmxa3j3akfrzam3zyx X-HE-Tag: 1690445551-511710 X-HE-Meta: U2FsdGVkX18SbyDIvYDDiCowbE3u7gzSugsGjSrsoq+r1KWKh/XlPTrB40I0hcReUvltobMHAp1lDoKp22XhXKAvJRdFjlHXarJAF7+8ppvM9Ozwb+8DgUHQogqaGfz+2nE6Zb0X0AaqyFnMPbg4//LVNnkZSXI8pqPJgm5bxnDEiMg2OVn9hwlUngynFKFY62ei35b6pUWVSYu6iORPFnFWzJIjT/SsHltmbj9BreaTaO/cAGUMpKgSTuH0Ib8iaYHyePg3iYQzAcUzWY6R8SdcX5OFg9Ii9zBRGNBqYWquR/eVdP1ysEWZjskccu0MXoqdaPt5lrh797ojdqUhdlk+D52JEMKJbGvvgJkLu2Pfas0NTr+kkImiYviqaW68TozsEIesGYi4R+0q8O1jKsfn2S8jrQ0aypIeBJHRm+qUw4YpoH0DoMAsABeyp8h/bx2/LGgssQirfsu0hjM6jLi9Btlh96HzULfmf+rvTEYB8lVG/gn6yjzidtADGuGPTORjIOzc6pQuhbpVfJVAeYnazDNPCueD7WuUgbxWv1b6IhY5L/mCLZI+J53fTrDv27CpZmv42dSzCtUd3O97PI9cUMQZ6q6Xxp9+BWOJGHMOk+0DK2npQ5l5uqS60/OHLuWQxNLlZpGOcseJD5Ldg1mjdw5rrdC35bMdQOOI+1qF7qdpOCS9wFJPZaqxfaUz5UnFMobG1vONbPbRsl492G6Sq4Lmnh8kmOchwyhx9psVCddG14zjwAI8JVY5QFubKrpVMRe3cVEPk2wWM0fhx4dxCH28KXgGuQbaTImSRNj0Vnxq/99TnU1gTP4IFpZ6eTUjkd+qs8QWffGh6qGNud8gFGCYzxhV3o3dGXlBkSL2jWbSF0px0mG8zT0ZQCG9/Y7jqs3qquyE7vOMmg4LdifjL4VMT1IixXivussZQtQrvZX/ZejysoVxDsHvsbjAiim7wZkVZ/rdpv95C/5 Xpppwyhf w5aY6Rfd2jenkPsOhyqUCbN5KdkXXI9ajoSekdZDjHJcGSrqDMw3od8YI2PVAzVOzrIkP2AtW8dUbPq3a15GQE/lTMxXTk1NIBOXHwzMiBK7ROKNSvfgf7kDZQ0V3slAgZAKX2WggWYUpOjDEWN9bhAJOBntR1Ui5nIeR/Cwc7aepVlmeNEUdYGx6KeNKsKDXjlOJTsQmDVVJ+5tRR5FI+2li/GmQb5LFhvFwORq/BIibS187uCqCft7uXVj4bnqclgxPY0YMRP2w6FxAk1yPRivGHpM9pdkugk2/ESAgd3tFy6g4dra3Jn2Lu3TLhkzldOEgrIiIzQDfBP+SoJi+LbZai87P/12++yNb/nqH/oCPiv+HRglx5jUseI74N9IqFeviqVygTLfcW0R37TNpwXxGe+98y84jRnwAs2EufvnD8B4QoK10QHNREh81LqWlDRQ6 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 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 Reviewed-by: Muchun Song --- fs/mbcache.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/mbcache.c b/fs/mbcache.c index 2a4b8b549e93..0d1e24e9a5e3 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,7 @@ 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); } @@ -377,15 +375,20 @@ struct mb_cache *mb_cache_create(int bucket_bits) 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")) { + cache->c_shrink = shrinker_alloc(0, "mbcache-shrinker"); + if (!cache->c_shrink) { kfree(cache->c_hash); kfree(cache); goto err_out; } + cache->c_shrink->count_objects = mb_cache_count; + cache->c_shrink->scan_objects = mb_cache_scan; + cache->c_shrink->seeks = DEFAULT_SEEKS; + cache->c_shrink->private_data = cache; + + shrinker_register(cache->c_shrink); + INIT_WORK(&cache->c_shrink_work, mb_cache_shrink_worker); return cache; @@ -406,7 +409,7 @@ void mb_cache_destroy(struct mb_cache *cache) { struct mb_cache_entry *entry, *next; - unregister_shrinker(&cache->c_shrink); + shrinker_free(cache->c_shrink); /* * We don't bother with any locking. Cache must not be used at this -- 2.30.2