From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92DE44302F6 for ; Mon, 24 Aug 2026 13:47:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787579273; cv=none; b=nvj8Ol01+GJkDlt60DxaQvEG2YmkoX+Rrstb3oqo7BciICx4VqkpXk/owETbU92rmXSfLr1kXDw1tTIfsE//SF6MDyGTr9ShbsZV/kOD7hLU8nnEq43dDHpIOKRPuFm9GzkJKMA0fF/un2kIye5yORlk1Omue5IDmD5y0CwK4mk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787579273; c=relaxed/simple; bh=daO3OEXZIdLut41NN4JM9wdBWhX71dJXHsdB9zwnDy0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qbusWxQo2ybbhQioGoNq4HACOW4bLsHCNrpiNbhaNy175OWrAIKUANpzdNmc6CjfnT7/q6VuVHDQRsS0LsmWLkOdQbl/10Synl5xOwHXIlQu/K2s5upiS2SAKGkhaEsraJQ1BGrcpCKZnleryNwoO+WjILbuYFnz7zNRVgjINEo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DXYxlMgm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DXYxlMgm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 487A71F00ACA; Mon, 24 Aug 2026 13:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787579271; bh=/MQVxjKVwigz+LNS2y4Nr2Qgo9JGh1Hq2PKSDWDZ+n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DXYxlMgmTEtLXPBSUGFXj+sULWh+KCjjB/rEgMFXhFHFpPqEjGGtr/S/LcXZ1kYHt 36ut4mioRUs8IOlQG+p2zas4yELMpE1lPp/C6MixbcJu5GwludA0KUl6DlGsJZsxYJ LlmdFa0Mzy8g/cL16t7e0ma4rm/92mUMMDVPKOB6Hi2HuUw2UzIaAmwiwQu2yRlA55 NZQPph9dOp+rtvgJpT3GMpozVpPY9kCCKDEMB92KJGD3oz7xerOV7/kbZOuBKcTNIJ I/paR4Rdx5qW7+JhRSOVWouMyKxLB6BRDqgqo4pUv4CdpUwiWZVlJ3faSIhMq4UGpY le6tztld+0vWQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v2 06/12] f2fs: cache: initialize node cache Date: Mon, 24 Aug 2026 21:47:25 +0800 Message-ID: <20260824134731.3704352-7-chao@kernel.org> X-Mailer: git-send-email 2.55.0.766.g2966f0265a-goog In-Reply-To: <20260824134731.3704352-1-chao@kernel.org> References: <20260824134731.3704352-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 632f88288f27..920d321d77dc 100644 --- a/fs/f2fs/cache.c +++ b/fs/f2fs/cache.c @@ -610,7 +610,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 ff3d8781119c..e34a7877b13d 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -176,6 +176,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) @@ -184,6 +185,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 ad87bd531c63..62d225778ed7 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2107,6 +2107,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 d3dee9b7d999..83496c46c89f 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2051,6 +2051,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++) { @@ -5219,10 +5220,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)) @@ -5546,6 +5551,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