From patchwork Thu Jun 22 08:39:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288505 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 9728FEB64DA for ; Thu, 22 Jun 2023 08:41:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17F698D0006; Thu, 22 Jun 2023 04:41:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10A0B8D0001; Thu, 22 Jun 2023 04:41:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC5AA8D0006; Thu, 22 Jun 2023 04:41:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id DB3B28D0001 for ; Thu, 22 Jun 2023 04:41:44 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AB467A0A66 for ; Thu, 22 Jun 2023 08:41:44 +0000 (UTC) X-FDA: 80929740528.20.DADB692 Received: from out-50.mta1.migadu.com (out-50.mta1.migadu.com [95.215.58.50]) by imf06.hostedemail.com (Postfix) with ESMTP id E94AD180003 for ; Thu, 22 Jun 2023 08:41:42 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=eaBfLuYl; spf=pass (imf06.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.50 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687423303; 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=ZLNuxoO8OfzQ143YMlcA0F6NJodxjDO0V9/3OfXvbSM=; b=Zvohy6S7WU+dcqapF1fmOeUS3PxXqy/zCK689Xxo+6RJvyDDfMxAvKbv3LjbzQG30kMBaV H7nEoVRLnBOqsMAQIGGqXTxoQoKiaYUh5b3Gyql6l+8N/rE8ydD9267B/hOFmJ6ubOhUCU jDpFaO1IpDiJGqkmSeE/WMe3QTFRsK0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423303; a=rsa-sha256; cv=none; b=5bfpX2CZA8JDzSOJKxpBULlDCztuifSpRUqVVbG7kWZhJtz84klpDpCnO/MzUJcV9KUyc+ nVYO0jqjA2Y00jQ8JuLCiRTlRDTSP5hKFtkUyMjP9i7SZymdARyS+bm3S9vXU8fMVbvDmQ RLQEFMVbHq5N92V7iZoHTGDFOW7p0OI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=eaBfLuYl; spf=pass (imf06.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.50 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1687423301; 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=ZLNuxoO8OfzQ143YMlcA0F6NJodxjDO0V9/3OfXvbSM=; b=eaBfLuYlG6JJ2wMMRdNKZV0a4oqFx389/61anHjbefPzDibHOLkGJsZGY3Dw+v+qevkyK3 n26AVKRC06swwDMkLHX6VNJZ04EnOeXYs8Wqh3UkaG0D+Uk7NLaSF2pUsBmfBvjexois2k MY254J8+7levLBhOGEbqDhRxPfqcIBs= 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 14/29] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Date: Thu, 22 Jun 2023 08:39:17 +0000 Message-Id: <20230622083932.4090339-15-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: E94AD180003 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: znhy38hq6wo16y5bceq1z9q1k7it1qir X-HE-Tag: 1687423302-450217 X-HE-Meta: U2FsdGVkX1+Mbg0+YqyKQizigN4oWlbXAx9IyLjhhvCLZiKp9a5AXYWBnxpHbvVMp+CRSezSRjQl2z7DBFXyYHlC6pG5LYHokUV0KAPPzkUOjSsh2HILYhy5PwejMoRnGRsCe/8ki+WZQQobZhfcx0fa7OgMexPy8fv7+P7l9Oc6rj0uwawLE5uqRQSRE02VTICdizpMr4jbfISDiA+dgLepJP/FzbIibdMxHc/I0xOrQQo9equTpDe3oKHCz9xhG4dccXmATyoHTlsZSgWTfYZQUWPjuPNu7Tfoak8Xrm0u7nEzHtCZR5N/irkDiU2wKdTYdODcTrEoe5m+2O2HnAVQHfk52Q/efMN/M3tNrjAD+wtjvNI3KCPHCYgr3QuFH8DeFhC2HBJVhw1jX3rTfgU+ko+cigrXM87Y5WnP0Rb5qzcmVMaU3fHYUvdSjFQIodGgHOU8U9cGaCWyAqqx1IWJAU9rsjTVh+Q8K6b5mEztSCWdh+vJCNFJguuFrL5jCB20ZyuGLsivtSIYAfrBWHkTiIC7a4EzrODwkHQuSaEGrJsVQ54rF1jKUgo+FKzhtIeZBKGQljsRtNdCL9cMHs0kxbisdMeS0d64+/1f3lN4Eo86CLJXgguvTYauh+zHIN9ZU6i7Jw+2nn6d1/3QTcdRftpUJZ+tN2W1iULygh23s6H8V0Qtl5ZBm9yALhhi7AGWiidJ7KUnsf1mGlY17X4Baq8CpuXcKzEvTlORvdMrHIkRyjSY4QBgYj3wnoYPPSUWfPgGj3mI4Q6g0s7c+dzpIYh1bwG5jJvH+nxjBhRILCXrufLcwR+YZyzU2MOvXPCN0eirOjHKx8P5qkMojtEs8edGMxz0IJHNJ/2UP2yhciIc9HSV+O54qeUSfilWGe3SfkAd/KyV1o4UNU+HjFZwo6ybu26UAJ2EGjDOKK0C733llQq7dGdt+bjSxO2Ty6Y149piAE68jZx2MW/ gxjDfyva ktTcudP2dxh4KO68rk7aaYpLV+kbJjPnc/beA8Y52nZa3OBjXoLpui6NHsNyEn4UlwX9jLjaheTVIGBzNBAEVLE72mI4igesp5PhH4craRcpZId04rA2b2bO+N77XicfpR8BVzP2k/yGcr2s= 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 jbd2-journal 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 journal_s. Signed-off-by: Qi Zheng --- fs/jbd2/journal.c | 32 +++++++++++++++++++------------- include/linux/jbd2.h | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index eee3c0ae349a..92a2f4360b5f 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1301,7 +1301,7 @@ static int jbd2_min_tag_size(void) static unsigned long jbd2_journal_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { - journal_t *journal = container_of(shrink, journal_t, j_shrinker); + journal_t *journal = shrink->private_data; unsigned long nr_to_scan = sc->nr_to_scan; unsigned long nr_shrunk; unsigned long count; @@ -1327,7 +1327,7 @@ static unsigned long jbd2_journal_shrink_scan(struct shrinker *shrink, static unsigned long jbd2_journal_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { - journal_t *journal = container_of(shrink, journal_t, j_shrinker); + journal_t *journal = shrink->private_data; unsigned long count; count = percpu_counter_read_positive(&journal->j_checkpoint_jh_count); @@ -1415,21 +1415,27 @@ static journal_t *journal_init_common(struct block_device *bdev, journal->j_superblock = (journal_superblock_t *)bh->b_data; journal->j_shrink_transaction = NULL; - journal->j_shrinker.scan_objects = jbd2_journal_shrink_scan; - journal->j_shrinker.count_objects = jbd2_journal_shrink_count; - journal->j_shrinker.seeks = DEFAULT_SEEKS; - journal->j_shrinker.batch = journal->j_max_transaction_buffers; if (percpu_counter_init(&journal->j_checkpoint_jh_count, 0, GFP_KERNEL)) goto err_cleanup; - if (register_shrinker(&journal->j_shrinker, "jbd2-journal:(%u:%u)", - MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev))) { - percpu_counter_destroy(&journal->j_checkpoint_jh_count); - goto err_cleanup; - } + journal->j_shrinker = shrinker_alloc_and_init(jbd2_journal_shrink_count, + jbd2_journal_shrink_scan, + journal->j_max_transaction_buffers, + DEFAULT_SEEKS, 0, journal); + if (!journal->j_shrinker) + goto err_shrinker; + + if (register_shrinker(journal->j_shrinker, "jbd2-journal:(%u:%u)", + MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev))) + goto err_register; + return journal; +err_register: + shrinker_free(journal->j_shrinker); +err_shrinker: + percpu_counter_destroy(&journal->j_checkpoint_jh_count); err_cleanup: brelse(journal->j_sb_buffer); kfree(journal->j_wbuf); @@ -2190,9 +2196,9 @@ int jbd2_journal_destroy(journal_t *journal) brelse(journal->j_sb_buffer); } - if (journal->j_shrinker.flags & SHRINKER_REGISTERED) { + if (journal->j_shrinker->flags & SHRINKER_REGISTERED) { percpu_counter_destroy(&journal->j_checkpoint_jh_count); - unregister_shrinker(&journal->j_shrinker); + unregister_and_free_shrinker(journal->j_shrinker); } if (journal->j_proc_entry) jbd2_stats_proc_exit(journal); diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 44c298aa58d4..beb4c4586320 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -891,7 +891,7 @@ struct journal_s * Journal head shrinker, reclaim buffer's journal head which * has been written back. */ - struct shrinker j_shrinker; + struct shrinker *j_shrinker; /** * @j_checkpoint_jh_count: