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 9048F385539 for ; Thu, 20 Aug 2026 03:17:30 +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=1787195852; cv=none; b=Sqho+YczQNKQOpxpGh6Msn4JB4pZ0KSzrXy4obBXOE4BBQyqMQkEQ6HeHIMp0OA9CS2sPM7ZFK8n13YFu0Pl+9RD7fmBGjLyJ05dxZ55veIgfVXRi41JE9Iz8wONT3vNEx+OSgTkyqmInfk2g6S3FHPensxU5W4TtebXH3XZqbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787195852; c=relaxed/simple; bh=6yqid0ASeMa+P24OLeYiHk0QZf1/lQMZBBcouRn7ByE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p0FwUXKjfpfr41ZEDXE0oQjeVDKkmCiNw7O0D8gwmnXpPsn8fYyg4WhrzKxUNfPwPwD55810n4xcuXQMCGLc2GBzF5MzzypO9W5qhjpUOZb32YMG8F5HYOgPeAXu14uhkD4iyL1pJsZ/EY4mrCsODaFMg2hSdEZZX0zEZMDVDKI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dIlp+/xW; 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="dIlp+/xW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C88F1F00A3A; Thu, 20 Aug 2026 03:17:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787195850; bh=Gy6N0mOG0lWln4Eg9yHcqbzrc1kNIOAK4i+YKZ5pWLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dIlp+/xWeUVAmvnjy2EpTFp0gMELjg4UrW2sRow2xTiAmBgh8By/HX43+GcTkwrpk CCW1P/U8BI8bUvrZZ5ZwUztjGXTbt+AvhxsX2UTkWN3YjrMBikm30uVJpBLPA08SXD PHSCOja1OeUvMhjHqjtiUD0PWT+PIEXIz3RBVCzRYStuT566dad7tJaJbLzd9s2Sq7 wbGFlBc2DEF9K31DOeoKOySUHs2zKEyizXefScWnE0HpTlNr0xtqNGDpBCJJWlzmhU Qj/g92DO6yzkWhXUEL5SV6uQESW2PYRguAl/vuEYNrrEG0AI6+sEAbSN20gJY2bIo+ Rs5p2Uh7f0MqA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v1 02/12] f2fs: cache: initialize meta cache Date: Thu, 20 Aug 2026 11:17:11 +0800 Message-ID: <20260820031721.12218-3-chao@kernel.org> X-Mailer: git-send-email 2.55.0.737.g08866a6d13-goog In-Reply-To: <20260820031721.12218-1-chao@kernel.org> References: <20260820031721.12218-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 meta_blocks in f2fs_sb_info structure, initializes and destroys the meta cache during filesystem mount and unmount. It also introduces helper wrappers for meta cache operation. Signed-off-by: Chao Yu --- fs/f2fs/cache.h | 12 ++++++++++++ fs/f2fs/data.c | 3 +++ fs/f2fs/f2fs.h | 3 +++ fs/f2fs/super.c | 10 +++++++++- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/cache.h b/fs/f2fs/cache.h index 686a974008ae..3cd2abafe364 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -176,4 +176,16 @@ struct f2fs_cached_block *f2fs_grab_cache(struct f2fs_cached_block_list *cache, void f2fs_drop_cache_range(struct f2fs_cached_block_list *cache, unsigned long start, unsigned long len, bool drop_dirty); +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 f2fs_find_meta_cache(sbi, blkaddr) \ + f2fs_find_cache(META_CACHE(sbi), blkaddr) +#define f2fs_invalidate_meta_caches(sbi, start, len) \ + f2fs_drop_cache_range(META_CACHE(sbi), start, len, false) +#define f2fs_truncate_meta_caches(sbi, start, len) \ + f2fs_drop_cache_range(META_CACHE(sbi), start, len, true) + #endif /* _LINUX_F2FS_CACHE_H */ diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 09474790035b..110282bb8dcd 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -695,6 +695,9 @@ static bool __has_merged_page(struct bio *bio, struct inode *inode, if (!inode && !folio && !ino) return true; + if (f2fs_is_cache_bio(bio)) + return false; + bio_for_each_folio_all(fi, bio) { struct folio *target = fi.folio; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 8413983ea9d5..9b7c60bbb137 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2105,6 +2105,9 @@ struct f2fs_sb_info { #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key cp_global_sem_key; #endif + + /* f2fs internal cache */ + struct f2fs_cached_block_list meta_blocks; }; /* Definitions to access f2fs_sb_info */ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 3bdb0f891c35..bcfb1f97850e 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2053,6 +2053,8 @@ static void f2fs_put_super(struct super_block *sb) iput(sbi->meta_inode); sbi->meta_inode = NULL; + f2fs_destroy_cache(META_CACHE(sbi)); + /* Should check the page counts after dropping all node/meta pages */ for (i = 0; i < NR_COUNT_TYPE; i++) { if (!get_pages(sbi, i)) @@ -5197,12 +5199,16 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) if (err) goto free_percpu; + err = f2fs_init_cache(sbi, META_CACHE(sbi), F2FS_META_CACHE); + if (err) + goto free_page_array_cache; + /* get an inode for meta space */ sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi)); if (IS_ERR(sbi->meta_inode)) { f2fs_err(sbi, "Failed to read F2FS meta data inode"); err = PTR_ERR(sbi->meta_inode); - goto free_page_array_cache; + goto free_meta_cache; } err = f2fs_get_valid_checkpoint(sbi); @@ -5528,6 +5534,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) make_bad_inode(sbi->meta_inode); iput(sbi->meta_inode); sbi->meta_inode = NULL; +free_meta_cache: + f2fs_destroy_cache(META_CACHE(sbi)); free_page_array_cache: f2fs_destroy_page_array_cache(sbi); free_percpu: -- 2.49.0