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 AB42642EEC5 for ; Mon, 24 Aug 2026 13:47:45 +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=1787579269; cv=none; b=WoaMvWVa644A6IXDID056NHPuJSI2tUanQvZQzZ6RVpwfnDFOyKa1tDXraaK/G66pGOftW06eum6WdB/Jf170PPUlB+izpD26pEplj9s5i/R2kNhcq1uS8xdbF7Kjx03VsRdbT3QwoBv2bNU2fc8uP0+EyNfRki9i07sgmJnzlY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787579269; c=relaxed/simple; bh=Axy8McbWbQD45d9uS/M3r8tvxJDBJ2zppCg5YSqJNz0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=buQx3qQ9pV+Hc73yd7OO4qo1MrbBZnivTaPNg3Pz78WkThfbeM7jkDufm+6nBRZzEScooYYXH68K6xHwkQ0EtVLnhNKlXzIz8k3nKqsB4fWHrcfvPD0LbR5gcNMkRbxf5FyN4B3wWAVSapIKDKY+N/9hVXMJB7uIL8fnk1+iu5I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oWlbiIET; 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="oWlbiIET" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEED91F00A3D; Mon, 24 Aug 2026 13:47:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787579264; bh=1HwJfojdqOc1OevsX2tfsNodJpYnw16wkSWkjKbjqg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oWlbiIETtzb7JniGyYS2zxR8BCTqT1iMSOeRCqMyN6gr9j7daoOnVK2cnvGZ4Sffr X308/8vo9+RFNfPuFniqMTDA4VlmS1+WD3MdWB6OPRTwBSkMvGuqFP2V+7430QtzxC Mmh+2IGAMqXssmQr0qlO6VLAp3x9pjFdLocz2P/v63KnzqIippVReM6OqV0rTa2wab Rfa2CmgIfJJ/4QtlTmShl/FNpM+mSPdl4KzcVh6gWeoxTbB9Qscv/pOxiW3pysJksC 9YCa3Au64dHaRPHgzj1ZVmXKcqyqL/WWxfdT9m3oOCBrPWgTLBdkpuyQBJhYsN6Zj0 nDuLLPieGndbg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v2 02/12] f2fs: cache: initialize meta cache Date: Mon, 24 Aug 2026 21:47:21 +0800 Message-ID: <20260824134731.3704352-3-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 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 c336d5f13418..7ee98d276938 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -172,4 +172,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 75ab768bb4f7..2c91382ffc3c 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 87bdfa2e6ad3..994f9f9063dc 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2106,6 +2106,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