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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEDA1C61DC7 for ; Thu, 27 Aug 2026 12:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:References:In-Reply-To: Message-ID:Date:To:Sender:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=m66UGo7R2NqM8i4I4kTBGVHemM2GIoVCgcUYGl50/pY=; b=N/CiFMzbP4c740Eo25lyhohAqJ GbM5vi/dOYC1YmGVqy2qUCx2yHGSva4tp3vDLpINiNkztpqp974h+D5bEoiFvMEjY4ko+AcCwaKsa 1yVwhqG2AdrviUPJNFDmKUk5JPfO2jZJWvPy+dFCiF7f0xddpB2NBqExbij0Juo55Vl8=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wzZBH-0002Nj-VO; Thu, 27 Aug 2026 12:26:05 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wzZBF-0002NY-Me for linux-f2fs-devel@lists.sourceforge.net; Thu, 27 Aug 2026 12:26:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DxkribfDzKlGS2GIh0CHnzN41cxrwla5nlOd+WoSA0o=; b=PvAOFVYa8TpHp/KkdrI8Hxhzew wL+UneK/4ZnxxvnUqIqah2StAEtKcpUtkbItMFumjneHlJr47Xrf11/dnZOY3LlPt1noCg+IBEjc7 +hL3UGWRxkxGumyA6NlH2hEC0peo2RXw6PUb2jlvEiqPJbt4QA/T+1sD1SEJibd3bUNg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=DxkribfDzKlGS2GIh0CHnzN41cxrwla5nlOd+WoSA0o=; b=WODLsPq1JASWHlde/22/ZxPVO0 TcN7AQursJ1psMrrY7gPexbHzVS6tk3yWdMKzdtM7kK3EeLR+t5mENvMtf88KZU1/uDf9/PC+CUy7 x0b/INCp3vUrjcsHulOpgfhtrZFFq5+Z7pdCPvr5PBjGtE10901vX9dlwh0IAyEuPbfM=; Received: from sea.source.kernel.org ([172.234.252.31]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wzZBB-00053j-QD for linux-f2fs-devel@lists.sourceforge.net; Thu, 27 Aug 2026 12:26:03 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 70E9B4400D for ; Thu, 27 Aug 2026 12:25:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 735261F000E9; Thu, 27 Aug 2026 12:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787833556; bh=DxkribfDzKlGS2GIh0CHnzN41cxrwla5nlOd+WoSA0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aPQlG3Grf9SDb/v/yufCZq4sauFSailLBl9gVvK+efUqYINi0zpFpekAviiXIq6nV MqHvnkxio5JW+5pHNu6SOF2IVCk6WCT8+rlM3b4J0TNjZca0IKH+8+wIziwMm54oiQ acNyLIewFMkz+N2eZpL87j4QkIFaD3wQuub2B6LgYIQlvqwI0B89ZzA7Pj++gcDkCT KfBf99a/ur1puott4IWfQRxxnhBRozbqaHTIgCGgOsUR2RmDrnHKRJaA4+gBiYirUA jMUg8LygV7eH8bS1ZbZT9MBVn7lCQD2WTWTBhbYerZ3kuOqyfmFnqPlrUwfzK0VDS8 IiOL1pikOiqkg== To: jaegeuk@kernel.org Date: Thu, 27 Aug 2026 20:25:34 +0800 Message-ID: <20260827122541.19967-7-chao@kernel.org> X-Mailer: git-send-email 2.55.0.887.g758fc8c411-goog In-Reply-To: <20260827122541.19967-1-chao@kernel.org> References: <20260827122541.19967-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1wzZBB-00053j-QD Subject: [f2fs-dev] [PATCH v4 06/12] f2fs: cache: initialize node cache X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Chao Yu via Linux-f2fs-devel Reply-To: Chao Yu Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Chao Yu This patch introduces node_blocks in f2fs_sb_info structure, initializes and destroys the node cache during filesystem mount and unmount. It also introduces helper wrappers for node cache operation, and registers node cache into the memory shrinker and writeback kthread. Signed-off-by: Chao Yu --- fs/f2fs/cache.c | 9 ++++++++- fs/f2fs/cache.h | 11 +++++++++++ fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 9 ++++++++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/cache.c b/fs/f2fs/cache.c index 36fefbb94fc8..d9505342ae8a 100644 --- a/fs/f2fs/cache.c +++ b/fs/f2fs/cache.c @@ -638,7 +638,14 @@ static unsigned long f2fs_do_shrink_cache(struct f2fs_cached_block_list *cache, unsigned long f2fs_shrink_cache(struct f2fs_sb_info *sbi, unsigned long nr_to_scan) { - return f2fs_do_shrink_cache(META_CACHE(sbi), nr_to_scan); + unsigned long freed; + + freed = f2fs_do_shrink_cache(META_CACHE(sbi), nr_to_scan); + if (freed >= nr_to_scan) + return freed; + + freed += f2fs_do_shrink_cache(NODE_CACHE(sbi), nr_to_scan - freed); + return freed; } static int f2fs_cache_writeback_kthread(void *data) diff --git a/fs/f2fs/cache.h b/fs/f2fs/cache.h index 20e8d15439e2..602b73ec78a4 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -183,6 +183,7 @@ int f2fs_start_cache_wb_thread(struct f2fs_sb_info *sbi); void f2fs_stop_cache_wb_thread(struct f2fs_sb_info *sbi); #define META_CACHE(sbi) (&(sbi)->meta_blocks) +#define NODE_CACHE(sbi) (&(sbi)->node_blocks) #define f2fs_find_meta_cache(sbi, blkaddr) \ f2fs_find_cache(META_CACHE(sbi), blkaddr, 0) @@ -191,6 +192,16 @@ void f2fs_stop_cache_wb_thread(struct f2fs_sb_info *sbi); #define f2fs_truncate_meta_caches(sbi, start, len) \ f2fs_drop_cache_range(META_CACHE(sbi), start, len, true) +#define f2fs_grab_node_cache(sbi, blkaddr) \ + f2fs_grab_cache(NODE_CACHE(sbi), blkaddr, \ + F2FS_CACHE_LOCK_CREATE) +#define f2fs_find_node_cache(sbi, blkaddr) \ + f2fs_find_cache(NODE_CACHE(sbi), blkaddr) +#define f2fs_invalidate_node_cache(sbi, blkaddr) \ + f2fs_drop_cache_range(NODE_CACHE(sbi), blkaddr, 1, false) +#define f2fs_truncate_node_caches(sbi, start, len) \ + f2fs_drop_cache_range(NODE_CACHE(sbi), start, len, true) + unsigned long f2fs_shrink_cache(struct f2fs_sb_info *sbi, unsigned long nr_to_scan); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 5115c0c0b47d..4d322926462d 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2109,6 +2109,7 @@ struct f2fs_sb_info { /* f2fs internal cache */ struct f2fs_cached_block_list meta_blocks; + struct f2fs_cached_block_list node_blocks; /* internal cache flush thread */ struct f2fs_cache_kthread cache_thread; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 36f73ff3343c..f2086ca590f6 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2073,6 +2073,7 @@ static void f2fs_put_super(struct super_block *sb) sbi->node_inode = NULL; f2fs_destroy_cache(META_CACHE(sbi)); + f2fs_destroy_cache(NODE_CACHE(sbi)); /* Should check the page counts after dropping all node/meta pages */ for (i = 0; i < NR_COUNT_TYPE; i++) { @@ -5247,10 +5248,14 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) if (err) goto free_page_array_cache; + err = f2fs_init_cache(sbi, NODE_CACHE(sbi), F2FS_NODE_CACHE); + if (err) + goto free_meta_cache; + err = f2fs_get_valid_checkpoint(sbi); if (err) { f2fs_err(sbi, "Failed to get valid F2FS checkpoint"); - goto free_meta_cache; + goto free_node_cache; } if (__is_set_ckpt_flags(F2FS_CKPT(sbi), CP_QUOTA_NEED_FSCK_FLAG)) @@ -5582,6 +5587,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) free_devices: destroy_device_list(sbi); kvfree(sbi->ckpt); +free_node_cache: + f2fs_destroy_cache(NODE_CACHE(sbi)); free_meta_cache: f2fs_destroy_cache(META_CACHE(sbi)); free_page_array_cache: -- 2.49.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel