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 BB875C3DA40 for ; Thu, 22 Jun 2023 08:41:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CA898D0008; Thu, 22 Jun 2023 04:41:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 379878D0001; Thu, 22 Jun 2023 04:41:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 241EE8D0008; Thu, 22 Jun 2023 04:41:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 14CFF8D0001 for ; Thu, 22 Jun 2023 04:41:37 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D613AA0155 for ; Thu, 22 Jun 2023 08:41:36 +0000 (UTC) X-FDA: 80929740192.20.E74DB80 Received: from out-5.mta1.migadu.com (out-5.mta1.migadu.com [95.215.58.5]) by imf22.hostedemail.com (Postfix) with ESMTP id 03CA6C000E for ; Thu, 22 Jun 2023 08:41:34 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="CxBImOW/"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.5 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423295; a=rsa-sha256; cv=none; b=F9zvFJBA3lv6c2m/pFH3i/h3XfxguzNcv1kDoab571lJumSoX9p2gAxaRLf9VHLw4EbUhW 2Pd31u64xesqRjggh0JwZsegoWmpDlODB0//G2fAjyV+8iUEDs4EuCPHR0IJl7uoTJKTGI efwas87BbSQ5nR2S7TvEBUUC4gFxcgY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="CxBImOW/"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.5 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=1687423295; 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=Z+30fV/iN1iesGacxkaE9JIcYdi6gua+ASW3Yz7h8bY=; b=jKCFpcEvUmEG7GoL9ANlZJ/nn188FBGCCLp9spsP9aYkjmLGkGNWZpECNsdqdhn6PlKkYb 4ASAHncxOVEDe8Oe+VcLU2nj9khmwXWM3Tf8rWgo/LhzH5R9fsDqGmYMFZjIE4TOqPn+Gg Sw6U/5lG1Ml1SEHhWH9vwPbRWk3qBOA= 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=1687423293; 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=Z+30fV/iN1iesGacxkaE9JIcYdi6gua+ASW3Yz7h8bY=; b=CxBImOW/hNO5cXp3wK8RSStC+rLEzyxL2mXDMqLFN/YsRlgHVgf5PvDLFcI34eWQmCvkd9 3THwQNEw1YQyanLWHvcbM97v3IDV1byn3r24RVpy9KTWBRd2fEO4Ah83WPt2zZsEN37/0a ZxWtreKvDzY3GuQKFUgAQo+IR9ZiSZc= 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 13/29] ext4: dynamically allocate the ext4-es shrinker Date: Thu, 22 Jun 2023 08:39:16 +0000 Message-Id: <20230622083932.4090339-14-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 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 03CA6C000E X-Stat-Signature: 7oc6d3c7mk3hdn48eee3ucx5kizuni7y X-HE-Tag: 1687423294-258421 X-HE-Meta: U2FsdGVkX1/sDT3g0q1DYB1J/t1EEadtmIzQgdiva1oSoJpV2xt2A0cQxZLurJFqkqJfWaDFksC2EZ8P39iV6DczDUKrHnRNW8ue8qnuX9ZH49j+82una0DYYwHa4z3LTFoyvocEPbIKZT9ppPFM/hO/cZAjb4il5Zogw23QQMaEwlB6xk8p1mPGvgoADVyHXLZlPucB3XROgJ+x7JM/hPo248DDBNnz3dhO7haiknNY9mZpyXUUD8wa+vVxI8a/xSoupxXbbwDxKJrIOcSPaXa50/z7cm3pFnBx7+k2Qa7//Z3BVwMb0WXUk2TdGn31BXAScl5mzCmKTOC9mjSuV7eeZKAUGsbCdne52aokIIPucypjIxiN4V7Q1n5+/d5f7juVLmAEyuawfHqGQ345utKoIs06xFheUdP06C5LtxpbRalzPmwpI5/g3o+/nKT0+1Akx2XpB7rJv71XzMjCzQRfswSgXZkVLyzoEi1uX0fdW/tlrdM2XsHdnxKa8Ft1NnlMStmof9AkZVLf/QFx89wlSaDecxgU5sKVUyWgHc8VHd6hUte2cJK+/xNI8ue/h4lZgoEZiGt8jODFXgoXuaNli0g5wllJWeTv7t74YaiBOfNMPSn1CCD/GaBmEbmaGI6Td3iaOYlDDjiSiFwFsfmEVwY6Ax5kiD9JPfPAwUIMSeItGzdjxUSS4SRo9GNi3Lf2Tr2BquBytb6+Qn1YiCc2Mdfj60nTYiu4f1BnYWXuSR92da011o2jPRLs7dgz28eBzxh8XtTIvj/1toVYV8nbGUfqnuakRkCTHywGbQfWXf46u0LBRpdx/zdwP/xhvBEeoPUyg3BcHVxcs72/s+KEblteky5ZYbHR/YgqnaS2RIY5dKnxvlUQL+5sGD5jXwdpts5k32He1cofQkNrVwZbVDfY75Vmfn6qjbbILfDO+HdVF/QU4Yg4jEJWwYWJM/vVBzoeBH7qrb77vN5 +scToGk/ HwrQzHQXI+D9wwOJEpWSAqwEIGItkcZY8G1WAZ/+cductGTVfLY1kChzJNIhCgh9bo8TYtJdxylkABmG3UndZvvD8wE9bmdydFCuSmSCiVpIVAv3R8YUZ9JLeNvBCInde9z5tybV5+L8M1Og= 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 ext4-es 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 ext4_sb_info. Signed-off-by: Qi Zheng --- fs/ext4/ext4.h | 2 +- fs/ext4/extents_status.c | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 0a2d55faa095..1bd150d454f5 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1651,7 +1651,7 @@ struct ext4_sb_info { __u32 s_csum_seed; /* Reclaim extents from extent status tree */ - struct shrinker s_es_shrinker; + struct shrinker *s_es_shrinker; struct list_head s_es_list; /* List of inodes with reclaimable extents */ long s_es_nr_inode; struct ext4_es_stats s_es_stats; diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 9b5b8951afb4..fea82339f4b4 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1596,7 +1596,7 @@ static unsigned long ext4_es_count(struct shrinker *shrink, unsigned long nr; struct ext4_sb_info *sbi; - sbi = container_of(shrink, struct ext4_sb_info, s_es_shrinker); + sbi = shrink->private_data; nr = percpu_counter_read_positive(&sbi->s_es_stats.es_stats_shk_cnt); trace_ext4_es_shrink_count(sbi->s_sb, sc->nr_to_scan, nr); return nr; @@ -1605,8 +1605,7 @@ static unsigned long ext4_es_count(struct shrinker *shrink, static unsigned long ext4_es_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct ext4_sb_info *sbi = container_of(shrink, - struct ext4_sb_info, s_es_shrinker); + struct ext4_sb_info *sbi = shrink->private_data; int nr_to_scan = sc->nr_to_scan; int ret, nr_shrunk; @@ -1690,15 +1689,19 @@ int ext4_es_register_shrinker(struct ext4_sb_info *sbi) if (err) goto err3; - sbi->s_es_shrinker.scan_objects = ext4_es_scan; - sbi->s_es_shrinker.count_objects = ext4_es_count; - sbi->s_es_shrinker.seeks = DEFAULT_SEEKS; - err = register_shrinker(&sbi->s_es_shrinker, "ext4-es:%s", + sbi->s_es_shrinker = shrinker_alloc_and_init(ext4_es_count, ext4_es_scan, + 0, DEFAULT_SEEKS, 0, sbi); + if (!sbi->s_es_shrinker) + goto err4; + + err = register_shrinker(sbi->s_es_shrinker, "ext4-es:%s", sbi->s_sb->s_id); if (err) - goto err4; + goto err5; return 0; +err5: + shrinker_free(sbi->s_es_shrinker); err4: percpu_counter_destroy(&sbi->s_es_stats.es_stats_shk_cnt); err3: @@ -1716,7 +1719,7 @@ void ext4_es_unregister_shrinker(struct ext4_sb_info *sbi) percpu_counter_destroy(&sbi->s_es_stats.es_stats_cache_misses); percpu_counter_destroy(&sbi->s_es_stats.es_stats_all_cnt); percpu_counter_destroy(&sbi->s_es_stats.es_stats_shk_cnt); - unregister_shrinker(&sbi->s_es_shrinker); + unregister_and_free_shrinker(sbi->s_es_shrinker); } /* -- 2.30.2