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 DD0F1C77B73 for ; Wed, 31 May 2023 09:58:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 512456B0072; Wed, 31 May 2023 05:58:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49C338E0009; Wed, 31 May 2023 05:58:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F0218E0008; Wed, 31 May 2023 05:58:53 -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 16D106B0072 for ; Wed, 31 May 2023 05:58:53 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D2A61AE407 for ; Wed, 31 May 2023 09:58:52 +0000 (UTC) X-FDA: 80850101304.04.DA6C7F3 Received: from out-7.mta0.migadu.com (out-7.mta0.migadu.com [91.218.175.7]) by imf27.hostedemail.com (Postfix) with ESMTP id 213AA40016 for ; Wed, 31 May 2023 09:58:50 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=baMB2GLV; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of qi.zheng@linux.dev designates 91.218.175.7 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=1685527131; 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=mjcsinqX7KwTJ40/JcL+JgGM2W0swatrtd18npIFtVk=; b=lv131jWBkvD+8W8vwXm6UbSpkUvq+brShSI0RGuA+AHr7HDpBSUsBzBGyv94GvpfAKhfrp YTw42Mps+uGgG+y7WDU/rFOws9kTWSBm4VF22xOHDc2uLUB4avxtuFHyGwFiSn+l3VE5D6 K2kSMCJERHu0QL9igEHVejFf+k7k92I= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=baMB2GLV; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of qi.zheng@linux.dev designates 91.218.175.7 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685527131; a=rsa-sha256; cv=none; b=JAzPIsa9pX/Q6zjqX/5eEpdl5GsuLU+K8jMKx79EjjQw4+X/zZJ6UXNkSJJi79JqrZ6VYV rj0ljAaM+qf21Rz/TyZoZ9ZZf+8feWFUYW4k6a5RWzwSBFpBbDjuePuEGRs9RKUe9UjeiS V5fGuj5NbRsxRYe6wkLeh9VNol7Jmys= 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=1685527129; 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=mjcsinqX7KwTJ40/JcL+JgGM2W0swatrtd18npIFtVk=; b=baMB2GLVbbUmgLTp+CUXyhhVv/9x56bQV3iqZ8MjrGpSa7p5jatJsXPULpCV9EV8+jBrYl PchelLFH6ZF8vYpgvhoNebbx99TRM79XB4NftLwSZ90r/JoVrRMdf+o3xlQ1brouvtCBtm EjXCENjNIePsNVRgiPye7pdqlsEyPGs= From: Qi Zheng To: akpm@linux-foundation.org, tkhai@ya.ru, roman.gushchin@linux.dev, vbabka@suse.cz, viro@zeniv.linux.org.uk, brauner@kernel.org, djwong@kernel.org, hughd@google.com, paulmck@kernel.org, muchun.song@linux.dev Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 8/8] fs: use unregister_shrinker_delayed_{initiate, finalize} for super_block shrinker Date: Wed, 31 May 2023 09:57:42 +0000 Message-Id: <20230531095742.2480623-9-qi.zheng@linux.dev> In-Reply-To: <20230531095742.2480623-1-qi.zheng@linux.dev> References: <20230531095742.2480623-1-qi.zheng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 213AA40016 X-Stat-Signature: 7ox5htxdemwi61ykcr8gbnx8idsksb37 X-HE-Tag: 1685527130-593337 X-HE-Meta: U2FsdGVkX187aQXCSDZPbn+CBfD7gyo39pP0Uq69rOLP3mjruATJ58+LqDZ+xO95fj8jt5Crdtk0wvMXPEy54VSo+mjuwT6lVOI5y5ChQvTX/yi5RAso6XJghU/BKKIa0oTPCN6tinBv1UNLj6wlnd7IPscjx/ek90hLjqawmr77wqrJCew3+xEc1sSKbvnLQiQojOC3kPc8BMzJiIi3pWaY/wew+q/lNG1l3e/oNfgvyoeTkobAFmDybVw9aIYToNDC6yDJdIHgoeSu9MKK1a8nkkkpSdscqqiODMYrr0t953lofnNiM4fkC+b5oNDoYkgqBRInFKmQJWaZFe316lcB434R8whJObnQ36gwZekgdNsylYmwb+b5xlXNV8+WeVIhJen8kaOP2pdEfnidUD222HWp/gxeXDEve8m44TxuZ4hTfAa2GEiec4l6vsL1axqeFtZR1QY1iMQpRoU4NAqdZaFE0oi8EpOfEYhyYmpI7PFkg6Ls5jZ/j1r2FL7wP6/wdgMpiHEy5ADybItu9/0WMbyqfS21BUL68wXLHSso+8tzzn/4XOIRHbOIjW9JQoSsNIcMVa+7ZTg8qDJ0TfW+zABKdXuPQ2LzDUYoRsJugJ7W35+gpEk1zrlx3ppDyBzoDF8HO33QSdys21fAfKDut5OMMggAEaZxZvrHSodszkeM7jWB+GyjjUYSbma8/Np1ammywVm+z/xmiMwEFtcw1AOursSOIdrklrjv3SArFelbx14uG6ttYSFoUEWRGVtoUc7XGM9gUK6ZaDJGDPPHt0x7d8n3aeRyxfkFs6G5Ql1IznaHSouIwZy4fuLmEoBd2x+0Kc8gLchnPP7r4YDSvgUwERdz7q58fe4zKys4m0/3v6wN3qQd7/3t3dvyjkYUCVZaj9Yxx/DinhPRtHvX0rL3YRU9RFTLviIiWBuVYt1fZ643+dmE/gUx8Go59fTKClRYkEUDvjWILI0 lq4JpSrf GsLctwsg7FylFYKPqsaPxFOzTbJKHmwR2QEKvyh8cg5KSII3fJ0FUJupH/IcObsxE65A9nNVleJnJfEYWVoq34vTgbXB4/YppTn5qpZ9JCFiT0pkr4dJWTzRmPp+eutxM25da5X9JUpY9hWmPOzcH1y+90i0j9eG2iSNHSf6i6UyoEtCkcPs07tdBEbo5aJlFpymaJypht6tcgI2BbJnIkfWcvwITPaLM4NOunpCGKjJxoHgJHM3ZQgLAqA== 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: Kirill Tkhai Previous patches made all the data, which is touched from super_cache_count(), destroyed from destroy_super_work(): s_dentry_lru, s_inode_lru and super_block::s_fs_info. super_cache_scan() can't be called after SB_ACTIVE is cleared in generic_shutdown_super(). So, it safe to move heavy unregister_shrinker_delayed_finalize() part to delayed work, i.e. it's safe for parallel do_shrink_slab() to be executed between unregister_shrinker_delayed_initiate() and destroy_super_work()->unregister_shrinker_delayed_finalize(). This makes the heavy synchronize_srcu() to do not affect on user-visible unregistration speed (since now it's executed from workqueue). All further time-critical for unregistration places may be written in the same conception. Signed-off-by: Kirill Tkhai Signed-off-by: Qi Zheng --- fs/super.c | 4 +++- include/linux/fs.h | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/super.c b/fs/super.c index 4e9d08224f86..c61efb74fa7f 100644 --- a/fs/super.c +++ b/fs/super.c @@ -165,6 +165,8 @@ static void destroy_super_work(struct work_struct *work) destroy_work); int i; + unregister_shrinker_delayed_finalize(&s->s_shrink); + WARN_ON(list_lru_count(&s->s_dentry_lru)); WARN_ON(list_lru_count(&s->s_inode_lru)); list_lru_destroy(&s->s_dentry_lru); @@ -337,7 +339,7 @@ void deactivate_locked_super(struct super_block *s) { struct file_system_type *fs = s->s_type; if (atomic_dec_and_test(&s->s_active)) { - unregister_shrinker(&s->s_shrink); + unregister_shrinker_delayed_initiate(&s->s_shrink); fs->kill_sb(s); put_filesystem(fs); diff --git a/include/linux/fs.h b/include/linux/fs.h index 30b46d0facfc..869dd8de91a5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1929,6 +1929,11 @@ struct super_operations { ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); struct dquot **(*get_dquots)(struct inode *); #endif + /* + * Shrinker may call these two function on destructing super_block + * till unregister_shrinker_delayed_finalize() has completed + * in destroy_super_work(), and they must care about that. + */ long (*nr_cached_objects)(struct super_block *, struct shrink_control *); long (*free_cached_objects)(struct super_block *, -- 2.30.2